diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 61ce1756a89..b787c1850d4 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -112,90 +112,35 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m
 == 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_size_a.html img_size_b.html
 == img_width_attribute_intrinsic_width_a.html img_width_attribute_intrinsic_width_ref.html
-== img_width_style_intrinsic_width_a.html img_width_style_intrinsic_width_ref.html
-== incremental_float_a.html incremental_float_ref.html
-== incremental_inline_layout_a.html incremental_inline_layout_ref.html
-== incremental_letter_spacing_a.html incremental_letter_spacing_ref.html
 == incremental_text_color_a.html incremental_text_color_ref.html
-== inline_absolute_hypothetical_clip_a.html inline_absolute_hypothetical_clip_ref.html
-== inline_absolute_out_of_flow_a.html inline_absolute_out_of_flow_ref.html
 != inline_background_a.html inline_background_ref.html
 == inline_block_baseline_a.html inline_block_baseline_ref.html
-== inline_block_block_direction_margins_a.html inline_block_block_direction_margins_ref.html
-== inline_block_border_a.html inline_block_border_ref.html
 == inline_block_border_intrinsic_size_a.html inline_block_border_intrinsic_size_ref.html
-== inline_block_img_a.html inline_block_img_ref.html
-== inline_block_margin_a.html inline_block_margin_ref.html
 == inline_block_margin_auto_a.html inline_block_margin_auto_ref.html
-== inline_block_margin_auto_zero_a.html inline_block_margin_auto_zero_ref.html
-== inline_block_min_width.html inline_block_min_width_ref.html
-== inline_block_overflow.html inline_block_overflow_ref.html
-== inline_block_overflow_hidden_a.html inline_block_overflow_hidden_ref.html
-== inline_block_parent_padding_a.html inline_block_parent_padding_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
-== inline_block_percentage_height_a.html inline_block_percentage_height_ref.html
-== inline_block_stacking_context_a.html inline_block_stacking_context_ref.html
-== inline_block_with_margin_a.html inline_block_with_margin_ref.html
 # inline_border_a.html inline_border_b.html
-== inline_hypothetical_box_a.html inline_hypothetical_box_ref.html
-== inline_margin_multiple_fragments_a.html inline_margin_multiple_fragments_ref.html
-== inline_margins_intrinsic_size_a.html inline_margins_intrinsic_size_ref.html
-== inline_text_align_a.html inline_text_align_b.html
 == inline_whitespace_a.html inline_whitespace_ref.html
 == inline_whitespace_b.html inline_whitespace_ref.html
-== input_button_margins_a.html input_button_margins_ref.html
-== input_button_size_a.html input_button_size_ref.html
 != input_height_a.html input_height_ref.html
 != inset_blackborder.html blackborder_ref.html
 == jpeg_normal.html jpeg_ref.html
 == jpeg_progressive.html jpeg_ref.html
-== last_child_pseudo_a.html last_child_pseudo_b.html
-== last_of_type_pseudo_a.html last_of_type_pseudo_b.html
 == legacy_cellspacing_attribute_a.html border_spacing_ref.html
 == legacy_td_width_attribute_a.html legacy_td_width_attribute_ref.html
 == legacy_th_width_attribute_a.html legacy_td_width_attribute_ref.html
-== li_absolute_containing_block_a.html li_absolute_containing_block_ref.html
-== line_breaking_whitespace_collapse_a.html line_breaking_whitespace_collapse_ref.html
 == line_height_a.html line_height_ref.html
-== line_height_float_placement_a.html line_height_float_placement_ref.html
 != linear_gradients_corners_a.html linear_gradients_corners_ref.html
-== linear_gradients_lengths_a.html linear_gradients_lengths_ref.html
-== linear_gradients_parsing_a.html linear_gradients_parsing_ref.html
-== linear_gradients_reverse_a.html linear_gradients_reverse_ref.html
 != linear_gradients_smoke_a.html linear_gradients_smoke_ref.html
-== linebreak_inline_span_a.html linebreak_inline_span_b.html
 flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
 # Fails intermittently (#3636)
 # == link_style_dynamic_addition.html link_style_dynamic_addition_ref.html
-== link_style_order.html link_style_order_ref.html
-== list_style_image_sizing_a.html list_style_image_sizing_ref.html
 == list_style_position_a.html list_style_position_ref.html
 != list_style_type_a.html list_style_type_ref.html
-== many_brs_a.html many_brs_ref.html
 == margin_a.html margin_b.html
-== margin_padding_inline_block_a.html margin_padding_inline_block_ref.html
-== margins_inside_floats_a.html margins_inside_floats_ref.html
 == marker_block_direction_placement_a.html marker_block_direction_placement_ref.html
-== max_width_float_simple_a.html max_width_float_simple_b.html
-== max_width_simple_a.html max_width_simple_b.html
-== min_max_height_a.html min_max_height_b.html
-== min_width_float_simple_a.html min_width_float_simple_b.html
-== min_width_simple_a.html min_width_simple_b.html
-== minimum_line_height_a.html minimum_line_height_b.html
-== mix_blend_mode_a.html mix_blend_mode_ref.html
-== multiple_css_class_a.html multiple_css_class_b.html
-== negative_margin_uncle_a.html negative_margin_uncle_b.html
-== negative_margins_a.html negative_margins_b.html
-== no-image.html no-image-ref.html
-== no_image_background_a.html no_image_background_ref.html
-== noscript.html noscript_ref.html
 != noteq_attr_exists_selector.html attr_exists_selector_ref.html
-== nth_last_of_type_pseudo_a.html nth_last_of_type_pseudo_b.html
-== nth_of_type_pseudo_a.html nth_of_type_pseudo_b.html
-== object_element_a.html object_element_b.html
 != octicons_a.html octicons_ref.html
 == ol_japanese_iroha_a.html ol_japanese_iroha_ref.html
 != ol_japanese_iroha_bullet_styles.html ol_japanese_iroha_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index ea7668649fe..d7c45f961fd 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -683,6 +683,234 @@
             "url": "/_mozilla/css/flex_nochild.html"
           }
         ],
+        "css/img_size_a.html": [
+          {
+            "path": "css/img_size_a.html",
+            "references": [
+              [
+                "/_mozilla/css/img_size_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_size_a.html"
+          }
+        ],
+        "css/img_width_style_intrinsic_width_a.html": [
+          {
+            "path": "css/img_width_style_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/img_width_style_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/img_width_style_intrinsic_width_a.html"
+          }
+        ],
+        "css/incremental_float_a.html": [
+          {
+            "path": "css/incremental_float_a.html",
+            "references": [
+              [
+                "/_mozilla/css/incremental_float_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/incremental_float_a.html"
+          }
+        ],
+        "css/incremental_inline_layout_a.html": [
+          {
+            "path": "css/incremental_inline_layout_a.html",
+            "references": [
+              [
+                "/_mozilla/css/incremental_inline_layout_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/incremental_inline_layout_a.html"
+          }
+        ],
+        "css/incremental_letter_spacing_a.html": [
+          {
+            "path": "css/incremental_letter_spacing_a.html",
+            "references": [
+              [
+                "/_mozilla/css/incremental_letter_spacing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/incremental_letter_spacing_a.html"
+          }
+        ],
+        "css/inline_absolute_hypothetical_clip_a.html": [
+          {
+            "path": "css/inline_absolute_hypothetical_clip_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_absolute_hypothetical_clip_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_absolute_hypothetical_clip_a.html"
+          }
+        ],
+        "css/inline_absolute_out_of_flow_a.html": [
+          {
+            "path": "css/inline_absolute_out_of_flow_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_absolute_out_of_flow_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
+          }
+        ],
+        "css/inline_block_block_direction_margins_a.html": [
+          {
+            "path": "css/inline_block_block_direction_margins_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_block_direction_margins_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_block_direction_margins_a.html"
+          }
+        ],
+        "css/inline_block_border_a.html": [
+          {
+            "path": "css/inline_block_border_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_border_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_border_a.html"
+          }
+        ],
+        "css/inline_block_img_a.html": [
+          {
+            "path": "css/inline_block_img_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_img_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_img_a.html"
+          }
+        ],
+        "css/inline_block_margin_a.html": [
+          {
+            "path": "css/inline_block_margin_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_margin_a.html"
+          }
+        ],
+        "css/inline_block_margin_auto_zero_a.html": [
+          {
+            "path": "css/inline_block_margin_auto_zero_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_margin_auto_zero_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_margin_auto_zero_a.html"
+          }
+        ],
+        "css/inline_block_min_width.html": [
+          {
+            "path": "css/inline_block_min_width.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_min_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_min_width.html"
+          }
+        ],
+        "css/inline_block_overflow.html": [
+          {
+            "path": "css/inline_block_overflow.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_overflow_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_overflow.html"
+          }
+        ],
+        "css/inline_block_overflow_hidden_a.html": [
+          {
+            "path": "css/inline_block_overflow_hidden_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_overflow_hidden_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_overflow_hidden_a.html"
+          }
+        ],
+        "css/inline_block_parent_padding_a.html": [
+          {
+            "path": "css/inline_block_parent_padding_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_parent_padding_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_parent_padding_a.html"
+          }
+        ],
+        "css/inline_block_percentage_height_a.html": [
+          {
+            "path": "css/inline_block_percentage_height_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_percentage_height_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_percentage_height_a.html"
+          }
+        ],
+        "css/inline_block_stacking_context_a.html": [
+          {
+            "path": "css/inline_block_stacking_context_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_stacking_context_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_stacking_context_a.html"
+          }
+        ],
+        "css/inline_block_with_margin_a.html": [
+          {
+            "path": "css/inline_block_with_margin_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_with_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_with_margin_a.html"
+          }
+        ],
         "css/inline_border_baseline_a.html": [
           {
             "path": "css/inline_border_baseline_a.html",
@@ -707,6 +935,30 @@
             "url": "/_mozilla/css/inline_element_border_a.html"
           }
         ],
+        "css/inline_hypothetical_box_a.html": [
+          {
+            "path": "css/inline_hypothetical_box_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_hypothetical_box_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_hypothetical_box_a.html"
+          }
+        ],
+        "css/inline_margin_multiple_fragments_a.html": [
+          {
+            "path": "css/inline_margin_multiple_fragments_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_margin_multiple_fragments_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_margin_multiple_fragments_a.html"
+          }
+        ],
         "css/inline_margins_a.html": [
           {
             "path": "css/inline_margins_a.html",
@@ -719,6 +971,18 @@
             "url": "/_mozilla/css/inline_margins_a.html"
           }
         ],
+        "css/inline_margins_intrinsic_size_a.html": [
+          {
+            "path": "css/inline_margins_intrinsic_size_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_margins_intrinsic_size_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_margins_intrinsic_size_a.html"
+          }
+        ],
         "css/inline_padding_a.html": [
           {
             "path": "css/inline_padding_a.html",
@@ -731,6 +995,42 @@
             "url": "/_mozilla/css/inline_padding_a.html"
           }
         ],
+        "css/inline_text_align_a.html": [
+          {
+            "path": "css/inline_text_align_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_text_align_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_text_align_a.html"
+          }
+        ],
+        "css/input_button_margins_a.html": [
+          {
+            "path": "css/input_button_margins_a.html",
+            "references": [
+              [
+                "/_mozilla/css/input_button_margins_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/input_button_margins_a.html"
+          }
+        ],
+        "css/input_button_size_a.html": [
+          {
+            "path": "css/input_button_size_a.html",
+            "references": [
+              [
+                "/_mozilla/css/input_button_size_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/input_button_size_a.html"
+          }
+        ],
         "css/inset.html": [
           {
             "path": "css/inset.html",
@@ -767,6 +1067,30 @@
             "url": "/_mozilla/css/jumpiness_a.html"
           }
         ],
+        "css/last_child_pseudo_a.html": [
+          {
+            "path": "css/last_child_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/last_child_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/last_child_pseudo_a.html"
+          }
+        ],
+        "css/last_of_type_pseudo_a.html": [
+          {
+            "path": "css/last_of_type_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/last_of_type_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/last_of_type_pseudo_a.html"
+          }
+        ],
         "css/layerization_z_order_a.html": [
           {
             "path": "css/layerization_z_order_a.html",
@@ -827,6 +1151,306 @@
             "url": "/_mozilla/css/letter_spacing_a.html"
           }
         ],
+        "css/li_absolute_containing_block_a.html": [
+          {
+            "path": "css/li_absolute_containing_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/li_absolute_containing_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/li_absolute_containing_block_a.html"
+          }
+        ],
+        "css/line_breaking_whitespace_collapse_a.html": [
+          {
+            "path": "css/line_breaking_whitespace_collapse_a.html",
+            "references": [
+              [
+                "/_mozilla/css/line_breaking_whitespace_collapse_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/line_breaking_whitespace_collapse_a.html"
+          }
+        ],
+        "css/line_height_float_placement_a.html": [
+          {
+            "path": "css/line_height_float_placement_a.html",
+            "references": [
+              [
+                "/_mozilla/css/line_height_float_placement_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/line_height_float_placement_a.html"
+          }
+        ],
+        "css/linear_gradients_lengths_a.html": [
+          {
+            "path": "css/linear_gradients_lengths_a.html",
+            "references": [
+              [
+                "/_mozilla/css/linear_gradients_lengths_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/linear_gradients_lengths_a.html"
+          }
+        ],
+        "css/linear_gradients_parsing_a.html": [
+          {
+            "path": "css/linear_gradients_parsing_a.html",
+            "references": [
+              [
+                "/_mozilla/css/linear_gradients_parsing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/linear_gradients_parsing_a.html"
+          }
+        ],
+        "css/linear_gradients_reverse_a.html": [
+          {
+            "path": "css/linear_gradients_reverse_a.html",
+            "references": [
+              [
+                "/_mozilla/css/linear_gradients_reverse_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/linear_gradients_reverse_a.html"
+          }
+        ],
+        "css/linebreak_inline_span_a.html": [
+          {
+            "path": "css/linebreak_inline_span_a.html",
+            "references": [
+              [
+                "/_mozilla/css/linebreak_inline_span_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/linebreak_inline_span_a.html"
+          }
+        ],
+        "css/link_style_order.html": [
+          {
+            "path": "css/link_style_order.html",
+            "references": [
+              [
+                "/_mozilla/css/link_style_order_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/link_style_order.html"
+          }
+        ],
+        "css/list_style_image_sizing_a.html": [
+          {
+            "path": "css/list_style_image_sizing_a.html",
+            "references": [
+              [
+                "/_mozilla/css/list_style_image_sizing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/list_style_image_sizing_a.html"
+          }
+        ],
+        "css/many_brs_a.html": [
+          {
+            "path": "css/many_brs_a.html",
+            "references": [
+              [
+                "/_mozilla/css/many_brs_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/many_brs_a.html"
+          }
+        ],
+        "css/margin_padding_inline_block_a.html": [
+          {
+            "path": "css/margin_padding_inline_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/margin_padding_inline_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/margin_padding_inline_block_a.html"
+          }
+        ],
+        "css/margins_inside_floats_a.html": [
+          {
+            "path": "css/margins_inside_floats_a.html",
+            "references": [
+              [
+                "/_mozilla/css/margins_inside_floats_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/margins_inside_floats_a.html"
+          }
+        ],
+        "css/max_width_float_simple_a.html": [
+          {
+            "path": "css/max_width_float_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/max_width_float_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/max_width_float_simple_a.html"
+          }
+        ],
+        "css/max_width_simple_a.html": [
+          {
+            "path": "css/max_width_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/max_width_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/max_width_simple_a.html"
+          }
+        ],
+        "css/min_max_height_a.html": [
+          {
+            "path": "css/min_max_height_a.html",
+            "references": [
+              [
+                "/_mozilla/css/min_max_height_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/min_max_height_a.html"
+          }
+        ],
+        "css/min_width_float_simple_a.html": [
+          {
+            "path": "css/min_width_float_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/min_width_float_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/min_width_float_simple_a.html"
+          }
+        ],
+        "css/min_width_simple_a.html": [
+          {
+            "path": "css/min_width_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/min_width_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/min_width_simple_a.html"
+          }
+        ],
+        "css/minimum_line_height_a.html": [
+          {
+            "path": "css/minimum_line_height_a.html",
+            "references": [
+              [
+                "/_mozilla/css/minimum_line_height_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/minimum_line_height_a.html"
+          }
+        ],
+        "css/mix_blend_mode_a.html": [
+          {
+            "path": "css/mix_blend_mode_a.html",
+            "references": [
+              [
+                "/_mozilla/css/mix_blend_mode_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/mix_blend_mode_a.html"
+          }
+        ],
+        "css/multiple_css_class_a.html": [
+          {
+            "path": "css/multiple_css_class_a.html",
+            "references": [
+              [
+                "/_mozilla/css/multiple_css_class_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/multiple_css_class_a.html"
+          }
+        ],
+        "css/negative_margin_uncle_a.html": [
+          {
+            "path": "css/negative_margin_uncle_a.html",
+            "references": [
+              [
+                "/_mozilla/css/negative_margin_uncle_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/negative_margin_uncle_a.html"
+          }
+        ],
+        "css/negative_margins_a.html": [
+          {
+            "path": "css/negative_margins_a.html",
+            "references": [
+              [
+                "/_mozilla/css/negative_margins_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/negative_margins_a.html"
+          }
+        ],
+        "css/no-image.html": [
+          {
+            "path": "css/no-image.html",
+            "references": [
+              [
+                "/_mozilla/css/no-image-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/no-image.html"
+          }
+        ],
+        "css/no_image_background_a.html": [
+          {
+            "path": "css/no_image_background_a.html",
+            "references": [
+              [
+                "/_mozilla/css/no_image_background_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/no_image_background_a.html"
+          }
+        ],
+        "css/noscript.html": [
+          {
+            "path": "css/noscript.html",
+            "references": [
+              [
+                "/_mozilla/css/noscript_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/noscript.html"
+          }
+        ],
         "css/nth_child_pseudo_a.html": [
           {
             "path": "css/nth_child_pseudo_a.html",
@@ -851,6 +1475,42 @@
             "url": "/_mozilla/css/nth_last_child_pseudo_a.html"
           }
         ],
+        "css/nth_last_of_type_pseudo_a.html": [
+          {
+            "path": "css/nth_last_of_type_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/nth_last_of_type_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/nth_last_of_type_pseudo_a.html"
+          }
+        ],
+        "css/nth_of_type_pseudo_a.html": [
+          {
+            "path": "css/nth_of_type_pseudo_a.html",
+            "references": [
+              [
+                "/_mozilla/css/nth_of_type_pseudo_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/nth_of_type_pseudo_a.html"
+          }
+        ],
+        "css/object_element_a.html": [
+          {
+            "path": "css/object_element_a.html",
+            "references": [
+              [
+                "/_mozilla/css/object_element_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/object_element_a.html"
+          }
+        ],
         "css/ol_simple_a.html": [
           {
             "path": "css/ol_simple_a.html",
@@ -3744,6 +4404,234 @@
           "url": "/_mozilla/css/flex_nochild.html"
         }
       ],
+      "css/img_size_a.html": [
+        {
+          "path": "css/img_size_a.html",
+          "references": [
+            [
+              "/_mozilla/css/img_size_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_size_a.html"
+        }
+      ],
+      "css/img_width_style_intrinsic_width_a.html": [
+        {
+          "path": "css/img_width_style_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/img_width_style_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/img_width_style_intrinsic_width_a.html"
+        }
+      ],
+      "css/incremental_float_a.html": [
+        {
+          "path": "css/incremental_float_a.html",
+          "references": [
+            [
+              "/_mozilla/css/incremental_float_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/incremental_float_a.html"
+        }
+      ],
+      "css/incremental_inline_layout_a.html": [
+        {
+          "path": "css/incremental_inline_layout_a.html",
+          "references": [
+            [
+              "/_mozilla/css/incremental_inline_layout_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/incremental_inline_layout_a.html"
+        }
+      ],
+      "css/incremental_letter_spacing_a.html": [
+        {
+          "path": "css/incremental_letter_spacing_a.html",
+          "references": [
+            [
+              "/_mozilla/css/incremental_letter_spacing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/incremental_letter_spacing_a.html"
+        }
+      ],
+      "css/inline_absolute_hypothetical_clip_a.html": [
+        {
+          "path": "css/inline_absolute_hypothetical_clip_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_absolute_hypothetical_clip_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_absolute_hypothetical_clip_a.html"
+        }
+      ],
+      "css/inline_absolute_out_of_flow_a.html": [
+        {
+          "path": "css/inline_absolute_out_of_flow_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_absolute_out_of_flow_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
+        }
+      ],
+      "css/inline_block_block_direction_margins_a.html": [
+        {
+          "path": "css/inline_block_block_direction_margins_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_block_direction_margins_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_block_direction_margins_a.html"
+        }
+      ],
+      "css/inline_block_border_a.html": [
+        {
+          "path": "css/inline_block_border_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_border_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_border_a.html"
+        }
+      ],
+      "css/inline_block_img_a.html": [
+        {
+          "path": "css/inline_block_img_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_img_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_img_a.html"
+        }
+      ],
+      "css/inline_block_margin_a.html": [
+        {
+          "path": "css/inline_block_margin_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_margin_a.html"
+        }
+      ],
+      "css/inline_block_margin_auto_zero_a.html": [
+        {
+          "path": "css/inline_block_margin_auto_zero_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_margin_auto_zero_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_margin_auto_zero_a.html"
+        }
+      ],
+      "css/inline_block_min_width.html": [
+        {
+          "path": "css/inline_block_min_width.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_min_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_min_width.html"
+        }
+      ],
+      "css/inline_block_overflow.html": [
+        {
+          "path": "css/inline_block_overflow.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_overflow_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_overflow.html"
+        }
+      ],
+      "css/inline_block_overflow_hidden_a.html": [
+        {
+          "path": "css/inline_block_overflow_hidden_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_overflow_hidden_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_overflow_hidden_a.html"
+        }
+      ],
+      "css/inline_block_parent_padding_a.html": [
+        {
+          "path": "css/inline_block_parent_padding_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_parent_padding_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_parent_padding_a.html"
+        }
+      ],
+      "css/inline_block_percentage_height_a.html": [
+        {
+          "path": "css/inline_block_percentage_height_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_percentage_height_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_percentage_height_a.html"
+        }
+      ],
+      "css/inline_block_stacking_context_a.html": [
+        {
+          "path": "css/inline_block_stacking_context_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_stacking_context_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_stacking_context_a.html"
+        }
+      ],
+      "css/inline_block_with_margin_a.html": [
+        {
+          "path": "css/inline_block_with_margin_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_with_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_with_margin_a.html"
+        }
+      ],
       "css/inline_border_baseline_a.html": [
         {
           "path": "css/inline_border_baseline_a.html",
@@ -3768,6 +4656,30 @@
           "url": "/_mozilla/css/inline_element_border_a.html"
         }
       ],
+      "css/inline_hypothetical_box_a.html": [
+        {
+          "path": "css/inline_hypothetical_box_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_hypothetical_box_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_hypothetical_box_a.html"
+        }
+      ],
+      "css/inline_margin_multiple_fragments_a.html": [
+        {
+          "path": "css/inline_margin_multiple_fragments_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_margin_multiple_fragments_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_margin_multiple_fragments_a.html"
+        }
+      ],
       "css/inline_margins_a.html": [
         {
           "path": "css/inline_margins_a.html",
@@ -3780,6 +4692,18 @@
           "url": "/_mozilla/css/inline_margins_a.html"
         }
       ],
+      "css/inline_margins_intrinsic_size_a.html": [
+        {
+          "path": "css/inline_margins_intrinsic_size_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_margins_intrinsic_size_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_margins_intrinsic_size_a.html"
+        }
+      ],
       "css/inline_padding_a.html": [
         {
           "path": "css/inline_padding_a.html",
@@ -3792,6 +4716,42 @@
           "url": "/_mozilla/css/inline_padding_a.html"
         }
       ],
+      "css/inline_text_align_a.html": [
+        {
+          "path": "css/inline_text_align_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_text_align_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_text_align_a.html"
+        }
+      ],
+      "css/input_button_margins_a.html": [
+        {
+          "path": "css/input_button_margins_a.html",
+          "references": [
+            [
+              "/_mozilla/css/input_button_margins_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/input_button_margins_a.html"
+        }
+      ],
+      "css/input_button_size_a.html": [
+        {
+          "path": "css/input_button_size_a.html",
+          "references": [
+            [
+              "/_mozilla/css/input_button_size_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/input_button_size_a.html"
+        }
+      ],
       "css/inset.html": [
         {
           "path": "css/inset.html",
@@ -3828,6 +4788,30 @@
           "url": "/_mozilla/css/jumpiness_a.html"
         }
       ],
+      "css/last_child_pseudo_a.html": [
+        {
+          "path": "css/last_child_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/last_child_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/last_child_pseudo_a.html"
+        }
+      ],
+      "css/last_of_type_pseudo_a.html": [
+        {
+          "path": "css/last_of_type_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/last_of_type_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/last_of_type_pseudo_a.html"
+        }
+      ],
       "css/layerization_z_order_a.html": [
         {
           "path": "css/layerization_z_order_a.html",
@@ -3888,6 +4872,306 @@
           "url": "/_mozilla/css/letter_spacing_a.html"
         }
       ],
+      "css/li_absolute_containing_block_a.html": [
+        {
+          "path": "css/li_absolute_containing_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/li_absolute_containing_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/li_absolute_containing_block_a.html"
+        }
+      ],
+      "css/line_breaking_whitespace_collapse_a.html": [
+        {
+          "path": "css/line_breaking_whitespace_collapse_a.html",
+          "references": [
+            [
+              "/_mozilla/css/line_breaking_whitespace_collapse_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/line_breaking_whitespace_collapse_a.html"
+        }
+      ],
+      "css/line_height_float_placement_a.html": [
+        {
+          "path": "css/line_height_float_placement_a.html",
+          "references": [
+            [
+              "/_mozilla/css/line_height_float_placement_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/line_height_float_placement_a.html"
+        }
+      ],
+      "css/linear_gradients_lengths_a.html": [
+        {
+          "path": "css/linear_gradients_lengths_a.html",
+          "references": [
+            [
+              "/_mozilla/css/linear_gradients_lengths_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/linear_gradients_lengths_a.html"
+        }
+      ],
+      "css/linear_gradients_parsing_a.html": [
+        {
+          "path": "css/linear_gradients_parsing_a.html",
+          "references": [
+            [
+              "/_mozilla/css/linear_gradients_parsing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/linear_gradients_parsing_a.html"
+        }
+      ],
+      "css/linear_gradients_reverse_a.html": [
+        {
+          "path": "css/linear_gradients_reverse_a.html",
+          "references": [
+            [
+              "/_mozilla/css/linear_gradients_reverse_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/linear_gradients_reverse_a.html"
+        }
+      ],
+      "css/linebreak_inline_span_a.html": [
+        {
+          "path": "css/linebreak_inline_span_a.html",
+          "references": [
+            [
+              "/_mozilla/css/linebreak_inline_span_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/linebreak_inline_span_a.html"
+        }
+      ],
+      "css/link_style_order.html": [
+        {
+          "path": "css/link_style_order.html",
+          "references": [
+            [
+              "/_mozilla/css/link_style_order_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/link_style_order.html"
+        }
+      ],
+      "css/list_style_image_sizing_a.html": [
+        {
+          "path": "css/list_style_image_sizing_a.html",
+          "references": [
+            [
+              "/_mozilla/css/list_style_image_sizing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/list_style_image_sizing_a.html"
+        }
+      ],
+      "css/many_brs_a.html": [
+        {
+          "path": "css/many_brs_a.html",
+          "references": [
+            [
+              "/_mozilla/css/many_brs_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/many_brs_a.html"
+        }
+      ],
+      "css/margin_padding_inline_block_a.html": [
+        {
+          "path": "css/margin_padding_inline_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/margin_padding_inline_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/margin_padding_inline_block_a.html"
+        }
+      ],
+      "css/margins_inside_floats_a.html": [
+        {
+          "path": "css/margins_inside_floats_a.html",
+          "references": [
+            [
+              "/_mozilla/css/margins_inside_floats_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/margins_inside_floats_a.html"
+        }
+      ],
+      "css/max_width_float_simple_a.html": [
+        {
+          "path": "css/max_width_float_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/max_width_float_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/max_width_float_simple_a.html"
+        }
+      ],
+      "css/max_width_simple_a.html": [
+        {
+          "path": "css/max_width_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/max_width_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/max_width_simple_a.html"
+        }
+      ],
+      "css/min_max_height_a.html": [
+        {
+          "path": "css/min_max_height_a.html",
+          "references": [
+            [
+              "/_mozilla/css/min_max_height_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/min_max_height_a.html"
+        }
+      ],
+      "css/min_width_float_simple_a.html": [
+        {
+          "path": "css/min_width_float_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/min_width_float_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/min_width_float_simple_a.html"
+        }
+      ],
+      "css/min_width_simple_a.html": [
+        {
+          "path": "css/min_width_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/min_width_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/min_width_simple_a.html"
+        }
+      ],
+      "css/minimum_line_height_a.html": [
+        {
+          "path": "css/minimum_line_height_a.html",
+          "references": [
+            [
+              "/_mozilla/css/minimum_line_height_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/minimum_line_height_a.html"
+        }
+      ],
+      "css/mix_blend_mode_a.html": [
+        {
+          "path": "css/mix_blend_mode_a.html",
+          "references": [
+            [
+              "/_mozilla/css/mix_blend_mode_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/mix_blend_mode_a.html"
+        }
+      ],
+      "css/multiple_css_class_a.html": [
+        {
+          "path": "css/multiple_css_class_a.html",
+          "references": [
+            [
+              "/_mozilla/css/multiple_css_class_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/multiple_css_class_a.html"
+        }
+      ],
+      "css/negative_margin_uncle_a.html": [
+        {
+          "path": "css/negative_margin_uncle_a.html",
+          "references": [
+            [
+              "/_mozilla/css/negative_margin_uncle_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/negative_margin_uncle_a.html"
+        }
+      ],
+      "css/negative_margins_a.html": [
+        {
+          "path": "css/negative_margins_a.html",
+          "references": [
+            [
+              "/_mozilla/css/negative_margins_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/negative_margins_a.html"
+        }
+      ],
+      "css/no-image.html": [
+        {
+          "path": "css/no-image.html",
+          "references": [
+            [
+              "/_mozilla/css/no-image-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/no-image.html"
+        }
+      ],
+      "css/no_image_background_a.html": [
+        {
+          "path": "css/no_image_background_a.html",
+          "references": [
+            [
+              "/_mozilla/css/no_image_background_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/no_image_background_a.html"
+        }
+      ],
+      "css/noscript.html": [
+        {
+          "path": "css/noscript.html",
+          "references": [
+            [
+              "/_mozilla/css/noscript_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/noscript.html"
+        }
+      ],
       "css/nth_child_pseudo_a.html": [
         {
           "path": "css/nth_child_pseudo_a.html",
@@ -3912,6 +5196,42 @@
           "url": "/_mozilla/css/nth_last_child_pseudo_a.html"
         }
       ],
+      "css/nth_last_of_type_pseudo_a.html": [
+        {
+          "path": "css/nth_last_of_type_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/nth_last_of_type_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/nth_last_of_type_pseudo_a.html"
+        }
+      ],
+      "css/nth_of_type_pseudo_a.html": [
+        {
+          "path": "css/nth_of_type_pseudo_a.html",
+          "references": [
+            [
+              "/_mozilla/css/nth_of_type_pseudo_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/nth_of_type_pseudo_a.html"
+        }
+      ],
+      "css/object_element_a.html": [
+        {
+          "path": "css/object_element_a.html",
+          "references": [
+            [
+              "/_mozilla/css/object_element_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/object_element_a.html"
+        }
+      ],
       "css/ol_simple_a.html": [
         {
           "path": "css/ol_simple_a.html",
diff --git a/tests/ref/img_size_a.html b/tests/wpt/mozilla/tests/css/img_size_a.html
similarity index 89%
rename from tests/ref/img_size_a.html
rename to tests/wpt/mozilla/tests/css/img_size_a.html
index a96abad3736..b6cedb2e1e1 100644
--- a/tests/ref/img_size_a.html
+++ b/tests/wpt/mozilla/tests/css/img_size_a.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <link rel='match' href='img_size_b.html'>
         <title>
             The winter is too cold for me...
         </title>
diff --git a/tests/ref/img_size_b.html b/tests/wpt/mozilla/tests/css/img_size_b.html
similarity index 100%
rename from tests/ref/img_size_b.html
rename to tests/wpt/mozilla/tests/css/img_size_b.html
diff --git a/tests/ref/img_width_style_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/img_width_style_intrinsic_width_a.html
similarity index 77%
rename from tests/ref/img_width_style_intrinsic_width_a.html
rename to tests/wpt/mozilla/tests/css/img_width_style_intrinsic_width_a.html
index 3364c664f70..89befa34af8 100644
--- a/tests/ref/img_width_style_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/img_width_style_intrinsic_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='img_width_style_intrinsic_width_ref.html'>
 </head>
 <body>
 <div style="float: left; background: red; height: 100px; overflow: hidden">
diff --git a/tests/ref/img_width_style_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/img_width_style_intrinsic_width_ref.html
similarity index 100%
rename from tests/ref/img_width_style_intrinsic_width_ref.html
rename to tests/wpt/mozilla/tests/css/img_width_style_intrinsic_width_ref.html
diff --git a/tests/ref/incremental_float_a.html b/tests/wpt/mozilla/tests/css/incremental_float_a.html
similarity index 92%
rename from tests/ref/incremental_float_a.html
rename to tests/wpt/mozilla/tests/css/incremental_float_a.html
index 02e762b82e9..737c3ea6c5b 100644
--- a/tests/ref/incremental_float_a.html
+++ b/tests/wpt/mozilla/tests/css/incremental_float_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='incremental_float_ref.html'>
 <style>
 nav.floaty {
     float: left;
diff --git a/tests/ref/incremental_float_ref.html b/tests/wpt/mozilla/tests/css/incremental_float_ref.html
similarity index 100%
rename from tests/ref/incremental_float_ref.html
rename to tests/wpt/mozilla/tests/css/incremental_float_ref.html
diff --git a/tests/ref/incremental_inline_layout_a.html b/tests/wpt/mozilla/tests/css/incremental_inline_layout_a.html
similarity index 91%
rename from tests/ref/incremental_inline_layout_a.html
rename to tests/wpt/mozilla/tests/css/incremental_inline_layout_a.html
index cbd2d932071..3f1915f0b2f 100644
--- a/tests/ref/incremental_inline_layout_a.html
+++ b/tests/wpt/mozilla/tests/css/incremental_inline_layout_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='incremental_inline_layout_ref.html'>
 <style>
 h1 {
     font-size: 72px;
diff --git a/tests/ref/incremental_inline_layout_ref.html b/tests/wpt/mozilla/tests/css/incremental_inline_layout_ref.html
similarity index 100%
rename from tests/ref/incremental_inline_layout_ref.html
rename to tests/wpt/mozilla/tests/css/incremental_inline_layout_ref.html
diff --git a/tests/ref/incremental_letter_spacing_a.html b/tests/wpt/mozilla/tests/css/incremental_letter_spacing_a.html
similarity index 83%
rename from tests/ref/incremental_letter_spacing_a.html
rename to tests/wpt/mozilla/tests/css/incremental_letter_spacing_a.html
index 351cd100d05..1a41febe450 100644
--- a/tests/ref/incremental_letter_spacing_a.html
+++ b/tests/wpt/mozilla/tests/css/incremental_letter_spacing_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='incremental_letter_spacing_ref.html'>
     <meta charset="UTF-8">
     <title>Incremental layout letter-spacing test</title>
   </head>
diff --git a/tests/ref/incremental_letter_spacing_ref.html b/tests/wpt/mozilla/tests/css/incremental_letter_spacing_ref.html
similarity index 100%
rename from tests/ref/incremental_letter_spacing_ref.html
rename to tests/wpt/mozilla/tests/css/incremental_letter_spacing_ref.html
diff --git a/tests/ref/inline_absolute_hypothetical_clip_a.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_clip_a.html
similarity index 77%
rename from tests/ref/inline_absolute_hypothetical_clip_a.html
rename to tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_clip_a.html
index 7be29db3249..4b09f718698 100644
--- a/tests/ref/inline_absolute_hypothetical_clip_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_clip_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='inline_absolute_hypothetical_clip_ref.html'>
 <style>
 body {
     margin: 16px;
diff --git a/tests/ref/inline_absolute_hypothetical_clip_ref.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_clip_ref.html
similarity index 100%
rename from tests/ref/inline_absolute_hypothetical_clip_ref.html
rename to tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_clip_ref.html
diff --git a/tests/ref/inline_absolute_out_of_flow_a.html b/tests/wpt/mozilla/tests/css/inline_absolute_out_of_flow_a.html
similarity index 77%
rename from tests/ref/inline_absolute_out_of_flow_a.html
rename to tests/wpt/mozilla/tests/css/inline_absolute_out_of_flow_a.html
index b16d5754fb1..c66ac641b21 100644
--- a/tests/ref/inline_absolute_out_of_flow_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_out_of_flow_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='inline_absolute_out_of_flow_ref.html'>
 <style>
 #a {
     display: inline;
diff --git a/tests/ref/inline_absolute_out_of_flow_ref.html b/tests/wpt/mozilla/tests/css/inline_absolute_out_of_flow_ref.html
similarity index 100%
rename from tests/ref/inline_absolute_out_of_flow_ref.html
rename to tests/wpt/mozilla/tests/css/inline_absolute_out_of_flow_ref.html
diff --git a/tests/ref/inline_block_block_direction_margins_a.html b/tests/wpt/mozilla/tests/css/inline_block_block_direction_margins_a.html
similarity index 81%
rename from tests/ref/inline_block_block_direction_margins_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_block_direction_margins_a.html
index 382a614bc57..85fa13386f3 100644
--- a/tests/ref/inline_block_block_direction_margins_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_block_direction_margins_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='inline_block_block_direction_margins_ref.html'>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/inline_block_block_direction_margins_ref.html b/tests/wpt/mozilla/tests/css/inline_block_block_direction_margins_ref.html
similarity index 100%
rename from tests/ref/inline_block_block_direction_margins_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_block_direction_margins_ref.html
diff --git a/tests/ref/inline_block_border_a.html b/tests/wpt/mozilla/tests/css/inline_block_border_a.html
similarity index 73%
rename from tests/ref/inline_block_border_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_border_a.html
index 2a5626112d6..9c06579d8dc 100644
--- a/tests/ref/inline_block_border_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_border_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='inline_block_border_ref.html'>
 <body>
 <div style="display: inline-block; border: solid black 1px; padding: 6px; height: 64px; width: 64px;"></div>
 </body>
diff --git a/tests/ref/inline_block_border_ref.html b/tests/wpt/mozilla/tests/css/inline_block_border_ref.html
similarity index 100%
rename from tests/ref/inline_block_border_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_border_ref.html
diff --git a/tests/ref/inline_block_img_a.html b/tests/wpt/mozilla/tests/css/inline_block_img_a.html
similarity index 93%
rename from tests/ref/inline_block_img_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_img_a.html
index 0fdf791a04c..3fe84cf7ae6 100644
--- a/tests/ref/inline_block_img_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_img_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_img_ref.html'>
         <style>
             body {
                 margin: 0;
diff --git a/tests/ref/inline_block_img_ref.html b/tests/wpt/mozilla/tests/css/inline_block_img_ref.html
similarity index 100%
rename from tests/ref/inline_block_img_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_img_ref.html
diff --git a/tests/ref/inline_block_margin_a.html b/tests/wpt/mozilla/tests/css/inline_block_margin_a.html
similarity index 89%
rename from tests/ref/inline_block_margin_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_a.html
index 5acd2bf87c2..290721e1ffd 100644
--- a/tests/ref/inline_block_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_margin_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_margin_ref.html'>
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/ref/inline_block_margin_auto_zero_a.html b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_zero_a.html
similarity index 81%
rename from tests/ref/inline_block_margin_auto_zero_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_auto_zero_a.html
index e9a0ec4fb29..eb2b9dd15b3 100644
--- a/tests/ref/inline_block_margin_auto_zero_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_zero_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='inline_block_margin_auto_zero_ref.html'>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/inline_block_margin_auto_zero_ref.html b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_zero_ref.html
similarity index 100%
rename from tests/ref/inline_block_margin_auto_zero_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_auto_zero_ref.html
diff --git a/tests/ref/inline_block_margin_ref.html b/tests/wpt/mozilla/tests/css/inline_block_margin_ref.html
similarity index 100%
rename from tests/ref/inline_block_margin_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_ref.html
diff --git a/tests/ref/inline_block_min_width.html b/tests/wpt/mozilla/tests/css/inline_block_min_width.html
similarity index 89%
rename from tests/ref/inline_block_min_width.html
rename to tests/wpt/mozilla/tests/css/inline_block_min_width.html
index c677fb21d94..a30fee7e7e2 100644
--- a/tests/ref/inline_block_min_width.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_min_width.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_min_width_ref.html'>
         <style type="text/css">
             * {
                 margin: 0;
diff --git a/tests/ref/inline_block_min_width_ref.html b/tests/wpt/mozilla/tests/css/inline_block_min_width_ref.html
similarity index 100%
rename from tests/ref/inline_block_min_width_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_min_width_ref.html
diff --git a/tests/ref/inline_block_overflow.html b/tests/wpt/mozilla/tests/css/inline_block_overflow.html
similarity index 77%
rename from tests/ref/inline_block_overflow.html
rename to tests/wpt/mozilla/tests/css/inline_block_overflow.html
index 5b5aa9d0130..8646a2dacaf 100644
--- a/tests/ref/inline_block_overflow.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_overflow.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html>
+<link rel='match' href='inline_block_overflow_ref.html'>
 <body>
   a<span style="display: inline-block; overflow: hidden">b</span>
 </body>
diff --git a/tests/ref/inline_block_overflow_hidden_a.html b/tests/wpt/mozilla/tests/css/inline_block_overflow_hidden_a.html
similarity index 66%
rename from tests/ref/inline_block_overflow_hidden_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_overflow_hidden_a.html
index 088d536e4e0..09377e7d56f 100644
--- a/tests/ref/inline_block_overflow_hidden_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_overflow_hidden_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='inline_block_overflow_hidden_ref.html'>
 <body>
 <div style="display: inline-block; overflow: hidden">This should be visible</div>
 </body>
diff --git a/tests/ref/inline_block_overflow_hidden_ref.html b/tests/wpt/mozilla/tests/css/inline_block_overflow_hidden_ref.html
similarity index 100%
rename from tests/ref/inline_block_overflow_hidden_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_overflow_hidden_ref.html
diff --git a/tests/ref/inline_block_overflow_ref.html b/tests/wpt/mozilla/tests/css/inline_block_overflow_ref.html
similarity index 100%
rename from tests/ref/inline_block_overflow_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_overflow_ref.html
diff --git a/tests/ref/inline_block_parent_padding_a.html b/tests/wpt/mozilla/tests/css/inline_block_parent_padding_a.html
similarity index 90%
rename from tests/ref/inline_block_parent_padding_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_parent_padding_a.html
index c4f7813aaeb..0a599bfae20 100644
--- a/tests/ref/inline_block_parent_padding_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_parent_padding_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_parent_padding_ref.html'>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
             body {
diff --git a/tests/ref/inline_block_parent_padding_ref.html b/tests/wpt/mozilla/tests/css/inline_block_parent_padding_ref.html
similarity index 100%
rename from tests/ref/inline_block_parent_padding_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_parent_padding_ref.html
diff --git a/tests/ref/inline_block_percentage_height_a.html b/tests/wpt/mozilla/tests/css/inline_block_percentage_height_a.html
similarity index 79%
rename from tests/ref/inline_block_percentage_height_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_percentage_height_a.html
index ce3f98323b8..fcaf608531b 100644
--- a/tests/ref/inline_block_percentage_height_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_percentage_height_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='inline_block_percentage_height_ref.html'>
 <title>Hello</title>
 </head>
 <body>
diff --git a/tests/ref/inline_block_percentage_height_ref.html b/tests/wpt/mozilla/tests/css/inline_block_percentage_height_ref.html
similarity index 100%
rename from tests/ref/inline_block_percentage_height_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_percentage_height_ref.html
diff --git a/tests/ref/inline_block_stacking_context_a.html b/tests/wpt/mozilla/tests/css/inline_block_stacking_context_a.html
similarity index 87%
rename from tests/ref/inline_block_stacking_context_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_stacking_context_a.html
index 7f203821786..43b011810e4 100644
--- a/tests/ref/inline_block_stacking_context_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_stacking_context_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_stacking_context_ref.html'>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
             * {
diff --git a/tests/ref/inline_block_stacking_context_ref.html b/tests/wpt/mozilla/tests/css/inline_block_stacking_context_ref.html
similarity index 100%
rename from tests/ref/inline_block_stacking_context_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_stacking_context_ref.html
diff --git a/tests/ref/inline_block_with_margin_a.html b/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
similarity index 89%
rename from tests/ref/inline_block_with_margin_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
index d12b3d36b42..6c20a6cad78 100644
--- a/tests/ref/inline_block_with_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='inline_block_with_margin_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/inline_block_with_margin_ref.html b/tests/wpt/mozilla/tests/css/inline_block_with_margin_ref.html
similarity index 100%
rename from tests/ref/inline_block_with_margin_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_with_margin_ref.html
diff --git a/tests/ref/inline_hypothetical_box_a.html b/tests/wpt/mozilla/tests/css/inline_hypothetical_box_a.html
similarity index 88%
rename from tests/ref/inline_hypothetical_box_a.html
rename to tests/wpt/mozilla/tests/css/inline_hypothetical_box_a.html
index 3b07324daa6..0406a275a9c 100644
--- a/tests/ref/inline_hypothetical_box_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_hypothetical_box_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='inline_hypothetical_box_ref.html'>
 <style>
 .a {
     position: relative;
diff --git a/tests/ref/inline_hypothetical_box_ref.html b/tests/wpt/mozilla/tests/css/inline_hypothetical_box_ref.html
similarity index 100%
rename from tests/ref/inline_hypothetical_box_ref.html
rename to tests/wpt/mozilla/tests/css/inline_hypothetical_box_ref.html
diff --git a/tests/ref/inline_margin_multiple_fragments_a.html b/tests/wpt/mozilla/tests/css/inline_margin_multiple_fragments_a.html
similarity index 75%
rename from tests/ref/inline_margin_multiple_fragments_a.html
rename to tests/wpt/mozilla/tests/css/inline_margin_multiple_fragments_a.html
index 4ce50a87b5d..9e93b7bc55e 100644
--- a/tests/ref/inline_margin_multiple_fragments_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_margin_multiple_fragments_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='inline_margin_multiple_fragments_ref.html'>
 <style>
 span {
     margin-left: 128px;
diff --git a/tests/ref/inline_margin_multiple_fragments_ref.html b/tests/wpt/mozilla/tests/css/inline_margin_multiple_fragments_ref.html
similarity index 100%
rename from tests/ref/inline_margin_multiple_fragments_ref.html
rename to tests/wpt/mozilla/tests/css/inline_margin_multiple_fragments_ref.html
diff --git a/tests/ref/inline_margins_intrinsic_size_a.html b/tests/wpt/mozilla/tests/css/inline_margins_intrinsic_size_a.html
similarity index 70%
rename from tests/ref/inline_margins_intrinsic_size_a.html
rename to tests/wpt/mozilla/tests/css/inline_margins_intrinsic_size_a.html
index 5a3e639a2dd..7c9ef8dc680 100644
--- a/tests/ref/inline_margins_intrinsic_size_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_margins_intrinsic_size_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='inline_margins_intrinsic_size_ref.html'>
 <style>
 span {
     margin: 0 1em;
diff --git a/tests/ref/inline_margins_intrinsic_size_ref.html b/tests/wpt/mozilla/tests/css/inline_margins_intrinsic_size_ref.html
similarity index 100%
rename from tests/ref/inline_margins_intrinsic_size_ref.html
rename to tests/wpt/mozilla/tests/css/inline_margins_intrinsic_size_ref.html
diff --git a/tests/ref/inline_text_align_a.html b/tests/wpt/mozilla/tests/css/inline_text_align_a.html
similarity index 90%
rename from tests/ref/inline_text_align_a.html
rename to tests/wpt/mozilla/tests/css/inline_text_align_a.html
index 57fc40b7448..359cdb2aa92 100644
--- a/tests/ref/inline_text_align_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_text_align_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='inline_text_align_b.html'>
     <style>
       .right {
         text-align: right;
diff --git a/tests/ref/inline_text_align_b.html b/tests/wpt/mozilla/tests/css/inline_text_align_b.html
similarity index 100%
rename from tests/ref/inline_text_align_b.html
rename to tests/wpt/mozilla/tests/css/inline_text_align_b.html
diff --git a/tests/ref/input_button_margins_a.html b/tests/wpt/mozilla/tests/css/input_button_margins_a.html
similarity index 75%
rename from tests/ref/input_button_margins_a.html
rename to tests/wpt/mozilla/tests/css/input_button_margins_a.html
index a207daac455..37766fe87e5 100644
--- a/tests/ref/input_button_margins_a.html
+++ b/tests/wpt/mozilla/tests/css/input_button_margins_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='input_button_margins_ref.html'>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/ref/input_button_margins_ref.html b/tests/wpt/mozilla/tests/css/input_button_margins_ref.html
similarity index 100%
rename from tests/ref/input_button_margins_ref.html
rename to tests/wpt/mozilla/tests/css/input_button_margins_ref.html
diff --git a/tests/ref/input_button_size_a.html b/tests/wpt/mozilla/tests/css/input_button_size_a.html
similarity index 66%
rename from tests/ref/input_button_size_a.html
rename to tests/wpt/mozilla/tests/css/input_button_size_a.html
index 4640d1f199b..c0bdc05e01f 100644
--- a/tests/ref/input_button_size_a.html
+++ b/tests/wpt/mozilla/tests/css/input_button_size_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='input_button_size_ref.html'>
 </head>
 <body>
 <input type=submit size=100 value=sumbit>
diff --git a/tests/ref/input_button_size_ref.html b/tests/wpt/mozilla/tests/css/input_button_size_ref.html
similarity index 100%
rename from tests/ref/input_button_size_ref.html
rename to tests/wpt/mozilla/tests/css/input_button_size_ref.html
diff --git a/tests/ref/last_child_pseudo_a.html b/tests/wpt/mozilla/tests/css/last_child_pseudo_a.html
similarity index 93%
rename from tests/ref/last_child_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/last_child_pseudo_a.html
index 4e68475084f..fc18ebbd775 100644
--- a/tests/ref/last_child_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/last_child_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='last_child_pseudo_b.html'>
     <title>:last-child test</title>
     <style type="text/css">
       html            { background: red;}
diff --git a/tests/ref/last_child_pseudo_b.html b/tests/wpt/mozilla/tests/css/last_child_pseudo_b.html
similarity index 100%
rename from tests/ref/last_child_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/last_child_pseudo_b.html
diff --git a/tests/ref/last_of_type_pseudo_a.html b/tests/wpt/mozilla/tests/css/last_of_type_pseudo_a.html
similarity index 95%
rename from tests/ref/last_of_type_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/last_of_type_pseudo_a.html
index b0046f64c82..97bbe0423af 100644
--- a/tests/ref/last_of_type_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/last_of_type_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='last_of_type_pseudo_b.html'>
     <title>:last-of-type test</title>
     <style type="text/css">
       html { background: red; }
diff --git a/tests/ref/last_of_type_pseudo_b.html b/tests/wpt/mozilla/tests/css/last_of_type_pseudo_b.html
similarity index 100%
rename from tests/ref/last_of_type_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/last_of_type_pseudo_b.html
diff --git a/tests/ref/li_absolute_containing_block_a.html b/tests/wpt/mozilla/tests/css/li_absolute_containing_block_a.html
similarity index 79%
rename from tests/ref/li_absolute_containing_block_a.html
rename to tests/wpt/mozilla/tests/css/li_absolute_containing_block_a.html
index 40765d4888e..67588d31b16 100644
--- a/tests/ref/li_absolute_containing_block_a.html
+++ b/tests/wpt/mozilla/tests/css/li_absolute_containing_block_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='li_absolute_containing_block_ref.html'>
 <style>
 body {
     font-size: 64px;
diff --git a/tests/ref/li_absolute_containing_block_ref.html b/tests/wpt/mozilla/tests/css/li_absolute_containing_block_ref.html
similarity index 100%
rename from tests/ref/li_absolute_containing_block_ref.html
rename to tests/wpt/mozilla/tests/css/li_absolute_containing_block_ref.html
diff --git a/tests/ref/line_breaking_whitespace_collapse_a.html b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
similarity index 80%
rename from tests/ref/line_breaking_whitespace_collapse_a.html
rename to tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
index fdba44158de..38e9f70d088 100644
--- a/tests/ref/line_breaking_whitespace_collapse_a.html
+++ b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='line_breaking_whitespace_collapse_ref.html'>
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
 <style>
 p {
diff --git a/tests/ref/line_breaking_whitespace_collapse_ref.html b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html
similarity index 100%
rename from tests/ref/line_breaking_whitespace_collapse_ref.html
rename to tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html
diff --git a/tests/ref/line_height_float_placement_a.html b/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
similarity index 86%
rename from tests/ref/line_height_float_placement_a.html
rename to tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
index e98032141c7..bbf8b5b93eb 100644
--- a/tests/ref/line_height_float_placement_a.html
+++ b/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='line_height_float_placement_ref.html'>
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
 <style>
 * {
diff --git a/tests/ref/line_height_float_placement_ref.html b/tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html
similarity index 100%
rename from tests/ref/line_height_float_placement_ref.html
rename to tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html
diff --git a/tests/ref/linear_gradients_lengths_a.html b/tests/wpt/mozilla/tests/css/linear_gradients_lengths_a.html
similarity index 85%
rename from tests/ref/linear_gradients_lengths_a.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_lengths_a.html
index 12d8fa03c15..7cc0c449f5f 100644
--- a/tests/ref/linear_gradients_lengths_a.html
+++ b/tests/wpt/mozilla/tests/css/linear_gradients_lengths_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='linear_gradients_lengths_ref.html'>
 <!-- Tests that linear gradient lengths work. -->
 <style>
 section {
diff --git a/tests/ref/linear_gradients_lengths_ref.html b/tests/wpt/mozilla/tests/css/linear_gradients_lengths_ref.html
similarity index 100%
rename from tests/ref/linear_gradients_lengths_ref.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_lengths_ref.html
diff --git a/tests/ref/linear_gradients_parsing_a.html b/tests/wpt/mozilla/tests/css/linear_gradients_parsing_a.html
similarity index 89%
rename from tests/ref/linear_gradients_parsing_a.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_parsing_a.html
index 1e08db47b71..8bd5f099512 100644
--- a/tests/ref/linear_gradients_parsing_a.html
+++ b/tests/wpt/mozilla/tests/css/linear_gradients_parsing_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='linear_gradients_parsing_ref.html'>
 <!-- Tests that parsing linear gradients works. -->
 <style>
 section {
diff --git a/tests/ref/linear_gradients_parsing_ref.html b/tests/wpt/mozilla/tests/css/linear_gradients_parsing_ref.html
similarity index 100%
rename from tests/ref/linear_gradients_parsing_ref.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_parsing_ref.html
diff --git a/tests/ref/linear_gradients_reverse_a.html b/tests/wpt/mozilla/tests/css/linear_gradients_reverse_a.html
similarity index 91%
rename from tests/ref/linear_gradients_reverse_a.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_reverse_a.html
index 4172834ec37..ec74f0c8e08 100644
--- a/tests/ref/linear_gradients_reverse_a.html
+++ b/tests/wpt/mozilla/tests/css/linear_gradients_reverse_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='linear_gradients_reverse_ref.html'>
 <!-- Tests that reversed linear gradients are equivalent. -->
 <style>
 section {
diff --git a/tests/ref/linear_gradients_reverse_ref.html b/tests/wpt/mozilla/tests/css/linear_gradients_reverse_ref.html
similarity index 100%
rename from tests/ref/linear_gradients_reverse_ref.html
rename to tests/wpt/mozilla/tests/css/linear_gradients_reverse_ref.html
diff --git a/tests/ref/linebreak_inline_span_a.html b/tests/wpt/mozilla/tests/css/linebreak_inline_span_a.html
similarity index 92%
rename from tests/ref/linebreak_inline_span_a.html
rename to tests/wpt/mozilla/tests/css/linebreak_inline_span_a.html
index ddaeabcb653..dc1fd42f49d 100644
--- a/tests/ref/linebreak_inline_span_a.html
+++ b/tests/wpt/mozilla/tests/css/linebreak_inline_span_a.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<link rel='match' href='linebreak_inline_span_b.html'>
 <style type="text/css">
 * {
 	margin: 0px;
diff --git a/tests/ref/linebreak_inline_span_b.html b/tests/wpt/mozilla/tests/css/linebreak_inline_span_b.html
similarity index 100%
rename from tests/ref/linebreak_inline_span_b.html
rename to tests/wpt/mozilla/tests/css/linebreak_inline_span_b.html
diff --git a/tests/ref/link_style_order.html b/tests/wpt/mozilla/tests/css/link_style_order.html
similarity index 81%
rename from tests/ref/link_style_order.html
rename to tests/wpt/mozilla/tests/css/link_style_order.html
index 0cac3321ae9..cffebd33d42 100644
--- a/tests/ref/link_style_order.html
+++ b/tests/wpt/mozilla/tests/css/link_style_order.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='link_style_order_ref.html'>
     <meta charset="utf-8">
     <title>link/style order test</title>
     <link rel="stylesheet" href="data:text/css,body{background:red;}">
diff --git a/tests/ref/link_style_order_ref.html b/tests/wpt/mozilla/tests/css/link_style_order_ref.html
similarity index 100%
rename from tests/ref/link_style_order_ref.html
rename to tests/wpt/mozilla/tests/css/link_style_order_ref.html
diff --git a/tests/ref/list_style_image_sizing_a.html b/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
similarity index 92%
rename from tests/ref/list_style_image_sizing_a.html
rename to tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
index 04c28158f38..b47401c0333 100644
--- a/tests/ref/list_style_image_sizing_a.html
+++ b/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='list_style_image_sizing_ref.html'>
 <!--
     Tests that the list style image doesn't get stretched vertically. It should be completely
     covered up by the black absolutely-positioned div.
diff --git a/tests/ref/list_style_image_sizing_ref.html b/tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html
similarity index 100%
rename from tests/ref/list_style_image_sizing_ref.html
rename to tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html
diff --git a/tests/ref/many_brs_a.html b/tests/wpt/mozilla/tests/css/many_brs_a.html
similarity index 66%
rename from tests/ref/many_brs_a.html
rename to tests/wpt/mozilla/tests/css/many_brs_a.html
index ea65cbe3390..06efba2a48d 100644
--- a/tests/ref/many_brs_a.html
+++ b/tests/wpt/mozilla/tests/css/many_brs_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='many_brs_ref.html'>
 <body>
 Cupcakes<br>are<br>supremely<br>delicious.
 </body>
diff --git a/tests/ref/many_brs_ref.html b/tests/wpt/mozilla/tests/css/many_brs_ref.html
similarity index 100%
rename from tests/ref/many_brs_ref.html
rename to tests/wpt/mozilla/tests/css/many_brs_ref.html
diff --git a/tests/ref/margin_padding_inline_block_a.html b/tests/wpt/mozilla/tests/css/margin_padding_inline_block_a.html
similarity index 80%
rename from tests/ref/margin_padding_inline_block_a.html
rename to tests/wpt/mozilla/tests/css/margin_padding_inline_block_a.html
index d2a8f5d4b82..aed899a2574 100644
--- a/tests/ref/margin_padding_inline_block_a.html
+++ b/tests/wpt/mozilla/tests/css/margin_padding_inline_block_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='margin_padding_inline_block_ref.html'>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/margin_padding_inline_block_ref.html b/tests/wpt/mozilla/tests/css/margin_padding_inline_block_ref.html
similarity index 100%
rename from tests/ref/margin_padding_inline_block_ref.html
rename to tests/wpt/mozilla/tests/css/margin_padding_inline_block_ref.html
diff --git a/tests/ref/margins_inside_floats_a.html b/tests/wpt/mozilla/tests/css/margins_inside_floats_a.html
similarity index 79%
rename from tests/ref/margins_inside_floats_a.html
rename to tests/wpt/mozilla/tests/css/margins_inside_floats_a.html
index 9ad6aa576ed..1d29dca04e5 100644
--- a/tests/ref/margins_inside_floats_a.html
+++ b/tests/wpt/mozilla/tests/css/margins_inside_floats_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='margins_inside_floats_ref.html'>
 <body>
 <div style="float: left;">
     <div style="margin-bottom: 64px;">Must be this tall</div>
diff --git a/tests/ref/margins_inside_floats_ref.html b/tests/wpt/mozilla/tests/css/margins_inside_floats_ref.html
similarity index 100%
rename from tests/ref/margins_inside_floats_ref.html
rename to tests/wpt/mozilla/tests/css/margins_inside_floats_ref.html
diff --git a/tests/ref/max_width_float_simple_a.html b/tests/wpt/mozilla/tests/css/max_width_float_simple_a.html
similarity index 85%
rename from tests/ref/max_width_float_simple_a.html
rename to tests/wpt/mozilla/tests/css/max_width_float_simple_a.html
index 8ce2c4216ce..0b33611672b 100644
--- a/tests/ref/max_width_float_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/max_width_float_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='max_width_float_simple_b.html'>
     <style>
       #first {
       width: 100px;
diff --git a/tests/ref/max_width_float_simple_b.html b/tests/wpt/mozilla/tests/css/max_width_float_simple_b.html
similarity index 100%
rename from tests/ref/max_width_float_simple_b.html
rename to tests/wpt/mozilla/tests/css/max_width_float_simple_b.html
diff --git a/tests/ref/max_width_simple_a.html b/tests/wpt/mozilla/tests/css/max_width_simple_a.html
similarity index 87%
rename from tests/ref/max_width_simple_a.html
rename to tests/wpt/mozilla/tests/css/max_width_simple_a.html
index e8bfb8555c5..0ee3371e291 100644
--- a/tests/ref/max_width_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/max_width_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='max_width_simple_b.html'>
     <style>
       #first {
       position: relative;
diff --git a/tests/ref/max_width_simple_b.html b/tests/wpt/mozilla/tests/css/max_width_simple_b.html
similarity index 100%
rename from tests/ref/max_width_simple_b.html
rename to tests/wpt/mozilla/tests/css/max_width_simple_b.html
diff --git a/tests/ref/min_max_height_a.html b/tests/wpt/mozilla/tests/css/min_max_height_a.html
similarity index 91%
rename from tests/ref/min_max_height_a.html
rename to tests/wpt/mozilla/tests/css/min_max_height_a.html
index ace1cac6df3..d4dc896fe54 100644
--- a/tests/ref/min_max_height_a.html
+++ b/tests/wpt/mozilla/tests/css/min_max_height_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='min_max_height_b.html'>
 <title>You see here a scroll labeled VE FORBRYDERNE.</title>
 <style>
 div {
diff --git a/tests/ref/min_max_height_b.html b/tests/wpt/mozilla/tests/css/min_max_height_b.html
similarity index 100%
rename from tests/ref/min_max_height_b.html
rename to tests/wpt/mozilla/tests/css/min_max_height_b.html
diff --git a/tests/ref/min_width_float_simple_a.html b/tests/wpt/mozilla/tests/css/min_width_float_simple_a.html
similarity index 86%
rename from tests/ref/min_width_float_simple_a.html
rename to tests/wpt/mozilla/tests/css/min_width_float_simple_a.html
index dea5d19cee7..9090c275f7a 100644
--- a/tests/ref/min_width_float_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/min_width_float_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='min_width_float_simple_b.html'>
     <style>
       #first {
       position: relative;
diff --git a/tests/ref/min_width_float_simple_b.html b/tests/wpt/mozilla/tests/css/min_width_float_simple_b.html
similarity index 100%
rename from tests/ref/min_width_float_simple_b.html
rename to tests/wpt/mozilla/tests/css/min_width_float_simple_b.html
diff --git a/tests/ref/min_width_simple_a.html b/tests/wpt/mozilla/tests/css/min_width_simple_a.html
similarity index 87%
rename from tests/ref/min_width_simple_a.html
rename to tests/wpt/mozilla/tests/css/min_width_simple_a.html
index 203281f6166..f48da91926a 100644
--- a/tests/ref/min_width_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/min_width_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='min_width_simple_b.html'>
     <style>
       #first {
       position: relative;
diff --git a/tests/ref/min_width_simple_b.html b/tests/wpt/mozilla/tests/css/min_width_simple_b.html
similarity index 100%
rename from tests/ref/min_width_simple_b.html
rename to tests/wpt/mozilla/tests/css/min_width_simple_b.html
diff --git a/tests/ref/minimum_line_height_a.html b/tests/wpt/mozilla/tests/css/minimum_line_height_a.html
similarity index 93%
rename from tests/ref/minimum_line_height_a.html
rename to tests/wpt/mozilla/tests/css/minimum_line_height_a.html
index 819c4ecdc8f..e8506b79691 100644
--- a/tests/ref/minimum_line_height_a.html
+++ b/tests/wpt/mozilla/tests/css/minimum_line_height_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='minimum_line_height_b.html'>
 <head>
 <style>
 #a {
diff --git a/tests/ref/minimum_line_height_b.html b/tests/wpt/mozilla/tests/css/minimum_line_height_b.html
similarity index 100%
rename from tests/ref/minimum_line_height_b.html
rename to tests/wpt/mozilla/tests/css/minimum_line_height_b.html
diff --git a/tests/ref/mix_blend_mode_a.html b/tests/wpt/mozilla/tests/css/mix_blend_mode_a.html
similarity index 93%
rename from tests/ref/mix_blend_mode_a.html
rename to tests/wpt/mozilla/tests/css/mix_blend_mode_a.html
index f2c49230625..4e6bc7918ce 100644
--- a/tests/ref/mix_blend_mode_a.html
+++ b/tests/wpt/mozilla/tests/css/mix_blend_mode_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='mix_blend_mode_ref.html'>
 <style>
 html {
     background: #ffffff;
diff --git a/tests/ref/mix_blend_mode_ref.html b/tests/wpt/mozilla/tests/css/mix_blend_mode_ref.html
similarity index 100%
rename from tests/ref/mix_blend_mode_ref.html
rename to tests/wpt/mozilla/tests/css/mix_blend_mode_ref.html
diff --git a/tests/ref/multiple_css_class_a.html b/tests/wpt/mozilla/tests/css/multiple_css_class_a.html
similarity index 81%
rename from tests/ref/multiple_css_class_a.html
rename to tests/wpt/mozilla/tests/css/multiple_css_class_a.html
index bdca7589fdf..aaf1fbdbf1c 100644
--- a/tests/ref/multiple_css_class_a.html
+++ b/tests/wpt/mozilla/tests/css/multiple_css_class_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel='match' href='multiple_css_class_b.html'>
     <style>
     .foo {
       height: 100px;
diff --git a/tests/ref/multiple_css_class_b.html b/tests/wpt/mozilla/tests/css/multiple_css_class_b.html
similarity index 100%
rename from tests/ref/multiple_css_class_b.html
rename to tests/wpt/mozilla/tests/css/multiple_css_class_b.html
diff --git a/tests/ref/negative_margin_uncle_a.html b/tests/wpt/mozilla/tests/css/negative_margin_uncle_a.html
similarity index 89%
rename from tests/ref/negative_margin_uncle_a.html
rename to tests/wpt/mozilla/tests/css/negative_margin_uncle_a.html
index a96c2bdd700..6ef7fab6298 100644
--- a/tests/ref/negative_margin_uncle_a.html
+++ b/tests/wpt/mozilla/tests/css/negative_margin_uncle_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='negative_margin_uncle_b.html'>
 <title>You see here a scroll labeled KERNOD WEL.</title>
 <style>
 body {
diff --git a/tests/ref/negative_margin_uncle_b.html b/tests/wpt/mozilla/tests/css/negative_margin_uncle_b.html
similarity index 100%
rename from tests/ref/negative_margin_uncle_b.html
rename to tests/wpt/mozilla/tests/css/negative_margin_uncle_b.html
diff --git a/tests/ref/negative_margins_a.html b/tests/wpt/mozilla/tests/css/negative_margins_a.html
similarity index 77%
rename from tests/ref/negative_margins_a.html
rename to tests/wpt/mozilla/tests/css/negative_margins_a.html
index 7c3593b2820..71245dfec75 100644
--- a/tests/ref/negative_margins_a.html
+++ b/tests/wpt/mozilla/tests/css/negative_margins_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='negative_margins_b.html'>
 <style>
 * {
     line-height: 14px;
diff --git a/tests/ref/negative_margins_b.html b/tests/wpt/mozilla/tests/css/negative_margins_b.html
similarity index 100%
rename from tests/ref/negative_margins_b.html
rename to tests/wpt/mozilla/tests/css/negative_margins_b.html
diff --git a/tests/ref/no-image-ref.html b/tests/wpt/mozilla/tests/css/no-image-ref.html
similarity index 100%
rename from tests/ref/no-image-ref.html
rename to tests/wpt/mozilla/tests/css/no-image-ref.html
diff --git a/tests/ref/no-image.html b/tests/wpt/mozilla/tests/css/no-image.html
similarity index 63%
rename from tests/ref/no-image.html
rename to tests/wpt/mozilla/tests/css/no-image.html
index 972206b12f1..e4ee17532ce 100644
--- a/tests/ref/no-image.html
+++ b/tests/wpt/mozilla/tests/css/no-image.html
@@ -1 +1,3 @@
+<link rel='match' href='no-image-ref.html'>
 <img width="100px" height="100px" src="i-feel-a-disturbance-in-the-force.wtf">
+
diff --git a/tests/ref/no_image_background_a.html b/tests/wpt/mozilla/tests/css/no_image_background_a.html
similarity index 83%
rename from tests/ref/no_image_background_a.html
rename to tests/wpt/mozilla/tests/css/no_image_background_a.html
index 188112e3dc1..30618ac8775 100644
--- a/tests/ref/no_image_background_a.html
+++ b/tests/wpt/mozilla/tests/css/no_image_background_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='no_image_background_ref.html'>
 <style>
 body {
     background: peachpuff;
diff --git a/tests/ref/no_image_background_ref.html b/tests/wpt/mozilla/tests/css/no_image_background_ref.html
similarity index 100%
rename from tests/ref/no_image_background_ref.html
rename to tests/wpt/mozilla/tests/css/no_image_background_ref.html
diff --git a/tests/ref/noscript.html b/tests/wpt/mozilla/tests/css/noscript.html
similarity index 62%
rename from tests/ref/noscript.html
rename to tests/wpt/mozilla/tests/css/noscript.html
index 08de375d619..eea193b7b42 100644
--- a/tests/ref/noscript.html
+++ b/tests/wpt/mozilla/tests/css/noscript.html
@@ -1,4 +1,5 @@
 <html>
+<link rel='match' href='noscript_ref.html'>
 <body>
 Text <noscript>Noscript</noscript> Final.
 </body>
diff --git a/tests/ref/noscript_ref.html b/tests/wpt/mozilla/tests/css/noscript_ref.html
similarity index 100%
rename from tests/ref/noscript_ref.html
rename to tests/wpt/mozilla/tests/css/noscript_ref.html
diff --git a/tests/ref/nth_last_of_type_pseudo_a.html b/tests/wpt/mozilla/tests/css/nth_last_of_type_pseudo_a.html
similarity index 98%
rename from tests/ref/nth_last_of_type_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/nth_last_of_type_pseudo_a.html
index f587e1add18..9f9816a2ede 100644
--- a/tests/ref/nth_last_of_type_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/nth_last_of_type_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='nth_last_of_type_pseudo_b.html'>
     <title>:nth-last-of-type test</title>
     <style type="text/css">
       html { background: red; }
diff --git a/tests/ref/nth_last_of_type_pseudo_b.html b/tests/wpt/mozilla/tests/css/nth_last_of_type_pseudo_b.html
similarity index 100%
rename from tests/ref/nth_last_of_type_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/nth_last_of_type_pseudo_b.html
diff --git a/tests/ref/nth_of_type_pseudo_a.html b/tests/wpt/mozilla/tests/css/nth_of_type_pseudo_a.html
similarity index 98%
rename from tests/ref/nth_of_type_pseudo_a.html
rename to tests/wpt/mozilla/tests/css/nth_of_type_pseudo_a.html
index dfeecdb3afe..f3020e01d5b 100644
--- a/tests/ref/nth_of_type_pseudo_a.html
+++ b/tests/wpt/mozilla/tests/css/nth_of_type_pseudo_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='nth_of_type_pseudo_b.html'>
     <title>:nth-of-type test</title>
     <style type="text/css">
       html { background: red; }
diff --git a/tests/ref/nth_of_type_pseudo_b.html b/tests/wpt/mozilla/tests/css/nth_of_type_pseudo_b.html
similarity index 100%
rename from tests/ref/nth_of_type_pseudo_b.html
rename to tests/wpt/mozilla/tests/css/nth_of_type_pseudo_b.html
diff --git a/tests/ref/object_element_a.html b/tests/wpt/mozilla/tests/css/object_element_a.html
similarity index 98%
rename from tests/ref/object_element_a.html
rename to tests/wpt/mozilla/tests/css/object_element_a.html
index 501e0c049f9..04c18c2fbbb 100644
--- a/tests/ref/object_element_a.html
+++ b/tests/wpt/mozilla/tests/css/object_element_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
+   <link rel='match' href='object_element_b.html'>
   <title></title>
  </head>
 <body>
diff --git a/tests/ref/object_element_b.html b/tests/wpt/mozilla/tests/css/object_element_b.html
similarity index 100%
rename from tests/ref/object_element_b.html
rename to tests/wpt/mozilla/tests/css/object_element_b.html