diff --git a/layout/style/test/test_inherit_computation.html b/layout/style/test/test_inherit_computation.html
index e8148958c25..0cdc9f5ee32 100644
--- a/layout/style/test/test_inherit_computation.html
+++ b/layout/style/test/test_inherit_computation.html
@@ -97,13 +97,11 @@ function test_property(property)
     gParentRuleTop.style.setProperty(property, info.other_values[0], "");
     var inherit_other_computed_n = get_computed_value_node(gNChild, property);
     var inherit_other_computed_f = get_computed_value_node(gFChild, property);
-    var xfail_inherit_other = xfail_inherit(property, false) ||
-                              property == "font-family"; /* bug 385699 */
-    (xfail_inherit_other ? todo_is : is)(
+    (xfail_inherit(property, false) ? todo_is : is)(
        inherit_other_computed_n, other_computed_n,
        "inherit should cause inheritance of other value for '" +
        property + "'");
-    (xfail_inherit_other ? todo_is : is)(
+    (xfail_inherit(property, false) ? todo_is : is)(
        inherit_other_computed_f, other_computed_f,
        "inherit should cause inheritance of other value for '" +
        property + "'");
diff --git a/layout/style/test/test_style_struct_copy_constructors.html b/layout/style/test/test_style_struct_copy_constructors.html
index d590ab1f25f..ff7c246d598 100644
--- a/layout/style/test/test_style_struct_copy_constructors.html
+++ b/layout/style/test/test_style_struct_copy_constructors.html
@@ -73,15 +73,8 @@ for (var prop in gCSSProperties) {
     var parent = getComputedStyle(gElementParent, "").getPropertyValue(prop);
     var child = getComputedStyle(gElementChild, "").getPropertyValue(prop);
 
-    // We get a failure here for font-family because
-    // nsRuleNode::ComputeFontData clobbers the NS_STYLE_FONT_FACE_MASK
-    // part of font->mFlags even when the font name was copied from
-    // aStartStruct.  This causes nsComputedDOMStyle::GetFontFamily to
-    // chop a bunch of characters off of the end of font->mFont.name.
-    var func = (prop == "font-family" ? todo_is : is);
-
-    func(child, parent,
-         "property '" + prop + "' was copy-constructed correctly (inheritance)");
+    is(child, parent,
+       "property '" + prop + "' was copy-constructed correctly (inheritance)");
 
     gRule2.style.setProperty(prop, info.other_values[0], "");
   }