diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 87086baa2b8..778aa7c475a 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -9,69 +9,23 @@
 # Should be == with expected failure:
 fragment=top != ../html/acid2.html acid2_ref.html
 
-== acid1_a.html acid1_b.html
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
 == border_spacing_auto_layout_a.html border_spacing_ref.html
-== border_spacing_empty_table.html border_spacing_empty_table_ref.html
 == border_spacing_fixed_layout_a.html border_spacing_ref.html
-== border_style_none_a.html border_style_none_b.html
 == borders_a.html borders_b.html
-== box_shadow_bg.html box_shadow_bg_ref.html
 != box_shadow_blur_a.html box_shadow_blur_ref.html
-== box_shadow_border_box_a.html box_shadow_border_box_ref.html
 == box_shadow_default_color_a.html box_shadow_default_color_ref.html
 == box_shadow_inset_a.html box_shadow_inset_ref.html
-== box_shadow_inset_bg.html box_shadow_inset_bg_ref.html
 == box_shadow_inset_parsing_a.html box_shadow_inset_parsing_ref.html
-== box_shadow_paint_order_a.html box_shadow_paint_order_ref.html
 == box_shadow_spread_a.html box_shadow_spread_ref.html
-== box_sizing_border_box_a.html box_sizing_border_box_ref.html
-== box_sizing_sanity_check_a.html box_sizing_sanity_check_ref.html
-== br.html br-ref.html
-== calc-basic.html calc-basic-ref.html
-== canvas_as_block_element_a.html canvas_as_block_element_ref.html
-== canvas_linear_gradient_a.html canvas_linear_gradient_ref.html
 == canvas_radial_gradient_a.html canvas_radial_gradient_ref.html
-== case-insensitive-font-family.html case-insensitive-font-family-ref.html
-== clear_generated_content_table_a.html clear_generated_content_table_ref.html
-== clip_a.html clip_ref.html
-== counters_nested_a.html counters_nested_ref.html
-== counters_simple_a.html counters_simple_ref.html
-== data_img_a.html data_img_b.html
-== empty_cells_a.html empty_cells_ref.html
-== external_media_query_link.html external_media_query_ref.html
-== external_media_query_style.html external_media_query_ref.html
-== filter_inline_a.html filter_inline_ref.html
-== filter_opacity_a.html filter_opacity_ref.html
-== filter_sepia_a.html filter_sepia_ref.html
-== first_child_pseudo_a.html first_child_pseudo_b.html
-== first_of_type_pseudo_a.html first_of_type_pseudo_b.html
 == fixed_width_overrides_child_intrinsic_width_a.html fixed_width_overrides_child_intrinsic_width_ref.html
 prefs:"layout.flex-direction.enabled,layout.flex.enabled" == flex_column_direction.html flex_column_direction_ref.html
 prefs:"layout.flex.enabled" == flex_row_direction.html flex_row_direction_ref.html
-== float_clearance_a.html float_clearance_ref.html
-== float_clearance_intrinsic_width_a.html float_clearance_intrinsic_width_ref.html
-== float_intrinsic_height.html float_intrinsic_height_ref.html
-== float_intrinsic_width_a.html float_intrinsic_width_ref.html
-== float_overflow_area_a.html float_overflow_area_ref.html
-== float_positioned_pseudo_stacking_context.html float_positioned_pseudo_stacking_context_ref.html
-== float_right_intrinsic_width_a.html float_right_intrinsic_width_ref.html
-== float_table_a.html float_table_ref.html
-== float_under_top_margin_a.html float_under_top_margin_ref.html
-== floated_generated_content_a.html floated_generated_content_b.html
-== floated_list_item_a.html floated_list_item_ref.html
 == floated_negative_margins_a.html floated_negative_margins_ref.html
-== floated_table_with_margin_a.html floated_table_with_margin_ref.html
-== focus_selector.html focus_selector_ref.html
-== font_advance.html font_advance_ref.html
-== font_color_attribute_a.html font_color_attribute_ref.html
-== font_face_attribute.html font_face_attribute_ref.html
 == font_size.html font_size_ref.html
-== font_style.html font_style_ref.html
-== height_compute_reset.html height_compute.html
 # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
-== hide_after_create.html hide_after_create_ref.html
 
 == iframe/bg_color.html iframe/bg_color_ref.html
 == iframe/hide_after_load.html iframe/hide_after_load_ref.html
@@ -96,17 +50,10 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m
 
 != image_rendering_auto_a.html image_rendering_pixelated_a.html
 == image_rendering_pixelated_a.html image_rendering_pixelated_ref.html
-== img_block_display_a.html img_block_display_ref.html
 == img_block_maxwidth_a.html img_block_maxwidth_ref.html
 == img_block_maxwidth_b.html img_block_maxwidth_ref.html
-== img_dynamic_remove.html img_dynamic_remove_ref.html
-== img_padding_a.html img_padding_b.html
 != img_simple.html img_simple_ref.html
-== img_width_attribute_intrinsic_width_a.html img_width_attribute_intrinsic_width_ref.html
-== incremental_text_color_a.html incremental_text_color_ref.html
 != inline_background_a.html inline_background_ref.html
-== inline_block_baseline_a.html inline_block_baseline_ref.html
-== inline_block_border_intrinsic_size_a.html inline_block_border_intrinsic_size_ref.html
 == inline_block_margin_auto_a.html inline_block_margin_auto_ref.html
 == inline_block_parent_width.html inline_block_parent_width_ref.html
 == inline_block_parent_width_percentage.html inline_block_parent_width_ref.html
diff --git a/tests/ref/case-insensitive-font-family.html b/tests/ref/case-insensitive-font-family.html
deleted file mode 100644
index 7cdec887b52..00000000000
--- a/tests/ref/case-insensitive-font-family.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="font-family: arial">Hello, world!</div>
diff --git a/tests/ref/img_padding_a.html b/tests/ref/img_padding_a.html
deleted file mode 100644
index 96a42ffa03c..00000000000
--- a/tests/ref/img_padding_a.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <body>
-        <img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black; position:relative; height: 206px; width: 206px; left:0px; top: 0px;'>
-    </body>
-</html>
diff --git a/tests/ref/img_padding_b.html b/tests/ref/img_padding_b.html
deleted file mode 100644
index 60893de6cae..00000000000
--- a/tests/ref/img_padding_b.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <body>
-        <img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black;'>
-    </body>
-</html>
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index c966afa4caa..3e6f6494f7d 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -123,6 +123,18 @@
             "url": "/_mozilla/css/absolute_z_index_auto_paint_order_a.html"
           }
         ],
+        "css/acid1_a.html": [
+          {
+            "path": "css/acid1_a.html",
+            "references": [
+              [
+                "/_mozilla/css/acid1_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/acid1_a.html"
+          }
+        ],
         "css/after_block_iteration.html": [
           {
             "path": "css/after_block_iteration.html",
@@ -779,6 +791,162 @@
             "url": "/_mozilla/css/border_spacing_a.html"
           }
         ],
+        "css/border_spacing_empty_table.html": [
+          {
+            "path": "css/border_spacing_empty_table.html",
+            "references": [
+              [
+                "/_mozilla/css/border_spacing_empty_table_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_spacing_empty_table.html"
+          }
+        ],
+        "css/border_style_none_a.html": [
+          {
+            "path": "css/border_style_none_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_style_none_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_style_none_a.html"
+          }
+        ],
+        "css/box_shadow_bg.html": [
+          {
+            "path": "css/box_shadow_bg.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_bg_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_bg.html"
+          }
+        ],
+        "css/box_shadow_border_box_a.html": [
+          {
+            "path": "css/box_shadow_border_box_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_border_box_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_border_box_a.html"
+          }
+        ],
+        "css/box_shadow_inset_bg.html": [
+          {
+            "path": "css/box_shadow_inset_bg.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_inset_bg_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_inset_bg.html"
+          }
+        ],
+        "css/box_shadow_paint_order_a.html": [
+          {
+            "path": "css/box_shadow_paint_order_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_paint_order_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_paint_order_a.html"
+          }
+        ],
+        "css/box_sizing_border_box_a.html": [
+          {
+            "path": "css/box_sizing_border_box_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_sizing_border_box_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_sizing_border_box_a.html"
+          }
+        ],
+        "css/box_sizing_sanity_check_a.html": [
+          {
+            "path": "css/box_sizing_sanity_check_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_sizing_sanity_check_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_sizing_sanity_check_a.html"
+          }
+        ],
+        "css/br.html": [
+          {
+            "path": "css/br.html",
+            "references": [
+              [
+                "/_mozilla/css/br-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/br.html"
+          }
+        ],
+        "css/calc-basic.html": [
+          {
+            "path": "css/calc-basic.html",
+            "references": [
+              [
+                "/_mozilla/css/calc-basic-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/calc-basic.html"
+          }
+        ],
+        "css/canvas_as_block_element_a.html": [
+          {
+            "path": "css/canvas_as_block_element_a.html",
+            "references": [
+              [
+                "/_mozilla/css/canvas_as_block_element_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/canvas_as_block_element_a.html"
+          }
+        ],
+        "css/canvas_linear_gradient_a.html": [
+          {
+            "path": "css/canvas_linear_gradient_a.html",
+            "references": [
+              [
+                "/_mozilla/css/canvas_linear_gradient_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/canvas_linear_gradient_a.html"
+          }
+        ],
+        "css/case-insensitive-font-family.html": [
+          {
+            "path": "css/case-insensitive-font-family.html",
+            "references": [
+              [
+                "/_mozilla/css/case-insensitive-font-family-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/case-insensitive-font-family.html"
+          }
+        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
@@ -791,6 +959,162 @@
             "url": "/_mozilla/css/class-namespaces.html"
           }
         ],
+        "css/clear_generated_content_table_a.html": [
+          {
+            "path": "css/clear_generated_content_table_a.html",
+            "references": [
+              [
+                "/_mozilla/css/clear_generated_content_table_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/clear_generated_content_table_a.html"
+          }
+        ],
+        "css/clip_a.html": [
+          {
+            "path": "css/clip_a.html",
+            "references": [
+              [
+                "/_mozilla/css/clip_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/clip_a.html"
+          }
+        ],
+        "css/counters_nested_a.html": [
+          {
+            "path": "css/counters_nested_a.html",
+            "references": [
+              [
+                "/_mozilla/css/counters_nested_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/counters_nested_a.html"
+          }
+        ],
+        "css/counters_simple_a.html": [
+          {
+            "path": "css/counters_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/counters_simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/counters_simple_a.html"
+          }
+        ],
+        "css/data_img_a.html": [
+          {
+            "path": "css/data_img_a.html",
+            "references": [
+              [
+                "/_mozilla/css/data_img_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/data_img_a.html"
+          }
+        ],
+        "css/empty_cells_a.html": [
+          {
+            "path": "css/empty_cells_a.html",
+            "references": [
+              [
+                "/_mozilla/css/empty_cells_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/empty_cells_a.html"
+          }
+        ],
+        "css/external_media_query_link.html": [
+          {
+            "path": "css/external_media_query_link.html",
+            "references": [
+              [
+                "/_mozilla/css/external_media_query_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/external_media_query_link.html"
+          }
+        ],
+        "css/external_media_query_style.html": [
+          {
+            "path": "css/external_media_query_style.html",
+            "references": [
+              [
+                "/_mozilla/css/external_media_query_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/external_media_query_style.html"
+          }
+        ],
+        "css/filter_inline_a.html": [
+          {
+            "path": "css/filter_inline_a.html",
+            "references": [
+              [
+                "/_mozilla/css/filter_inline_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/filter_inline_a.html"
+          }
+        ],
+        "css/filter_opacity_a.html": [
+          {
+            "path": "css/filter_opacity_a.html",
+            "references": [
+              [
+                "/_mozilla/css/filter_opacity_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/filter_opacity_a.html"
+          }
+        ],
+        "css/filter_sepia_a.html": [
+          {
+            "path": "css/filter_sepia_a.html",
+            "references": [
+              [
+                "/_mozilla/css/filter_sepia_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/filter_sepia_a.html"
+          }
+        ],
+        "css/first_child_pseudo_a.html": [
+          {
+            "path": "css/first_child_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/first_child_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/first_child_pseudo_a.html"
+          }
+        ],
+        "css/first_of_type_pseudo_a.html": [
+          {
+            "path": "css/first_of_type_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/first_of_type_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/first_of_type_pseudo_a.html"
+          }
+        ],
         "css/flex_nochild.html": [
           {
             "path": "css/flex_nochild.html",
@@ -803,6 +1127,270 @@
             "url": "/_mozilla/css/flex_nochild.html"
           }
         ],
+        "css/float_clearance_a.html": [
+          {
+            "path": "css/float_clearance_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_clearance_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_clearance_a.html"
+          }
+        ],
+        "css/float_clearance_intrinsic_width_a.html": [
+          {
+            "path": "css/float_clearance_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_clearance_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_clearance_intrinsic_width_a.html"
+          }
+        ],
+        "css/float_intrinsic_height.html": [
+          {
+            "path": "css/float_intrinsic_height.html",
+            "references": [
+              [
+                "/_mozilla/css/float_intrinsic_height_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_intrinsic_height.html"
+          }
+        ],
+        "css/float_intrinsic_width_a.html": [
+          {
+            "path": "css/float_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_intrinsic_width_a.html"
+          }
+        ],
+        "css/float_overflow_area_a.html": [
+          {
+            "path": "css/float_overflow_area_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_overflow_area_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_overflow_area_a.html"
+          }
+        ],
+        "css/float_positioned_pseudo_stacking_context.html": [
+          {
+            "path": "css/float_positioned_pseudo_stacking_context.html",
+            "references": [
+              [
+                "/_mozilla/css/float_positioned_pseudo_stacking_context_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_positioned_pseudo_stacking_context.html"
+          }
+        ],
+        "css/float_right_intrinsic_width_a.html": [
+          {
+            "path": "css/float_right_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_right_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_right_intrinsic_width_a.html"
+          }
+        ],
+        "css/float_table_a.html": [
+          {
+            "path": "css/float_table_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_table_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_table_a.html"
+          }
+        ],
+        "css/float_under_top_margin_a.html": [
+          {
+            "path": "css/float_under_top_margin_a.html",
+            "references": [
+              [
+                "/_mozilla/css/float_under_top_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/float_under_top_margin_a.html"
+          }
+        ],
+        "css/floated_generated_content_a.html": [
+          {
+            "path": "css/floated_generated_content_a.html",
+            "references": [
+              [
+                "/_mozilla/css/floated_generated_content_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/floated_generated_content_a.html"
+          }
+        ],
+        "css/floated_list_item_a.html": [
+          {
+            "path": "css/floated_list_item_a.html",
+            "references": [
+              [
+                "/_mozilla/css/floated_list_item_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/floated_list_item_a.html"
+          }
+        ],
+        "css/floated_table_with_margin_a.html": [
+          {
+            "path": "css/floated_table_with_margin_a.html",
+            "references": [
+              [
+                "/_mozilla/css/floated_table_with_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/floated_table_with_margin_a.html"
+          }
+        ],
+        "css/focus_selector.html": [
+          {
+            "path": "css/focus_selector.html",
+            "references": [
+              [
+                "/_mozilla/css/focus_selector_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/focus_selector.html"
+          }
+        ],
+        "css/font_advance.html": [
+          {
+            "path": "css/font_advance.html",
+            "references": [
+              [
+                "/_mozilla/css/font_advance_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/font_advance.html"
+          }
+        ],
+        "css/font_color_attribute_a.html": [
+          {
+            "path": "css/font_color_attribute_a.html",
+            "references": [
+              [
+                "/_mozilla/css/font_color_attribute_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/font_color_attribute_a.html"
+          }
+        ],
+        "css/font_face_attribute.html": [
+          {
+            "path": "css/font_face_attribute.html",
+            "references": [
+              [
+                "/_mozilla/css/font_face_attribute_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/font_face_attribute.html"
+          }
+        ],
+        "css/font_style.html": [
+          {
+            "path": "css/font_style.html",
+            "references": [
+              [
+                "/_mozilla/css/font_style_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/font_style.html"
+          }
+        ],
+        "css/height_compute_reset.html": [
+          {
+            "path": "css/height_compute_reset.html",
+            "references": [
+              [
+                "/_mozilla/css/height_compute.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/height_compute_reset.html"
+          }
+        ],
+        "css/hide_after_create.html": [
+          {
+            "path": "css/hide_after_create.html",
+            "references": [
+              [
+                "/_mozilla/css/hide_after_create_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/hide_after_create.html"
+          }
+        ],
+        "css/img_block_display_a.html": [
+          {
+            "path": "css/img_block_display_a.html",
+            "references": [
+              [
+                "/_mozilla/css/img_block_display_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_block_display_a.html"
+          }
+        ],
+        "css/img_dynamic_remove.html": [
+          {
+            "path": "css/img_dynamic_remove.html",
+            "references": [
+              [
+                "/_mozilla/css/img_dynamic_remove_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_dynamic_remove.html"
+          }
+        ],
+        "css/img_padding_a.html": [
+          {
+            "path": "css/img_padding_a.html",
+            "references": [
+              [
+                "/_mozilla/css/img_padding_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_padding_a.html"
+          }
+        ],
         "css/img_size_a.html": [
           {
             "path": "css/img_size_a.html",
@@ -815,6 +1403,18 @@
             "url": "/_mozilla/css/img_size_a.html"
           }
         ],
+        "css/img_width_attribute_intrinsic_width_a.html": [
+          {
+            "path": "css/img_width_attribute_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/img_width_attribute_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_width_attribute_intrinsic_width_a.html"
+          }
+        ],
         "css/img_width_style_intrinsic_width_a.html": [
           {
             "path": "css/img_width_style_intrinsic_width_a.html",
@@ -863,6 +1463,18 @@
             "url": "/_mozilla/css/incremental_letter_spacing_a.html"
           }
         ],
+        "css/incremental_text_color_a.html": [
+          {
+            "path": "css/incremental_text_color_a.html",
+            "references": [
+              [
+                "/_mozilla/css/incremental_text_color_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/incremental_text_color_a.html"
+          }
+        ],
         "css/inline_absolute_hypothetical_clip_a.html": [
           {
             "path": "css/inline_absolute_hypothetical_clip_a.html",
@@ -887,6 +1499,18 @@
             "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
           }
         ],
+        "css/inline_block_baseline_a.html": [
+          {
+            "path": "css/inline_block_baseline_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_baseline_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_baseline_a.html"
+          }
+        ],
         "css/inline_block_block_direction_margins_a.html": [
           {
             "path": "css/inline_block_block_direction_margins_a.html",
@@ -911,6 +1535,18 @@
             "url": "/_mozilla/css/inline_block_border_a.html"
           }
         ],
+        "css/inline_block_border_intrinsic_size_a.html": [
+          {
+            "path": "css/inline_block_border_intrinsic_size_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_border_intrinsic_size_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_border_intrinsic_size_a.html"
+          }
+        ],
         "css/inline_block_img_a.html": [
           {
             "path": "css/inline_block_img_a.html",
@@ -4012,6 +4648,18 @@
           "url": "/_mozilla/css/absolute_z_index_auto_paint_order_a.html"
         }
       ],
+      "css/acid1_a.html": [
+        {
+          "path": "css/acid1_a.html",
+          "references": [
+            [
+              "/_mozilla/css/acid1_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/acid1_a.html"
+        }
+      ],
       "css/after_block_iteration.html": [
         {
           "path": "css/after_block_iteration.html",
@@ -4668,6 +5316,162 @@
           "url": "/_mozilla/css/border_spacing_a.html"
         }
       ],
+      "css/border_spacing_empty_table.html": [
+        {
+          "path": "css/border_spacing_empty_table.html",
+          "references": [
+            [
+              "/_mozilla/css/border_spacing_empty_table_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_spacing_empty_table.html"
+        }
+      ],
+      "css/border_style_none_a.html": [
+        {
+          "path": "css/border_style_none_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_style_none_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_style_none_a.html"
+        }
+      ],
+      "css/box_shadow_bg.html": [
+        {
+          "path": "css/box_shadow_bg.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_bg_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_bg.html"
+        }
+      ],
+      "css/box_shadow_border_box_a.html": [
+        {
+          "path": "css/box_shadow_border_box_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_border_box_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_border_box_a.html"
+        }
+      ],
+      "css/box_shadow_inset_bg.html": [
+        {
+          "path": "css/box_shadow_inset_bg.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_inset_bg_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_inset_bg.html"
+        }
+      ],
+      "css/box_shadow_paint_order_a.html": [
+        {
+          "path": "css/box_shadow_paint_order_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_paint_order_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_paint_order_a.html"
+        }
+      ],
+      "css/box_sizing_border_box_a.html": [
+        {
+          "path": "css/box_sizing_border_box_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_sizing_border_box_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_sizing_border_box_a.html"
+        }
+      ],
+      "css/box_sizing_sanity_check_a.html": [
+        {
+          "path": "css/box_sizing_sanity_check_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_sizing_sanity_check_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_sizing_sanity_check_a.html"
+        }
+      ],
+      "css/br.html": [
+        {
+          "path": "css/br.html",
+          "references": [
+            [
+              "/_mozilla/css/br-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/br.html"
+        }
+      ],
+      "css/calc-basic.html": [
+        {
+          "path": "css/calc-basic.html",
+          "references": [
+            [
+              "/_mozilla/css/calc-basic-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/calc-basic.html"
+        }
+      ],
+      "css/canvas_as_block_element_a.html": [
+        {
+          "path": "css/canvas_as_block_element_a.html",
+          "references": [
+            [
+              "/_mozilla/css/canvas_as_block_element_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/canvas_as_block_element_a.html"
+        }
+      ],
+      "css/canvas_linear_gradient_a.html": [
+        {
+          "path": "css/canvas_linear_gradient_a.html",
+          "references": [
+            [
+              "/_mozilla/css/canvas_linear_gradient_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/canvas_linear_gradient_a.html"
+        }
+      ],
+      "css/case-insensitive-font-family.html": [
+        {
+          "path": "css/case-insensitive-font-family.html",
+          "references": [
+            [
+              "/_mozilla/css/case-insensitive-font-family-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/case-insensitive-font-family.html"
+        }
+      ],
       "css/class-namespaces.html": [
         {
           "path": "css/class-namespaces.html",
@@ -4680,6 +5484,162 @@
           "url": "/_mozilla/css/class-namespaces.html"
         }
       ],
+      "css/clear_generated_content_table_a.html": [
+        {
+          "path": "css/clear_generated_content_table_a.html",
+          "references": [
+            [
+              "/_mozilla/css/clear_generated_content_table_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/clear_generated_content_table_a.html"
+        }
+      ],
+      "css/clip_a.html": [
+        {
+          "path": "css/clip_a.html",
+          "references": [
+            [
+              "/_mozilla/css/clip_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/clip_a.html"
+        }
+      ],
+      "css/counters_nested_a.html": [
+        {
+          "path": "css/counters_nested_a.html",
+          "references": [
+            [
+              "/_mozilla/css/counters_nested_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/counters_nested_a.html"
+        }
+      ],
+      "css/counters_simple_a.html": [
+        {
+          "path": "css/counters_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/counters_simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/counters_simple_a.html"
+        }
+      ],
+      "css/data_img_a.html": [
+        {
+          "path": "css/data_img_a.html",
+          "references": [
+            [
+              "/_mozilla/css/data_img_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/data_img_a.html"
+        }
+      ],
+      "css/empty_cells_a.html": [
+        {
+          "path": "css/empty_cells_a.html",
+          "references": [
+            [
+              "/_mozilla/css/empty_cells_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/empty_cells_a.html"
+        }
+      ],
+      "css/external_media_query_link.html": [
+        {
+          "path": "css/external_media_query_link.html",
+          "references": [
+            [
+              "/_mozilla/css/external_media_query_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/external_media_query_link.html"
+        }
+      ],
+      "css/external_media_query_style.html": [
+        {
+          "path": "css/external_media_query_style.html",
+          "references": [
+            [
+              "/_mozilla/css/external_media_query_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/external_media_query_style.html"
+        }
+      ],
+      "css/filter_inline_a.html": [
+        {
+          "path": "css/filter_inline_a.html",
+          "references": [
+            [
+              "/_mozilla/css/filter_inline_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/filter_inline_a.html"
+        }
+      ],
+      "css/filter_opacity_a.html": [
+        {
+          "path": "css/filter_opacity_a.html",
+          "references": [
+            [
+              "/_mozilla/css/filter_opacity_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/filter_opacity_a.html"
+        }
+      ],
+      "css/filter_sepia_a.html": [
+        {
+          "path": "css/filter_sepia_a.html",
+          "references": [
+            [
+              "/_mozilla/css/filter_sepia_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/filter_sepia_a.html"
+        }
+      ],
+      "css/first_child_pseudo_a.html": [
+        {
+          "path": "css/first_child_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/first_child_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/first_child_pseudo_a.html"
+        }
+      ],
+      "css/first_of_type_pseudo_a.html": [
+        {
+          "path": "css/first_of_type_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/first_of_type_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/first_of_type_pseudo_a.html"
+        }
+      ],
       "css/flex_nochild.html": [
         {
           "path": "css/flex_nochild.html",
@@ -4692,6 +5652,270 @@
           "url": "/_mozilla/css/flex_nochild.html"
         }
       ],
+      "css/float_clearance_a.html": [
+        {
+          "path": "css/float_clearance_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_clearance_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_clearance_a.html"
+        }
+      ],
+      "css/float_clearance_intrinsic_width_a.html": [
+        {
+          "path": "css/float_clearance_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_clearance_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_clearance_intrinsic_width_a.html"
+        }
+      ],
+      "css/float_intrinsic_height.html": [
+        {
+          "path": "css/float_intrinsic_height.html",
+          "references": [
+            [
+              "/_mozilla/css/float_intrinsic_height_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_intrinsic_height.html"
+        }
+      ],
+      "css/float_intrinsic_width_a.html": [
+        {
+          "path": "css/float_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_intrinsic_width_a.html"
+        }
+      ],
+      "css/float_overflow_area_a.html": [
+        {
+          "path": "css/float_overflow_area_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_overflow_area_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_overflow_area_a.html"
+        }
+      ],
+      "css/float_positioned_pseudo_stacking_context.html": [
+        {
+          "path": "css/float_positioned_pseudo_stacking_context.html",
+          "references": [
+            [
+              "/_mozilla/css/float_positioned_pseudo_stacking_context_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_positioned_pseudo_stacking_context.html"
+        }
+      ],
+      "css/float_right_intrinsic_width_a.html": [
+        {
+          "path": "css/float_right_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_right_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_right_intrinsic_width_a.html"
+        }
+      ],
+      "css/float_table_a.html": [
+        {
+          "path": "css/float_table_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_table_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_table_a.html"
+        }
+      ],
+      "css/float_under_top_margin_a.html": [
+        {
+          "path": "css/float_under_top_margin_a.html",
+          "references": [
+            [
+              "/_mozilla/css/float_under_top_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/float_under_top_margin_a.html"
+        }
+      ],
+      "css/floated_generated_content_a.html": [
+        {
+          "path": "css/floated_generated_content_a.html",
+          "references": [
+            [
+              "/_mozilla/css/floated_generated_content_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/floated_generated_content_a.html"
+        }
+      ],
+      "css/floated_list_item_a.html": [
+        {
+          "path": "css/floated_list_item_a.html",
+          "references": [
+            [
+              "/_mozilla/css/floated_list_item_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/floated_list_item_a.html"
+        }
+      ],
+      "css/floated_table_with_margin_a.html": [
+        {
+          "path": "css/floated_table_with_margin_a.html",
+          "references": [
+            [
+              "/_mozilla/css/floated_table_with_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/floated_table_with_margin_a.html"
+        }
+      ],
+      "css/focus_selector.html": [
+        {
+          "path": "css/focus_selector.html",
+          "references": [
+            [
+              "/_mozilla/css/focus_selector_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/focus_selector.html"
+        }
+      ],
+      "css/font_advance.html": [
+        {
+          "path": "css/font_advance.html",
+          "references": [
+            [
+              "/_mozilla/css/font_advance_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/font_advance.html"
+        }
+      ],
+      "css/font_color_attribute_a.html": [
+        {
+          "path": "css/font_color_attribute_a.html",
+          "references": [
+            [
+              "/_mozilla/css/font_color_attribute_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/font_color_attribute_a.html"
+        }
+      ],
+      "css/font_face_attribute.html": [
+        {
+          "path": "css/font_face_attribute.html",
+          "references": [
+            [
+              "/_mozilla/css/font_face_attribute_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/font_face_attribute.html"
+        }
+      ],
+      "css/font_style.html": [
+        {
+          "path": "css/font_style.html",
+          "references": [
+            [
+              "/_mozilla/css/font_style_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/font_style.html"
+        }
+      ],
+      "css/height_compute_reset.html": [
+        {
+          "path": "css/height_compute_reset.html",
+          "references": [
+            [
+              "/_mozilla/css/height_compute.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/height_compute_reset.html"
+        }
+      ],
+      "css/hide_after_create.html": [
+        {
+          "path": "css/hide_after_create.html",
+          "references": [
+            [
+              "/_mozilla/css/hide_after_create_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/hide_after_create.html"
+        }
+      ],
+      "css/img_block_display_a.html": [
+        {
+          "path": "css/img_block_display_a.html",
+          "references": [
+            [
+              "/_mozilla/css/img_block_display_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_block_display_a.html"
+        }
+      ],
+      "css/img_dynamic_remove.html": [
+        {
+          "path": "css/img_dynamic_remove.html",
+          "references": [
+            [
+              "/_mozilla/css/img_dynamic_remove_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_dynamic_remove.html"
+        }
+      ],
+      "css/img_padding_a.html": [
+        {
+          "path": "css/img_padding_a.html",
+          "references": [
+            [
+              "/_mozilla/css/img_padding_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_padding_a.html"
+        }
+      ],
       "css/img_size_a.html": [
         {
           "path": "css/img_size_a.html",
@@ -4704,6 +5928,18 @@
           "url": "/_mozilla/css/img_size_a.html"
         }
       ],
+      "css/img_width_attribute_intrinsic_width_a.html": [
+        {
+          "path": "css/img_width_attribute_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/img_width_attribute_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_width_attribute_intrinsic_width_a.html"
+        }
+      ],
       "css/img_width_style_intrinsic_width_a.html": [
         {
           "path": "css/img_width_style_intrinsic_width_a.html",
@@ -4752,6 +5988,18 @@
           "url": "/_mozilla/css/incremental_letter_spacing_a.html"
         }
       ],
+      "css/incremental_text_color_a.html": [
+        {
+          "path": "css/incremental_text_color_a.html",
+          "references": [
+            [
+              "/_mozilla/css/incremental_text_color_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/incremental_text_color_a.html"
+        }
+      ],
       "css/inline_absolute_hypothetical_clip_a.html": [
         {
           "path": "css/inline_absolute_hypothetical_clip_a.html",
@@ -4776,6 +6024,18 @@
           "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
         }
       ],
+      "css/inline_block_baseline_a.html": [
+        {
+          "path": "css/inline_block_baseline_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_baseline_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_baseline_a.html"
+        }
+      ],
       "css/inline_block_block_direction_margins_a.html": [
         {
           "path": "css/inline_block_block_direction_margins_a.html",
@@ -4800,6 +6060,18 @@
           "url": "/_mozilla/css/inline_block_border_a.html"
         }
       ],
+      "css/inline_block_border_intrinsic_size_a.html": [
+        {
+          "path": "css/inline_block_border_intrinsic_size_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_border_intrinsic_size_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_border_intrinsic_size_a.html"
+        }
+      ],
       "css/inline_block_img_a.html": [
         {
           "path": "css/inline_block_img_a.html",
diff --git a/tests/wpt/mozilla/tests/css/100x100_green.png b/tests/wpt/mozilla/tests/css/100x100_green.png
new file mode 100644
index 00000000000..b23bbba154e
Binary files /dev/null and b/tests/wpt/mozilla/tests/css/100x100_green.png differ
diff --git a/tests/ref/acid1.png b/tests/wpt/mozilla/tests/css/acid1.png
similarity index 100%
rename from tests/ref/acid1.png
rename to tests/wpt/mozilla/tests/css/acid1.png
diff --git a/tests/ref/acid1_a.html b/tests/wpt/mozilla/tests/css/acid1_a.html
similarity index 98%
rename from tests/ref/acid1_a.html
rename to tests/wpt/mozilla/tests/css/acid1_a.html
index 213e59b73da..29332cb4cc7 100644
--- a/tests/ref/acid1_a.html
+++ b/tests/wpt/mozilla/tests/css/acid1_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head>
+<link rel='match' href='acid1_b.html'>
 <meta http-equiv="content-type" content="text/html; charset=windows-1252">
 		<title>
 			 display/box/float/clear test 
diff --git a/tests/ref/acid1_b.html b/tests/wpt/mozilla/tests/css/acid1_b.html
similarity index 100%
rename from tests/ref/acid1_b.html
rename to tests/wpt/mozilla/tests/css/acid1_b.html
diff --git a/tests/ref/border_spacing_empty_table.html b/tests/wpt/mozilla/tests/css/border_spacing_empty_table.html
similarity index 80%
rename from tests/ref/border_spacing_empty_table.html
rename to tests/wpt/mozilla/tests/css/border_spacing_empty_table.html
index d1ee2cc66c3..81f11a0797e 100644
--- a/tests/ref/border_spacing_empty_table.html
+++ b/tests/wpt/mozilla/tests/css/border_spacing_empty_table.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='border_spacing_empty_table_ref.html'>
     <meta charset="UTF-8">
     <style>
       body {
diff --git a/tests/ref/border_spacing_empty_table_ref.html b/tests/wpt/mozilla/tests/css/border_spacing_empty_table_ref.html
similarity index 100%
rename from tests/ref/border_spacing_empty_table_ref.html
rename to tests/wpt/mozilla/tests/css/border_spacing_empty_table_ref.html
diff --git a/tests/ref/border_style_none_a.html b/tests/wpt/mozilla/tests/css/border_style_none_a.html
similarity index 84%
rename from tests/ref/border_style_none_a.html
rename to tests/wpt/mozilla/tests/css/border_style_none_a.html
index d0389a8b803..d5120c0bb93 100644
--- a/tests/ref/border_style_none_a.html
+++ b/tests/wpt/mozilla/tests/css/border_style_none_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='border_style_none_b.html'>
 <style>
 html {
     margin: 0;
diff --git a/tests/ref/border_style_none_b.html b/tests/wpt/mozilla/tests/css/border_style_none_b.html
similarity index 100%
rename from tests/ref/border_style_none_b.html
rename to tests/wpt/mozilla/tests/css/border_style_none_b.html
diff --git a/tests/ref/box_shadow_bg.html b/tests/wpt/mozilla/tests/css/box_shadow_bg.html
similarity index 75%
rename from tests/ref/box_shadow_bg.html
rename to tests/wpt/mozilla/tests/css/box_shadow_bg.html
index 6a2bcc9a7ea..8fd3568aa40 100644
--- a/tests/ref/box_shadow_bg.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_bg.html
@@ -1,3 +1,4 @@
+<link rel='match' href='box_shadow_bg_ref.html'>
 <div></div>
 
 <style>
diff --git a/tests/ref/box_shadow_bg_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_bg_ref.html
similarity index 100%
rename from tests/ref/box_shadow_bg_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_bg_ref.html
diff --git a/tests/ref/box_shadow_border_box_a.html b/tests/wpt/mozilla/tests/css/box_shadow_border_box_a.html
similarity index 86%
rename from tests/ref/box_shadow_border_box_a.html
rename to tests/wpt/mozilla/tests/css/box_shadow_border_box_a.html
index e64f478dcc7..3bff2a2ee2c 100644
--- a/tests/ref/box_shadow_border_box_a.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_border_box_a.html
@@ -1,4 +1,5 @@
 <head>
+<link rel='match' href='box_shadow_border_box_ref.html'>
 <!-- Tests that the entire border-box is shadowed, not just the content box. -->
 <style>
 section {
diff --git a/tests/ref/box_shadow_border_box_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_border_box_ref.html
similarity index 100%
rename from tests/ref/box_shadow_border_box_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_border_box_ref.html
diff --git a/tests/ref/box_shadow_inset_bg.html b/tests/wpt/mozilla/tests/css/box_shadow_inset_bg.html
similarity index 74%
rename from tests/ref/box_shadow_inset_bg.html
rename to tests/wpt/mozilla/tests/css/box_shadow_inset_bg.html
index c728a08e827..eaa9f5211b5 100644
--- a/tests/ref/box_shadow_inset_bg.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_inset_bg.html
@@ -1,3 +1,4 @@
+<link rel='match' href='box_shadow_inset_bg_ref.html'>
 <div></div>
 
 <style>
diff --git a/tests/ref/box_shadow_inset_bg_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_inset_bg_ref.html
similarity index 100%
rename from tests/ref/box_shadow_inset_bg_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_inset_bg_ref.html
diff --git a/tests/ref/box_shadow_paint_order_a.html b/tests/wpt/mozilla/tests/css/box_shadow_paint_order_a.html
similarity index 83%
rename from tests/ref/box_shadow_paint_order_a.html
rename to tests/wpt/mozilla/tests/css/box_shadow_paint_order_a.html
index 8506bfc309d..035d075d15f 100644
--- a/tests/ref/box_shadow_paint_order_a.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_paint_order_a.html
@@ -1,4 +1,5 @@
 <head>
+<link rel='match' href='box_shadow_paint_order_ref.html'>
 <!-- Tests paint order of multiple box shadows. -->
 <style>
 section {
diff --git a/tests/ref/box_shadow_paint_order_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_paint_order_ref.html
similarity index 100%
rename from tests/ref/box_shadow_paint_order_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_paint_order_ref.html
diff --git a/tests/ref/box_sizing_border_box_a.html b/tests/wpt/mozilla/tests/css/box_sizing_border_box_a.html
similarity index 81%
rename from tests/ref/box_sizing_border_box_a.html
rename to tests/wpt/mozilla/tests/css/box_sizing_border_box_a.html
index 4deb2a93600..8be1adaf202 100644
--- a/tests/ref/box_sizing_border_box_a.html
+++ b/tests/wpt/mozilla/tests/css/box_sizing_border_box_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='box_sizing_border_box_ref.html'>
 <body>
 <div style="width: 256px; height: 256px; background: purple; border: 8px solid blue; box-sizing: border-box;"></div>
 <div style="width: 240px; height: 240px; background: purple; border: 8px solid blue;"></div>
diff --git a/tests/ref/box_sizing_border_box_ref.html b/tests/wpt/mozilla/tests/css/box_sizing_border_box_ref.html
similarity index 100%
rename from tests/ref/box_sizing_border_box_ref.html
rename to tests/wpt/mozilla/tests/css/box_sizing_border_box_ref.html
diff --git a/tests/ref/box_sizing_sanity_check_a.html b/tests/wpt/mozilla/tests/css/box_sizing_sanity_check_a.html
similarity index 69%
rename from tests/ref/box_sizing_sanity_check_a.html
rename to tests/wpt/mozilla/tests/css/box_sizing_sanity_check_a.html
index 9f4adbe3cba..de3de80ec30 100644
--- a/tests/ref/box_sizing_sanity_check_a.html
+++ b/tests/wpt/mozilla/tests/css/box_sizing_sanity_check_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='box_sizing_sanity_check_ref.html'>
 <body>
 <div style="box-sizing: border-box; float: left; background: yellow;">Heeheehee</div>
 </body>
diff --git a/tests/ref/box_sizing_sanity_check_ref.html b/tests/wpt/mozilla/tests/css/box_sizing_sanity_check_ref.html
similarity index 100%
rename from tests/ref/box_sizing_sanity_check_ref.html
rename to tests/wpt/mozilla/tests/css/box_sizing_sanity_check_ref.html
diff --git a/tests/ref/br-ref.html b/tests/wpt/mozilla/tests/css/br-ref.html
similarity index 100%
rename from tests/ref/br-ref.html
rename to tests/wpt/mozilla/tests/css/br-ref.html
diff --git a/tests/ref/br.html b/tests/wpt/mozilla/tests/css/br.html
similarity index 76%
rename from tests/ref/br.html
rename to tests/wpt/mozilla/tests/css/br.html
index 6574eb2dd8b..ec893104705 100644
--- a/tests/ref/br.html
+++ b/tests/wpt/mozilla/tests/css/br.html
@@ -1,6 +1,7 @@
 <!doctype HTML>
 <html>
   <head>
+    <link rel='match' href='br-ref.html'>
     <meta charset="UTF-8">
     <title>br test</title>
   </head>
diff --git a/tests/ref/calc-basic-ref.html b/tests/wpt/mozilla/tests/css/calc-basic-ref.html
similarity index 100%
rename from tests/ref/calc-basic-ref.html
rename to tests/wpt/mozilla/tests/css/calc-basic-ref.html
diff --git a/tests/ref/calc-basic.html b/tests/wpt/mozilla/tests/css/calc-basic.html
similarity index 82%
rename from tests/ref/calc-basic.html
rename to tests/wpt/mozilla/tests/css/calc-basic.html
index ae972fff38e..427c1260641 100644
--- a/tests/ref/calc-basic.html
+++ b/tests/wpt/mozilla/tests/css/calc-basic.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='calc-basic-ref.html'>
 <div id="outer">
   <div id="inner">
   </div>
diff --git a/tests/ref/canvas_as_block_element_a.html b/tests/wpt/mozilla/tests/css/canvas_as_block_element_a.html
similarity index 88%
rename from tests/ref/canvas_as_block_element_a.html
rename to tests/wpt/mozilla/tests/css/canvas_as_block_element_a.html
index a52a82e5787..747d90f8ded 100644
--- a/tests/ref/canvas_as_block_element_a.html
+++ b/tests/wpt/mozilla/tests/css/canvas_as_block_element_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <link rel='match' href='canvas_as_block_element_ref.html'>
   <meta charset="utf-8">
   <style>
     html, body {
diff --git a/tests/ref/canvas_as_block_element_ref.html b/tests/wpt/mozilla/tests/css/canvas_as_block_element_ref.html
similarity index 100%
rename from tests/ref/canvas_as_block_element_ref.html
rename to tests/wpt/mozilla/tests/css/canvas_as_block_element_ref.html
diff --git a/tests/ref/canvas_linear_gradient_a.html b/tests/wpt/mozilla/tests/css/canvas_linear_gradient_a.html
similarity index 89%
rename from tests/ref/canvas_linear_gradient_a.html
rename to tests/wpt/mozilla/tests/css/canvas_linear_gradient_a.html
index 5fc3f259e0a..9042ab36ec1 100644
--- a/tests/ref/canvas_linear_gradient_a.html
+++ b/tests/wpt/mozilla/tests/css/canvas_linear_gradient_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
+<link rel='match' href='canvas_linear_gradient_ref.html'>
 <style>
   html, body {
     margin: 0;
diff --git a/tests/ref/canvas_linear_gradient_ref.html b/tests/wpt/mozilla/tests/css/canvas_linear_gradient_ref.html
similarity index 100%
rename from tests/ref/canvas_linear_gradient_ref.html
rename to tests/wpt/mozilla/tests/css/canvas_linear_gradient_ref.html
diff --git a/tests/ref/case-insensitive-font-family-ref.html b/tests/wpt/mozilla/tests/css/case-insensitive-font-family-ref.html
similarity index 100%
rename from tests/ref/case-insensitive-font-family-ref.html
rename to tests/wpt/mozilla/tests/css/case-insensitive-font-family-ref.html
diff --git a/tests/wpt/mozilla/tests/css/case-insensitive-font-family.html b/tests/wpt/mozilla/tests/css/case-insensitive-font-family.html
new file mode 100644
index 00000000000..70b3be59507
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/case-insensitive-font-family.html
@@ -0,0 +1,2 @@
+<link rel='match' href='case-insensitive-font-family-ref.html'>
+<div style="font-family: arial">Hello, world!</div>
diff --git a/tests/ref/clear_generated_content_table_a.html b/tests/wpt/mozilla/tests/css/clear_generated_content_table_a.html
similarity index 79%
rename from tests/ref/clear_generated_content_table_a.html
rename to tests/wpt/mozilla/tests/css/clear_generated_content_table_a.html
index 9b5a787cad0..114cbc44e7d 100644
--- a/tests/ref/clear_generated_content_table_a.html
+++ b/tests/wpt/mozilla/tests/css/clear_generated_content_table_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='clear_generated_content_table_ref.html'>
 <style>
 .clearit:after {
     content: "";
diff --git a/tests/ref/clear_generated_content_table_ref.html b/tests/wpt/mozilla/tests/css/clear_generated_content_table_ref.html
similarity index 100%
rename from tests/ref/clear_generated_content_table_ref.html
rename to tests/wpt/mozilla/tests/css/clear_generated_content_table_ref.html
diff --git a/tests/ref/clip_a.html b/tests/wpt/mozilla/tests/css/clip_a.html
similarity index 95%
rename from tests/ref/clip_a.html
rename to tests/wpt/mozilla/tests/css/clip_a.html
index 249e586105d..c886cfe1dad 100644
--- a/tests/ref/clip_a.html
+++ b/tests/wpt/mozilla/tests/css/clip_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='clip_ref.html'>
 <!-- Tests that various `clip` values per CSS 2.1 work. -->
 <style>
 section {
diff --git a/tests/ref/clip_ref.html b/tests/wpt/mozilla/tests/css/clip_ref.html
similarity index 100%
rename from tests/ref/clip_ref.html
rename to tests/wpt/mozilla/tests/css/clip_ref.html
diff --git a/tests/ref/counters_nested_a.html b/tests/wpt/mozilla/tests/css/counters_nested_a.html
similarity index 92%
rename from tests/ref/counters_nested_a.html
rename to tests/wpt/mozilla/tests/css/counters_nested_a.html
index 39baa0ac16b..bff0efd91b7 100644
--- a/tests/ref/counters_nested_a.html
+++ b/tests/wpt/mozilla/tests/css/counters_nested_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='counters_nested_ref.html'>
 <!-- Tests that `counters` works with nested counters. -->
 <style>
 section {
diff --git a/tests/ref/counters_nested_ref.html b/tests/wpt/mozilla/tests/css/counters_nested_ref.html
similarity index 100%
rename from tests/ref/counters_nested_ref.html
rename to tests/wpt/mozilla/tests/css/counters_nested_ref.html
diff --git a/tests/ref/counters_simple_a.html b/tests/wpt/mozilla/tests/css/counters_simple_a.html
similarity index 93%
rename from tests/ref/counters_simple_a.html
rename to tests/wpt/mozilla/tests/css/counters_simple_a.html
index e8534e3da17..e2b46658ce2 100644
--- a/tests/ref/counters_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/counters_simple_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='counters_simple_ref.html'>
 <!-- Tests that `counter` works. -->
 <style>
 h1, h2, h3 {
diff --git a/tests/ref/counters_simple_ref.html b/tests/wpt/mozilla/tests/css/counters_simple_ref.html
similarity index 100%
rename from tests/ref/counters_simple_ref.html
rename to tests/wpt/mozilla/tests/css/counters_simple_ref.html
diff --git a/tests/ref/data_img_a.html b/tests/wpt/mozilla/tests/css/data_img_a.html
similarity index 99%
rename from tests/ref/data_img_a.html
rename to tests/wpt/mozilla/tests/css/data_img_a.html
index ce69991bc46..f93c93f27d2 100644
--- a/tests/ref/data_img_a.html
+++ b/tests/wpt/mozilla/tests/css/data_img_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='data_img_b.html'>
 <meta charset="UTF-8" />
 </head>
 <body>
diff --git a/tests/ref/data_img_b.html b/tests/wpt/mozilla/tests/css/data_img_b.html
similarity index 100%
rename from tests/ref/data_img_b.html
rename to tests/wpt/mozilla/tests/css/data_img_b.html
diff --git a/tests/ref/empty_cells_a.html b/tests/wpt/mozilla/tests/css/empty_cells_a.html
similarity index 91%
rename from tests/ref/empty_cells_a.html
rename to tests/wpt/mozilla/tests/css/empty_cells_a.html
index 40396ef5c45..db44cfc5d7b 100644
--- a/tests/ref/empty_cells_a.html
+++ b/tests/wpt/mozilla/tests/css/empty_cells_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='empty_cells_ref.html'>
 <!-- Tests that `empty-cells` works—in particular, that the definition of emptiness is correct. -->
 <style>
 table {
diff --git a/tests/ref/empty_cells_ref.html b/tests/wpt/mozilla/tests/css/empty_cells_ref.html
similarity index 100%
rename from tests/ref/empty_cells_ref.html
rename to tests/wpt/mozilla/tests/css/empty_cells_ref.html
diff --git a/tests/ref/external_media_query_link.html b/tests/wpt/mozilla/tests/css/external_media_query_link.html
similarity index 71%
rename from tests/ref/external_media_query_link.html
rename to tests/wpt/mozilla/tests/css/external_media_query_link.html
index 36af6dfba30..65baa6435c2 100644
--- a/tests/ref/external_media_query_link.html
+++ b/tests/wpt/mozilla/tests/css/external_media_query_link.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='external_media_query_ref.html'>
     <link rel="stylesheet" type="text/css" href="css/displaynone.css" media="print">
   </head>
   <body>
diff --git a/tests/ref/external_media_query_ref.html b/tests/wpt/mozilla/tests/css/external_media_query_ref.html
similarity index 100%
rename from tests/ref/external_media_query_ref.html
rename to tests/wpt/mozilla/tests/css/external_media_query_ref.html
diff --git a/tests/ref/external_media_query_style.html b/tests/wpt/mozilla/tests/css/external_media_query_style.html
similarity index 72%
rename from tests/ref/external_media_query_style.html
rename to tests/wpt/mozilla/tests/css/external_media_query_style.html
index 06d56a43ea3..159df328933 100644
--- a/tests/ref/external_media_query_style.html
+++ b/tests/wpt/mozilla/tests/css/external_media_query_style.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='external_media_query_ref.html'>
     <style type="text/css" media="print">
       body {
         display: none;
diff --git a/tests/ref/filter_inline_a.html b/tests/wpt/mozilla/tests/css/filter_inline_a.html
similarity index 83%
rename from tests/ref/filter_inline_a.html
rename to tests/wpt/mozilla/tests/css/filter_inline_a.html
index 1190c6602ad..faf692e1589 100644
--- a/tests/ref/filter_inline_a.html
+++ b/tests/wpt/mozilla/tests/css/filter_inline_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='filter_inline_ref.html'>
 <style type="text/css">
 
 .ex {
diff --git a/tests/ref/filter_inline_ref.html b/tests/wpt/mozilla/tests/css/filter_inline_ref.html
similarity index 100%
rename from tests/ref/filter_inline_ref.html
rename to tests/wpt/mozilla/tests/css/filter_inline_ref.html
diff --git a/tests/ref/filter_opacity_a.html b/tests/wpt/mozilla/tests/css/filter_opacity_a.html
similarity index 75%
rename from tests/ref/filter_opacity_a.html
rename to tests/wpt/mozilla/tests/css/filter_opacity_a.html
index efd8de5bc82..6c488755628 100644
--- a/tests/ref/filter_opacity_a.html
+++ b/tests/wpt/mozilla/tests/css/filter_opacity_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='filter_opacity_ref.html'>
 <style>
 img {
     filter: opacity(0.5);
diff --git a/tests/ref/filter_opacity_ref.html b/tests/wpt/mozilla/tests/css/filter_opacity_ref.html
similarity index 100%
rename from tests/ref/filter_opacity_ref.html
rename to tests/wpt/mozilla/tests/css/filter_opacity_ref.html
diff --git a/tests/ref/filter_sepia_a.html b/tests/wpt/mozilla/tests/css/filter_sepia_a.html
similarity index 81%
rename from tests/ref/filter_sepia_a.html
rename to tests/wpt/mozilla/tests/css/filter_sepia_a.html
index ceb4bd307a8..936d6a99153 100644
--- a/tests/ref/filter_sepia_a.html
+++ b/tests/wpt/mozilla/tests/css/filter_sepia_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='filter_sepia_ref.html'>
 <style>
 section {
     filter: sepia(100%);
diff --git a/tests/ref/filter_sepia_ref.html b/tests/wpt/mozilla/tests/css/filter_sepia_ref.html
similarity index 100%
rename from tests/ref/filter_sepia_ref.html
rename to tests/wpt/mozilla/tests/css/filter_sepia_ref.html
diff --git a/tests/ref/first_child_pseudo_a.html b/tests/wpt/mozilla/tests/css/first_child_pseudo_a.html
similarity index 93%
rename from tests/ref/first_child_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/first_child_pseudo_a.html
index c2eabab18b9..c32fe0857fe 100644
--- a/tests/ref/first_child_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/first_child_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='first_child_pseudo_b.html'>
     <title>:first-child test</title>
     <style type="text/css">
       html             { background: red;}
diff --git a/tests/ref/first_child_pseudo_b.html b/tests/wpt/mozilla/tests/css/first_child_pseudo_b.html
similarity index 100%
rename from tests/ref/first_child_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/first_child_pseudo_b.html
diff --git a/tests/ref/first_of_type_pseudo_a.html b/tests/wpt/mozilla/tests/css/first_of_type_pseudo_a.html
similarity index 95%
rename from tests/ref/first_of_type_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/first_of_type_pseudo_a.html
index 439348410fd..40a1066a4ae 100644
--- a/tests/ref/first_of_type_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/first_of_type_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='first_of_type_pseudo_b.html'>
     <title>:first-of-type test</title>
     <style type="text/css">
       html { background: red; }
diff --git a/tests/ref/first_of_type_pseudo_b.html b/tests/wpt/mozilla/tests/css/first_of_type_pseudo_b.html
similarity index 100%
rename from tests/ref/first_of_type_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/first_of_type_pseudo_b.html
diff --git a/tests/ref/float_clearance_a.html b/tests/wpt/mozilla/tests/css/float_clearance_a.html
similarity index 82%
rename from tests/ref/float_clearance_a.html
rename to tests/wpt/mozilla/tests/css/float_clearance_a.html
index a24e90e14ce..56d292a2dfa 100644
--- a/tests/ref/float_clearance_a.html
+++ b/tests/wpt/mozilla/tests/css/float_clearance_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <link rel='match' href='float_clearance_ref.html'>
 </head>
 <body>
     <div style="width: 256px;">
diff --git a/tests/ref/float_clearance_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/float_clearance_intrinsic_width_a.html
similarity index 88%
rename from tests/ref/float_clearance_intrinsic_width_a.html
rename to tests/wpt/mozilla/tests/css/float_clearance_intrinsic_width_a.html
index 2e9704a5914..cfc418664dd 100644
--- a/tests/ref/float_clearance_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/float_clearance_intrinsic_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='float_clearance_intrinsic_width_ref.html'>
 <style>
 #nav-your-account {
 	background: lightblue;
diff --git a/tests/ref/float_clearance_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/float_clearance_intrinsic_width_ref.html
similarity index 100%
rename from tests/ref/float_clearance_intrinsic_width_ref.html
rename to tests/wpt/mozilla/tests/css/float_clearance_intrinsic_width_ref.html
diff --git a/tests/ref/float_clearance_ref.html b/tests/wpt/mozilla/tests/css/float_clearance_ref.html
similarity index 100%
rename from tests/ref/float_clearance_ref.html
rename to tests/wpt/mozilla/tests/css/float_clearance_ref.html
diff --git a/tests/ref/float_intrinsic_height.html b/tests/wpt/mozilla/tests/css/float_intrinsic_height.html
similarity index 86%
rename from tests/ref/float_intrinsic_height.html
rename to tests/wpt/mozilla/tests/css/float_intrinsic_height.html
index f349085d23c..62005640d5e 100644
--- a/tests/ref/float_intrinsic_height.html
+++ b/tests/wpt/mozilla/tests/css/float_intrinsic_height.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
+    <link rel='match' href='float_intrinsic_height_ref.html'>
 		<style type="text/css">
 			.otherprojects {
 				background-color: red;
diff --git a/tests/ref/float_intrinsic_height_ref.html b/tests/wpt/mozilla/tests/css/float_intrinsic_height_ref.html
similarity index 100%
rename from tests/ref/float_intrinsic_height_ref.html
rename to tests/wpt/mozilla/tests/css/float_intrinsic_height_ref.html
diff --git a/tests/ref/float_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
similarity index 87%
rename from tests/ref/float_intrinsic_width_a.html
rename to tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
index 766eb70c0b3..0b95a453740 100644
--- a/tests/ref/float_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='float_intrinsic_width_ref.html'>
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/ref/float_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/float_intrinsic_width_ref.html
similarity index 100%
rename from tests/ref/float_intrinsic_width_ref.html
rename to tests/wpt/mozilla/tests/css/float_intrinsic_width_ref.html
diff --git a/tests/ref/float_overflow_area_a.html b/tests/wpt/mozilla/tests/css/float_overflow_area_a.html
similarity index 75%
rename from tests/ref/float_overflow_area_a.html
rename to tests/wpt/mozilla/tests/css/float_overflow_area_a.html
index 9597f2a6d97..5f663e4beea 100644
--- a/tests/ref/float_overflow_area_a.html
+++ b/tests/wpt/mozilla/tests/css/float_overflow_area_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='float_overflow_area_ref.html'>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/ref/float_overflow_area_ref.html b/tests/wpt/mozilla/tests/css/float_overflow_area_ref.html
similarity index 100%
rename from tests/ref/float_overflow_area_ref.html
rename to tests/wpt/mozilla/tests/css/float_overflow_area_ref.html
diff --git a/tests/ref/float_positioned_pseudo_stacking_context.html b/tests/wpt/mozilla/tests/css/float_positioned_pseudo_stacking_context.html
similarity index 82%
rename from tests/ref/float_positioned_pseudo_stacking_context.html
rename to tests/wpt/mozilla/tests/css/float_positioned_pseudo_stacking_context.html
index 567608dee9a..9aae3ec767e 100644
--- a/tests/ref/float_positioned_pseudo_stacking_context.html
+++ b/tests/wpt/mozilla/tests/css/float_positioned_pseudo_stacking_context.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='float_positioned_pseudo_stacking_context_ref.html'>
 <style>
   html, body {
     margin: 0; padding: 0;
diff --git a/tests/ref/float_positioned_pseudo_stacking_context_ref.html b/tests/wpt/mozilla/tests/css/float_positioned_pseudo_stacking_context_ref.html
similarity index 100%
rename from tests/ref/float_positioned_pseudo_stacking_context_ref.html
rename to tests/wpt/mozilla/tests/css/float_positioned_pseudo_stacking_context_ref.html
diff --git a/tests/ref/float_right_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
similarity index 85%
rename from tests/ref/float_right_intrinsic_width_a.html
rename to tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
index 6e32cde2ce6..ee47bd9244b 100644
--- a/tests/ref/float_right_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='float_right_intrinsic_width_ref.html'>
         <style type="text/css">
             .fr {
                 float: right;
diff --git a/tests/ref/float_right_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_ref.html
similarity index 100%
rename from tests/ref/float_right_intrinsic_width_ref.html
rename to tests/wpt/mozilla/tests/css/float_right_intrinsic_width_ref.html
diff --git a/tests/ref/float_table_a.html b/tests/wpt/mozilla/tests/css/float_table_a.html
similarity index 92%
rename from tests/ref/float_table_a.html
rename to tests/wpt/mozilla/tests/css/float_table_a.html
index 2d5baabed6e..c4b4a76e4c4 100644
--- a/tests/ref/float_table_a.html
+++ b/tests/wpt/mozilla/tests/css/float_table_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='float_table_ref.html'>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <meta charset="UTF-8">
         <style type="text/css">
diff --git a/tests/ref/float_table_ref.html b/tests/wpt/mozilla/tests/css/float_table_ref.html
similarity index 100%
rename from tests/ref/float_table_ref.html
rename to tests/wpt/mozilla/tests/css/float_table_ref.html
diff --git a/tests/ref/float_under_top_margin_a.html b/tests/wpt/mozilla/tests/css/float_under_top_margin_a.html
similarity index 84%
rename from tests/ref/float_under_top_margin_a.html
rename to tests/wpt/mozilla/tests/css/float_under_top_margin_a.html
index 5cf1fdbdbd4..ffe30dac16d 100644
--- a/tests/ref/float_under_top_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/float_under_top_margin_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='float_under_top_margin_ref.html'>
 <style>
 * {
     margin: 0;
diff --git a/tests/ref/float_under_top_margin_ref.html b/tests/wpt/mozilla/tests/css/float_under_top_margin_ref.html
similarity index 100%
rename from tests/ref/float_under_top_margin_ref.html
rename to tests/wpt/mozilla/tests/css/float_under_top_margin_ref.html
diff --git a/tests/ref/floated_generated_content_a.html b/tests/wpt/mozilla/tests/css/floated_generated_content_a.html
similarity index 75%
rename from tests/ref/floated_generated_content_a.html
rename to tests/wpt/mozilla/tests/css/floated_generated_content_a.html
index 0ba5f509f19..7e82d877bbb 100644
--- a/tests/ref/floated_generated_content_a.html
+++ b/tests/wpt/mozilla/tests/css/floated_generated_content_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='floated_generated_content_b.html'>
 <style>
 .stand:before {
     content: "";
diff --git a/tests/ref/floated_generated_content_b.html b/tests/wpt/mozilla/tests/css/floated_generated_content_b.html
similarity index 100%
rename from tests/ref/floated_generated_content_b.html
rename to tests/wpt/mozilla/tests/css/floated_generated_content_b.html
diff --git a/tests/ref/floated_list_item_a.html b/tests/wpt/mozilla/tests/css/floated_list_item_a.html
similarity index 85%
rename from tests/ref/floated_list_item_a.html
rename to tests/wpt/mozilla/tests/css/floated_list_item_a.html
index 77e2697b639..226d39e6d7a 100644
--- a/tests/ref/floated_list_item_a.html
+++ b/tests/wpt/mozilla/tests/css/floated_list_item_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='floated_list_item_ref.html'>
 <!-- Tests that list items can be floated. -->
 <style>
 ul div {
diff --git a/tests/ref/floated_list_item_ref.html b/tests/wpt/mozilla/tests/css/floated_list_item_ref.html
similarity index 100%
rename from tests/ref/floated_list_item_ref.html
rename to tests/wpt/mozilla/tests/css/floated_list_item_ref.html
diff --git a/tests/ref/floated_table_with_margin_a.html b/tests/wpt/mozilla/tests/css/floated_table_with_margin_a.html
similarity index 89%
rename from tests/ref/floated_table_with_margin_a.html
rename to tests/wpt/mozilla/tests/css/floated_table_with_margin_a.html
index 92022c97a1e..37f6cc51bcc 100644
--- a/tests/ref/floated_table_with_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/floated_table_with_margin_a.html
@@ -2,6 +2,7 @@
 
 <html>
 <head>
+    <link rel='match' href='floated_table_with_margin_ref.html'>
     <title>Rust - Wikipedia, the free encyclopedia</title>
     <style>
         body {
diff --git a/tests/ref/floated_table_with_margin_ref.html b/tests/wpt/mozilla/tests/css/floated_table_with_margin_ref.html
similarity index 100%
rename from tests/ref/floated_table_with_margin_ref.html
rename to tests/wpt/mozilla/tests/css/floated_table_with_margin_ref.html
diff --git a/tests/ref/focus_selector.html b/tests/wpt/mozilla/tests/css/focus_selector.html
similarity index 84%
rename from tests/ref/focus_selector.html
rename to tests/wpt/mozilla/tests/css/focus_selector.html
index 807480637f2..1a6ca184d5f 100644
--- a/tests/ref/focus_selector.html
+++ b/tests/wpt/mozilla/tests/css/focus_selector.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <link rel='match' href='focus_selector_ref.html'>
     <meta charset="UTF-8">
     <style>
       input:focus {
diff --git a/tests/ref/focus_selector_ref.html b/tests/wpt/mozilla/tests/css/focus_selector_ref.html
similarity index 100%
rename from tests/ref/focus_selector_ref.html
rename to tests/wpt/mozilla/tests/css/focus_selector_ref.html
diff --git a/tests/ref/font_advance.html b/tests/wpt/mozilla/tests/css/font_advance.html
similarity index 70%
rename from tests/ref/font_advance.html
rename to tests/wpt/mozilla/tests/css/font_advance.html
index 91d871a656e..777ab7e54e0 100644
--- a/tests/ref/font_advance.html
+++ b/tests/wpt/mozilla/tests/css/font_advance.html
@@ -1,2 +1,3 @@
+<link rel='match' href='font_advance_ref.html'>
 <!-- Not a reftest, but a crashtest for #4614 -->
 a<div id="test" style="font-size: 100000px">Hello world</div>
diff --git a/tests/ref/font_advance_ref.html b/tests/wpt/mozilla/tests/css/font_advance_ref.html
similarity index 100%
rename from tests/ref/font_advance_ref.html
rename to tests/wpt/mozilla/tests/css/font_advance_ref.html
diff --git a/tests/ref/font_color_attribute_a.html b/tests/wpt/mozilla/tests/css/font_color_attribute_a.html
similarity index 63%
rename from tests/ref/font_color_attribute_a.html
rename to tests/wpt/mozilla/tests/css/font_color_attribute_a.html
index 320f662ea15..958443ffaf8 100644
--- a/tests/ref/font_color_attribute_a.html
+++ b/tests/wpt/mozilla/tests/css/font_color_attribute_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='font_color_attribute_ref.html'>
 </head>
 <body>
 <p><font color=blue>Servo</font></p>
diff --git a/tests/ref/font_color_attribute_ref.html b/tests/wpt/mozilla/tests/css/font_color_attribute_ref.html
similarity index 100%
rename from tests/ref/font_color_attribute_ref.html
rename to tests/wpt/mozilla/tests/css/font_color_attribute_ref.html
diff --git a/tests/ref/font_face_attribute.html b/tests/wpt/mozilla/tests/css/font_face_attribute.html
similarity index 77%
rename from tests/ref/font_face_attribute.html
rename to tests/wpt/mozilla/tests/css/font_face_attribute.html
index d42dbaae98f..193ef0309ec 100644
--- a/tests/ref/font_face_attribute.html
+++ b/tests/wpt/mozilla/tests/css/font_face_attribute.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <link rel='match' href='font_face_attribute_ref.html'>
 </head>
 <body>
 <p><font face=monospace>Servo</font></p>
diff --git a/tests/ref/font_face_attribute_ref.html b/tests/wpt/mozilla/tests/css/font_face_attribute_ref.html
similarity index 100%
rename from tests/ref/font_face_attribute_ref.html
rename to tests/wpt/mozilla/tests/css/font_face_attribute_ref.html
diff --git a/tests/ref/font_style.html b/tests/wpt/mozilla/tests/css/font_style.html
similarity index 85%
rename from tests/ref/font_style.html
rename to tests/wpt/mozilla/tests/css/font_style.html
index 18c67976c26..fbbd662f0f9 100644
--- a/tests/ref/font_style.html
+++ b/tests/wpt/mozilla/tests/css/font_style.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='font_style_ref.html'>
 <style>
 p.normal {
     font-style: normal;
diff --git a/tests/ref/font_style_ref.html b/tests/wpt/mozilla/tests/css/font_style_ref.html
similarity index 100%
rename from tests/ref/font_style_ref.html
rename to tests/wpt/mozilla/tests/css/font_style_ref.html
diff --git a/tests/ref/height_compute.html b/tests/wpt/mozilla/tests/css/height_compute.html
similarity index 100%
rename from tests/ref/height_compute.html
rename to tests/wpt/mozilla/tests/css/height_compute.html
diff --git a/tests/ref/height_compute_reset.html b/tests/wpt/mozilla/tests/css/height_compute_reset.html
similarity index 93%
rename from tests/ref/height_compute_reset.html
rename to tests/wpt/mozilla/tests/css/height_compute_reset.html
index 114e7ef97c2..146b6b994d9 100644
--- a/tests/ref/height_compute_reset.html
+++ b/tests/wpt/mozilla/tests/css/height_compute_reset.html
@@ -1,5 +1,6 @@
 <head>
 <link rel="stylesheet" href="reset.css" />
+<link rel='match' href='height_compute.html'>
 <style type="text/css">
 .start {background-color : gray; height : 600px}
 .half {background-color : red; height : 50%}
diff --git a/tests/ref/hide_after_create.html b/tests/wpt/mozilla/tests/css/hide_after_create.html
similarity index 90%
rename from tests/ref/hide_after_create.html
rename to tests/wpt/mozilla/tests/css/hide_after_create.html
index e2fc4db41fb..3ae85e9c54e 100644
--- a/tests/ref/hide_after_create.html
+++ b/tests/wpt/mozilla/tests/css/hide_after_create.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+  <link rel='match' href='hide_after_create_ref.html'>
 	<style type="text/css">
 		.hidden {
 			display: none;
diff --git a/tests/ref/hide_after_create_ref.html b/tests/wpt/mozilla/tests/css/hide_after_create_ref.html
similarity index 100%
rename from tests/ref/hide_after_create_ref.html
rename to tests/wpt/mozilla/tests/css/hide_after_create_ref.html
diff --git a/tests/ref/img_block_display_a.html b/tests/wpt/mozilla/tests/css/img_block_display_a.html
similarity index 88%
rename from tests/ref/img_block_display_a.html
rename to tests/wpt/mozilla/tests/css/img_block_display_a.html
index 95808589bc5..5e3071ac1e0 100644
--- a/tests/ref/img_block_display_a.html
+++ b/tests/wpt/mozilla/tests/css/img_block_display_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='img_block_display_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/img_block_display_ref.html b/tests/wpt/mozilla/tests/css/img_block_display_ref.html
similarity index 100%
rename from tests/ref/img_block_display_ref.html
rename to tests/wpt/mozilla/tests/css/img_block_display_ref.html
diff --git a/tests/ref/img_dynamic_remove.html b/tests/wpt/mozilla/tests/css/img_dynamic_remove.html
similarity index 73%
rename from tests/ref/img_dynamic_remove.html
rename to tests/wpt/mozilla/tests/css/img_dynamic_remove.html
index f8a694446ac..9099677cfa1 100644
--- a/tests/ref/img_dynamic_remove.html
+++ b/tests/wpt/mozilla/tests/css/img_dynamic_remove.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<link rel='match' href='img_dynamic_remove_ref.html'>
 Image dynamic remove
 <img src=400x400_green.png>
 <script>
diff --git a/tests/ref/img_dynamic_remove_ref.html b/tests/wpt/mozilla/tests/css/img_dynamic_remove_ref.html
similarity index 100%
rename from tests/ref/img_dynamic_remove_ref.html
rename to tests/wpt/mozilla/tests/css/img_dynamic_remove_ref.html
diff --git a/tests/wpt/mozilla/tests/css/img_padding_a.html b/tests/wpt/mozilla/tests/css/img_padding_a.html
new file mode 100644
index 00000000000..e445f33fa06
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/img_padding_a.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+    <link rel='match' href='img_padding_b.html'>
+    <body>
+        <img src="rust-0.png" style='padding-top: 100px; border: 1px solid black; position:relative; height: 206px; width: 206px; left:0px; top: 0px;'>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/css/img_padding_b.html b/tests/wpt/mozilla/tests/css/img_padding_b.html
new file mode 100644
index 00000000000..53ee894332d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/img_padding_b.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+    <body>
+        <img src="rust-0.png" style='padding-top: 100px; border: 1px solid black;'>
+    </body>
+</html>
diff --git a/tests/ref/img_width_attribute_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/img_width_attribute_intrinsic_width_a.html
similarity index 90%
rename from tests/ref/img_width_attribute_intrinsic_width_a.html
rename to tests/wpt/mozilla/tests/css/img_width_attribute_intrinsic_width_a.html
index 58ea5d9227f..9e8ce593df4 100644
--- a/tests/ref/img_width_attribute_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/img_width_attribute_intrinsic_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <link rel='match' href='img_width_attribute_intrinsic_width_ref.html'>
 </head>
 <body>
 <table>
diff --git a/tests/ref/img_width_attribute_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/img_width_attribute_intrinsic_width_ref.html
similarity index 100%
rename from tests/ref/img_width_attribute_intrinsic_width_ref.html
rename to tests/wpt/mozilla/tests/css/img_width_attribute_intrinsic_width_ref.html
diff --git a/tests/ref/incremental_text_color_a.html b/tests/wpt/mozilla/tests/css/incremental_text_color_a.html
similarity index 87%
rename from tests/ref/incremental_text_color_a.html
rename to tests/wpt/mozilla/tests/css/incremental_text_color_a.html
index 8ac15b01619..3dd8e0126d4 100644
--- a/tests/ref/incremental_text_color_a.html
+++ b/tests/wpt/mozilla/tests/css/incremental_text_color_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='incremental_text_color_ref.html'>
     <meta charset="UTF-8">
     <title>Incremental layout text color test</title>
     <style>
diff --git a/tests/ref/incremental_text_color_ref.html b/tests/wpt/mozilla/tests/css/incremental_text_color_ref.html
similarity index 100%
rename from tests/ref/incremental_text_color_ref.html
rename to tests/wpt/mozilla/tests/css/incremental_text_color_ref.html
diff --git a/tests/ref/inline_block_baseline_a.html b/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
similarity index 89%
rename from tests/ref/inline_block_baseline_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
index 1345d3331b2..ff80d2fccb8 100644
--- a/tests/ref/inline_block_baseline_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_baseline_ref.html'>
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/ref/inline_block_baseline_ref.html b/tests/wpt/mozilla/tests/css/inline_block_baseline_ref.html
similarity index 100%
rename from tests/ref/inline_block_baseline_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_baseline_ref.html
diff --git a/tests/ref/inline_block_border_intrinsic_size_a.html b/tests/wpt/mozilla/tests/css/inline_block_border_intrinsic_size_a.html
similarity index 85%
rename from tests/ref/inline_block_border_intrinsic_size_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_border_intrinsic_size_a.html
index 7e8a7e0be19..656b344a34b 100644
--- a/tests/ref/inline_block_border_intrinsic_size_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_border_intrinsic_size_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='inline_block_border_intrinsic_size_ref.html'>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/inline_block_border_intrinsic_size_ref.html b/tests/wpt/mozilla/tests/css/inline_block_border_intrinsic_size_ref.html
similarity index 100%
rename from tests/ref/inline_block_border_intrinsic_size_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_border_intrinsic_size_ref.html
diff --git a/tests/wpt/mozilla/tests/css/reset.css b/tests/wpt/mozilla/tests/css/reset.css
new file mode 100644
index 00000000000..e5156472701
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/reset.css
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+    display: block;
+}
+body {
+    line-height: 1;
+}
+ol, ul {
+    list-style: none;
+}
+blockquote, q {
+    quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+    content: '';
+    content: none;
+}
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
diff --git a/tests/wpt/mozilla/tests/css/rust-0.png b/tests/wpt/mozilla/tests/css/rust-0.png
new file mode 100644
index 00000000000..20d93badf5e
Binary files /dev/null and b/tests/wpt/mozilla/tests/css/rust-0.png differ