diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 62500b43965..d274da12d91 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -296,54 +296,10 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_
 == rtl_margin_a.html rtl_margin_ref.html
 == rtl_simple.html rtl_simple_ref.html
 == rtl_table_a.html rtl_table_ref.html
-== servo_center_a.html servo_center_ref.html
-== setattribute_id_restyle_a.html setattribute_id_restyle_b.html
-== simple_inline_absolute_containing_block_a.html simple_inline_absolute_containing_block_ref.html
-== stacked_layers.html stacked_layers_ref.html
-== stacking_context_overflow_a.html stacking_context_overflow_ref.html
-== stacking_context_overflow_relative_outline_a.html stacking_context_overflow_relative_outline_ref.html
-== style_is_in_doc.html style_is_in_doc_ref.html
-== submit_focus_a.html submit_focus_b.html
-== table_auto_width.html table_auto_width_ref.html
-== table_caption_bottom_a.html table_caption_bottom_ref.html
-== table_caption_top_a.html table_caption_top_ref.html
-== table_cell_float_a.html table_cell_float_ref.html
-== table_center_a.html table_center_ref.html
-== table_colspan_fixed_a.html table_colspan_fixed_ref.html
-== table_colspan_simple_a.html table_colspan_simple_ref.html
-== table_containing_block_a.html table_containing_block_ref.html
-== table_expansion_to_fit_a.html table_expansion_to_fit_ref.html
-== table_float_translation_a.html table_float_translation_ref.html
-== table_intrinsic_style_specified_width_a.html table_intrinsic_style_specified_width_ref.html
-== table_margin_auto_a.html table_margin_auto_ref.html
-== table_padding_a.html table_padding_ref.html
-== table_percentage_capping_a.html table_percentage_capping_ref.html
-== table_percentage_width_a.html table_percentage_width_ref.html
-== table_preferred_width_a.html table_preferred_width_ref.html
-== table_row_direction_a.html table_row_direction_ref.html
-== table_specified_width_a.html table_specified_width_ref.html
-== table_width_attribute_a.html table_width_attribute_ref.html
-== text_align_complex_a.html text_align_complex_ref.html
-== text_align_justify_a.html text_align_justify_ref.html
-== text_align_rtl.html text_align_rtl_ref.html
-== text_align_start_end.html text_align_start_end_ref.html
-== text_decoration_cached.html text_decoration_cached_ref.html
 # text_decoration_propagation_a.html text_decoration_propagation_b.html
 != text_decoration_smoke_a.html text_decoration_smoke_ref.html
 != text_decoration_underline_subpx_a.html text_decoration_underline_subpx_ref.html
-== text_indent_a.html text_indent_ref.html
-== text_justify_none_a.html text_justify_none_ref.html
 != text_overflow_a.html text_overflow_ref.html
-== text_overflow_basic_a.html text_overflow_basic_ref.html
-== text_shadow_blur_a.html text_shadow_blur_ref.html
-== text_shadow_decorations_a.html text_shadow_decorations_ref.html
-== text_shadow_multiple_shadows_a.html text_shadow_multiple_shadows_ref.html
-== text_shadow_simple_a.html text_shadow_simple_ref.html
-== text_transform_capitalize_a.html text_transform_capitalize_ref.html
-== text_transform_lowercase_a.html text_transform_lowercase_ref.html
-== text_transform_none_a.html text_transform_none_ref.html
-== text_transform_uppercase_a.html text_transform_uppercase_ref.html
-== transform_3d.html transform_3d_ref.html
 flaky_cpu,prefs:"layout.writing-mode.enabled" == vertical-lr-blocks.html vertical-lr-blocks_ref.html
 == viewport_meta.html viewport_rule_ref.html
 resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index f64a9c710ed..e5b39863e76 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -579,6 +579,30 @@
             "url": "/_mozilla/css/flex_nochild.html"
           }
         ],
+        "css/servo_center_a.html": [
+          {
+            "path": "css/servo_center_a.html",
+            "references": [
+              [
+                "/_mozilla/css/servo_center_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/servo_center_a.html"
+          }
+        ],
+        "css/setattribute_id_restyle_a.html": [
+          {
+            "path": "css/setattribute_id_restyle_a.html",
+            "references": [
+              [
+                "/_mozilla/css/setattribute_id_restyle_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/setattribute_id_restyle_a.html"
+          }
+        ],
         "css/setpropertypriority.html": [
           {
             "path": "css/setpropertypriority.html",
@@ -591,6 +615,54 @@
             "url": "/_mozilla/css/setpropertypriority.html"
           }
         ],
+        "css/simple_inline_absolute_containing_block_a.html": [
+          {
+            "path": "css/simple_inline_absolute_containing_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/simple_inline_absolute_containing_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/simple_inline_absolute_containing_block_a.html"
+          }
+        ],
+        "css/stacked_layers.html": [
+          {
+            "path": "css/stacked_layers.html",
+            "references": [
+              [
+                "/_mozilla/css/stacked_layers_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/stacked_layers.html"
+          }
+        ],
+        "css/stacking_context_overflow_a.html": [
+          {
+            "path": "css/stacking_context_overflow_a.html",
+            "references": [
+              [
+                "/_mozilla/css/stacking_context_overflow_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/stacking_context_overflow_a.html"
+          }
+        ],
+        "css/stacking_context_overflow_relative_outline_a.html": [
+          {
+            "path": "css/stacking_context_overflow_relative_outline_a.html",
+            "references": [
+              [
+                "/_mozilla/css/stacking_context_overflow_relative_outline_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/stacking_context_overflow_relative_outline_a.html"
+          }
+        ],
         "css/stacking_context_rtl.html": [
           {
             "path": "css/stacking_context_rtl.html",
@@ -603,6 +675,462 @@
             "url": "/_mozilla/css/stacking_context_rtl.html"
           }
         ],
+        "css/style_is_in_doc.html": [
+          {
+            "path": "css/style_is_in_doc.html",
+            "references": [
+              [
+                "/_mozilla/css/style_is_in_doc_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/style_is_in_doc.html"
+          }
+        ],
+        "css/submit_focus_a.html": [
+          {
+            "path": "css/submit_focus_a.html",
+            "references": [
+              [
+                "/_mozilla/css/submit_focus_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/submit_focus_a.html"
+          }
+        ],
+        "css/table_auto_width.html": [
+          {
+            "path": "css/table_auto_width.html",
+            "references": [
+              [
+                "/_mozilla/css/table_auto_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_auto_width.html"
+          }
+        ],
+        "css/table_caption_bottom_a.html": [
+          {
+            "path": "css/table_caption_bottom_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_caption_bottom_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_caption_bottom_a.html"
+          }
+        ],
+        "css/table_caption_top_a.html": [
+          {
+            "path": "css/table_caption_top_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_caption_top_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_caption_top_a.html"
+          }
+        ],
+        "css/table_cell_float_a.html": [
+          {
+            "path": "css/table_cell_float_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_cell_float_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_cell_float_a.html"
+          }
+        ],
+        "css/table_center_a.html": [
+          {
+            "path": "css/table_center_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_center_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_center_a.html"
+          }
+        ],
+        "css/table_colspan_fixed_a.html": [
+          {
+            "path": "css/table_colspan_fixed_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_colspan_fixed_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_colspan_fixed_a.html"
+          }
+        ],
+        "css/table_colspan_simple_a.html": [
+          {
+            "path": "css/table_colspan_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_colspan_simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_colspan_simple_a.html"
+          }
+        ],
+        "css/table_containing_block_a.html": [
+          {
+            "path": "css/table_containing_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_containing_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_containing_block_a.html"
+          }
+        ],
+        "css/table_expansion_to_fit_a.html": [
+          {
+            "path": "css/table_expansion_to_fit_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_expansion_to_fit_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_expansion_to_fit_a.html"
+          }
+        ],
+        "css/table_float_translation_a.html": [
+          {
+            "path": "css/table_float_translation_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_float_translation_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_float_translation_a.html"
+          }
+        ],
+        "css/table_intrinsic_style_specified_width_a.html": [
+          {
+            "path": "css/table_intrinsic_style_specified_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_intrinsic_style_specified_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_intrinsic_style_specified_width_a.html"
+          }
+        ],
+        "css/table_margin_auto_a.html": [
+          {
+            "path": "css/table_margin_auto_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_margin_auto_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_margin_auto_a.html"
+          }
+        ],
+        "css/table_padding_a.html": [
+          {
+            "path": "css/table_padding_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_padding_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_padding_a.html"
+          }
+        ],
+        "css/table_percentage_capping_a.html": [
+          {
+            "path": "css/table_percentage_capping_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_percentage_capping_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_percentage_capping_a.html"
+          }
+        ],
+        "css/table_percentage_width_a.html": [
+          {
+            "path": "css/table_percentage_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_percentage_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_percentage_width_a.html"
+          }
+        ],
+        "css/table_preferred_width_a.html": [
+          {
+            "path": "css/table_preferred_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_preferred_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_preferred_width_a.html"
+          }
+        ],
+        "css/table_row_direction_a.html": [
+          {
+            "path": "css/table_row_direction_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_row_direction_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_row_direction_a.html"
+          }
+        ],
+        "css/table_specified_width_a.html": [
+          {
+            "path": "css/table_specified_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_specified_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_specified_width_a.html"
+          }
+        ],
+        "css/table_width_attribute_a.html": [
+          {
+            "path": "css/table_width_attribute_a.html",
+            "references": [
+              [
+                "/_mozilla/css/table_width_attribute_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/table_width_attribute_a.html"
+          }
+        ],
+        "css/text_align_complex_a.html": [
+          {
+            "path": "css/text_align_complex_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_align_complex_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_align_complex_a.html"
+          }
+        ],
+        "css/text_align_justify_a.html": [
+          {
+            "path": "css/text_align_justify_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_align_justify_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_align_justify_a.html"
+          }
+        ],
+        "css/text_align_rtl.html": [
+          {
+            "path": "css/text_align_rtl.html",
+            "references": [
+              [
+                "/_mozilla/css/text_align_rtl_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_align_rtl.html"
+          }
+        ],
+        "css/text_align_start_end.html": [
+          {
+            "path": "css/text_align_start_end.html",
+            "references": [
+              [
+                "/_mozilla/css/text_align_start_end_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_align_start_end.html"
+          }
+        ],
+        "css/text_decoration_cached.html": [
+          {
+            "path": "css/text_decoration_cached.html",
+            "references": [
+              [
+                "/_mozilla/css/text_decoration_cached_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_decoration_cached.html"
+          }
+        ],
+        "css/text_indent_a.html": [
+          {
+            "path": "css/text_indent_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_indent_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_indent_a.html"
+          }
+        ],
+        "css/text_justify_none_a.html": [
+          {
+            "path": "css/text_justify_none_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_justify_none_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_justify_none_a.html"
+          }
+        ],
+        "css/text_overflow_basic_a.html": [
+          {
+            "path": "css/text_overflow_basic_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_overflow_basic_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_overflow_basic_a.html"
+          }
+        ],
+        "css/text_shadow_blur_a.html": [
+          {
+            "path": "css/text_shadow_blur_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_shadow_blur_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_shadow_blur_a.html"
+          }
+        ],
+        "css/text_shadow_decorations_a.html": [
+          {
+            "path": "css/text_shadow_decorations_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_shadow_decorations_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_shadow_decorations_a.html"
+          }
+        ],
+        "css/text_shadow_multiple_shadows_a.html": [
+          {
+            "path": "css/text_shadow_multiple_shadows_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_shadow_multiple_shadows_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_shadow_multiple_shadows_a.html"
+          }
+        ],
+        "css/text_shadow_simple_a.html": [
+          {
+            "path": "css/text_shadow_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_shadow_simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_shadow_simple_a.html"
+          }
+        ],
+        "css/text_transform_capitalize_a.html": [
+          {
+            "path": "css/text_transform_capitalize_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_transform_capitalize_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_transform_capitalize_a.html"
+          }
+        ],
+        "css/text_transform_lowercase_a.html": [
+          {
+            "path": "css/text_transform_lowercase_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_transform_lowercase_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_transform_lowercase_a.html"
+          }
+        ],
+        "css/text_transform_none_a.html": [
+          {
+            "path": "css/text_transform_none_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_transform_none_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_transform_none_a.html"
+          }
+        ],
+        "css/text_transform_uppercase_a.html": [
+          {
+            "path": "css/text_transform_uppercase_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_transform_uppercase_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/text_transform_uppercase_a.html"
+          }
+        ],
+        "css/transform_3d.html": [
+          {
+            "path": "css/transform_3d.html",
+            "references": [
+              [
+                "/_mozilla/css/transform_3d_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transform_3d.html"
+          }
+        ],
         "css/transform_optimization.html": [
           {
             "path": "css/transform_optimization.html",
@@ -2132,6 +2660,30 @@
           "url": "/_mozilla/css/flex_nochild.html"
         }
       ],
+      "css/servo_center_a.html": [
+        {
+          "path": "css/servo_center_a.html",
+          "references": [
+            [
+              "/_mozilla/css/servo_center_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/servo_center_a.html"
+        }
+      ],
+      "css/setattribute_id_restyle_a.html": [
+        {
+          "path": "css/setattribute_id_restyle_a.html",
+          "references": [
+            [
+              "/_mozilla/css/setattribute_id_restyle_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/setattribute_id_restyle_a.html"
+        }
+      ],
       "css/setpropertypriority.html": [
         {
           "path": "css/setpropertypriority.html",
@@ -2144,6 +2696,54 @@
           "url": "/_mozilla/css/setpropertypriority.html"
         }
       ],
+      "css/simple_inline_absolute_containing_block_a.html": [
+        {
+          "path": "css/simple_inline_absolute_containing_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/simple_inline_absolute_containing_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/simple_inline_absolute_containing_block_a.html"
+        }
+      ],
+      "css/stacked_layers.html": [
+        {
+          "path": "css/stacked_layers.html",
+          "references": [
+            [
+              "/_mozilla/css/stacked_layers_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/stacked_layers.html"
+        }
+      ],
+      "css/stacking_context_overflow_a.html": [
+        {
+          "path": "css/stacking_context_overflow_a.html",
+          "references": [
+            [
+              "/_mozilla/css/stacking_context_overflow_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/stacking_context_overflow_a.html"
+        }
+      ],
+      "css/stacking_context_overflow_relative_outline_a.html": [
+        {
+          "path": "css/stacking_context_overflow_relative_outline_a.html",
+          "references": [
+            [
+              "/_mozilla/css/stacking_context_overflow_relative_outline_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/stacking_context_overflow_relative_outline_a.html"
+        }
+      ],
       "css/stacking_context_rtl.html": [
         {
           "path": "css/stacking_context_rtl.html",
@@ -2156,6 +2756,462 @@
           "url": "/_mozilla/css/stacking_context_rtl.html"
         }
       ],
+      "css/style_is_in_doc.html": [
+        {
+          "path": "css/style_is_in_doc.html",
+          "references": [
+            [
+              "/_mozilla/css/style_is_in_doc_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/style_is_in_doc.html"
+        }
+      ],
+      "css/submit_focus_a.html": [
+        {
+          "path": "css/submit_focus_a.html",
+          "references": [
+            [
+              "/_mozilla/css/submit_focus_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/submit_focus_a.html"
+        }
+      ],
+      "css/table_auto_width.html": [
+        {
+          "path": "css/table_auto_width.html",
+          "references": [
+            [
+              "/_mozilla/css/table_auto_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_auto_width.html"
+        }
+      ],
+      "css/table_caption_bottom_a.html": [
+        {
+          "path": "css/table_caption_bottom_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_caption_bottom_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_caption_bottom_a.html"
+        }
+      ],
+      "css/table_caption_top_a.html": [
+        {
+          "path": "css/table_caption_top_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_caption_top_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_caption_top_a.html"
+        }
+      ],
+      "css/table_cell_float_a.html": [
+        {
+          "path": "css/table_cell_float_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_cell_float_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_cell_float_a.html"
+        }
+      ],
+      "css/table_center_a.html": [
+        {
+          "path": "css/table_center_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_center_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_center_a.html"
+        }
+      ],
+      "css/table_colspan_fixed_a.html": [
+        {
+          "path": "css/table_colspan_fixed_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_colspan_fixed_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_colspan_fixed_a.html"
+        }
+      ],
+      "css/table_colspan_simple_a.html": [
+        {
+          "path": "css/table_colspan_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_colspan_simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_colspan_simple_a.html"
+        }
+      ],
+      "css/table_containing_block_a.html": [
+        {
+          "path": "css/table_containing_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_containing_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_containing_block_a.html"
+        }
+      ],
+      "css/table_expansion_to_fit_a.html": [
+        {
+          "path": "css/table_expansion_to_fit_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_expansion_to_fit_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_expansion_to_fit_a.html"
+        }
+      ],
+      "css/table_float_translation_a.html": [
+        {
+          "path": "css/table_float_translation_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_float_translation_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_float_translation_a.html"
+        }
+      ],
+      "css/table_intrinsic_style_specified_width_a.html": [
+        {
+          "path": "css/table_intrinsic_style_specified_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_intrinsic_style_specified_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_intrinsic_style_specified_width_a.html"
+        }
+      ],
+      "css/table_margin_auto_a.html": [
+        {
+          "path": "css/table_margin_auto_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_margin_auto_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_margin_auto_a.html"
+        }
+      ],
+      "css/table_padding_a.html": [
+        {
+          "path": "css/table_padding_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_padding_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_padding_a.html"
+        }
+      ],
+      "css/table_percentage_capping_a.html": [
+        {
+          "path": "css/table_percentage_capping_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_percentage_capping_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_percentage_capping_a.html"
+        }
+      ],
+      "css/table_percentage_width_a.html": [
+        {
+          "path": "css/table_percentage_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_percentage_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_percentage_width_a.html"
+        }
+      ],
+      "css/table_preferred_width_a.html": [
+        {
+          "path": "css/table_preferred_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_preferred_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_preferred_width_a.html"
+        }
+      ],
+      "css/table_row_direction_a.html": [
+        {
+          "path": "css/table_row_direction_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_row_direction_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_row_direction_a.html"
+        }
+      ],
+      "css/table_specified_width_a.html": [
+        {
+          "path": "css/table_specified_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_specified_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_specified_width_a.html"
+        }
+      ],
+      "css/table_width_attribute_a.html": [
+        {
+          "path": "css/table_width_attribute_a.html",
+          "references": [
+            [
+              "/_mozilla/css/table_width_attribute_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/table_width_attribute_a.html"
+        }
+      ],
+      "css/text_align_complex_a.html": [
+        {
+          "path": "css/text_align_complex_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_align_complex_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_align_complex_a.html"
+        }
+      ],
+      "css/text_align_justify_a.html": [
+        {
+          "path": "css/text_align_justify_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_align_justify_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_align_justify_a.html"
+        }
+      ],
+      "css/text_align_rtl.html": [
+        {
+          "path": "css/text_align_rtl.html",
+          "references": [
+            [
+              "/_mozilla/css/text_align_rtl_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_align_rtl.html"
+        }
+      ],
+      "css/text_align_start_end.html": [
+        {
+          "path": "css/text_align_start_end.html",
+          "references": [
+            [
+              "/_mozilla/css/text_align_start_end_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_align_start_end.html"
+        }
+      ],
+      "css/text_decoration_cached.html": [
+        {
+          "path": "css/text_decoration_cached.html",
+          "references": [
+            [
+              "/_mozilla/css/text_decoration_cached_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_decoration_cached.html"
+        }
+      ],
+      "css/text_indent_a.html": [
+        {
+          "path": "css/text_indent_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_indent_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_indent_a.html"
+        }
+      ],
+      "css/text_justify_none_a.html": [
+        {
+          "path": "css/text_justify_none_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_justify_none_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_justify_none_a.html"
+        }
+      ],
+      "css/text_overflow_basic_a.html": [
+        {
+          "path": "css/text_overflow_basic_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_overflow_basic_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_overflow_basic_a.html"
+        }
+      ],
+      "css/text_shadow_blur_a.html": [
+        {
+          "path": "css/text_shadow_blur_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_shadow_blur_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_shadow_blur_a.html"
+        }
+      ],
+      "css/text_shadow_decorations_a.html": [
+        {
+          "path": "css/text_shadow_decorations_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_shadow_decorations_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_shadow_decorations_a.html"
+        }
+      ],
+      "css/text_shadow_multiple_shadows_a.html": [
+        {
+          "path": "css/text_shadow_multiple_shadows_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_shadow_multiple_shadows_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_shadow_multiple_shadows_a.html"
+        }
+      ],
+      "css/text_shadow_simple_a.html": [
+        {
+          "path": "css/text_shadow_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_shadow_simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_shadow_simple_a.html"
+        }
+      ],
+      "css/text_transform_capitalize_a.html": [
+        {
+          "path": "css/text_transform_capitalize_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_transform_capitalize_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_transform_capitalize_a.html"
+        }
+      ],
+      "css/text_transform_lowercase_a.html": [
+        {
+          "path": "css/text_transform_lowercase_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_transform_lowercase_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_transform_lowercase_a.html"
+        }
+      ],
+      "css/text_transform_none_a.html": [
+        {
+          "path": "css/text_transform_none_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_transform_none_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_transform_none_a.html"
+        }
+      ],
+      "css/text_transform_uppercase_a.html": [
+        {
+          "path": "css/text_transform_uppercase_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_transform_uppercase_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/text_transform_uppercase_a.html"
+        }
+      ],
+      "css/transform_3d.html": [
+        {
+          "path": "css/transform_3d.html",
+          "references": [
+            [
+              "/_mozilla/css/transform_3d_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transform_3d.html"
+        }
+      ],
       "css/transform_optimization.html": [
         {
           "path": "css/transform_optimization.html",
diff --git a/tests/ref/servo_center_a.html b/tests/wpt/mozilla/tests/css/servo_center_a.html
similarity index 81%
rename from tests/ref/servo_center_a.html
rename to tests/wpt/mozilla/tests/css/servo_center_a.html
index b43bf1830b0..047191730c3 100644
--- a/tests/ref/servo_center_a.html
+++ b/tests/wpt/mozilla/tests/css/servo_center_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='servo_center_ref.html'>
 <style>
 table {
     width: 85%;
diff --git a/tests/ref/servo_center_ref.html b/tests/wpt/mozilla/tests/css/servo_center_ref.html
similarity index 100%
rename from tests/ref/servo_center_ref.html
rename to tests/wpt/mozilla/tests/css/servo_center_ref.html
diff --git a/tests/ref/setattribute_id_restyle_a.html b/tests/wpt/mozilla/tests/css/setattribute_id_restyle_a.html
similarity index 81%
rename from tests/ref/setattribute_id_restyle_a.html
rename to tests/wpt/mozilla/tests/css/setattribute_id_restyle_a.html
index 469ce797db7..68d6c02a375 100644
--- a/tests/ref/setattribute_id_restyle_a.html
+++ b/tests/wpt/mozilla/tests/css/setattribute_id_restyle_a.html
@@ -1,3 +1,4 @@
+<link rel='match' href='setattribute_id_restyle_b.html'>
 <style>
     #foo { background-color: #FF0000; }
 </style>
diff --git a/tests/ref/setattribute_id_restyle_b.html b/tests/wpt/mozilla/tests/css/setattribute_id_restyle_b.html
similarity index 100%
rename from tests/ref/setattribute_id_restyle_b.html
rename to tests/wpt/mozilla/tests/css/setattribute_id_restyle_b.html
diff --git a/tests/ref/simple_inline_absolute_containing_block_a.html b/tests/wpt/mozilla/tests/css/simple_inline_absolute_containing_block_a.html
similarity index 86%
rename from tests/ref/simple_inline_absolute_containing_block_a.html
rename to tests/wpt/mozilla/tests/css/simple_inline_absolute_containing_block_a.html
index 3050a534268..4fdc1247b40 100644
--- a/tests/ref/simple_inline_absolute_containing_block_a.html
+++ b/tests/wpt/mozilla/tests/css/simple_inline_absolute_containing_block_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='simple_inline_absolute_containing_block_ref.html'>
 <style>
 main {
     position: relative;
diff --git a/tests/ref/simple_inline_absolute_containing_block_ref.html b/tests/wpt/mozilla/tests/css/simple_inline_absolute_containing_block_ref.html
similarity index 100%
rename from tests/ref/simple_inline_absolute_containing_block_ref.html
rename to tests/wpt/mozilla/tests/css/simple_inline_absolute_containing_block_ref.html
diff --git a/tests/ref/stacked_layers.html b/tests/wpt/mozilla/tests/css/stacked_layers.html
similarity index 94%
rename from tests/ref/stacked_layers.html
rename to tests/wpt/mozilla/tests/css/stacked_layers.html
index 615acb0b3c9..6cd0141a27d 100644
--- a/tests/ref/stacked_layers.html
+++ b/tests/wpt/mozilla/tests/css/stacked_layers.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='stacked_layers_ref.html'>
         <style>
             .test { float: left; margin-right: 25px; }
             .box { height: 50px; width: 50px; }
diff --git a/tests/ref/stacked_layers_ref.html b/tests/wpt/mozilla/tests/css/stacked_layers_ref.html
similarity index 100%
rename from tests/ref/stacked_layers_ref.html
rename to tests/wpt/mozilla/tests/css/stacked_layers_ref.html
diff --git a/tests/ref/stacking_context_overflow_a.html b/tests/wpt/mozilla/tests/css/stacking_context_overflow_a.html
similarity index 83%
rename from tests/ref/stacking_context_overflow_a.html
rename to tests/wpt/mozilla/tests/css/stacking_context_overflow_a.html
index ea87a5dba55..dc379afb779 100644
--- a/tests/ref/stacking_context_overflow_a.html
+++ b/tests/wpt/mozilla/tests/css/stacking_context_overflow_a.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<link rel='match' href='stacking_context_overflow_ref.html'>
 <!-- Tests that stacking contexts display overflow. -->
 <style>
 body {
diff --git a/tests/ref/stacking_context_overflow_ref.html b/tests/wpt/mozilla/tests/css/stacking_context_overflow_ref.html
similarity index 100%
rename from tests/ref/stacking_context_overflow_ref.html
rename to tests/wpt/mozilla/tests/css/stacking_context_overflow_ref.html
diff --git a/tests/ref/stacking_context_overflow_relative_outline_a.html b/tests/wpt/mozilla/tests/css/stacking_context_overflow_relative_outline_a.html
similarity index 81%
rename from tests/ref/stacking_context_overflow_relative_outline_a.html
rename to tests/wpt/mozilla/tests/css/stacking_context_overflow_relative_outline_a.html
index 64b965063fc..65eee6d5bc5 100644
--- a/tests/ref/stacking_context_overflow_relative_outline_a.html
+++ b/tests/wpt/mozilla/tests/css/stacking_context_overflow_relative_outline_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='stacking_context_overflow_relative_outline_ref.html'>
 <style>
 section {
     position: absolute;
diff --git a/tests/ref/stacking_context_overflow_relative_outline_ref.html b/tests/wpt/mozilla/tests/css/stacking_context_overflow_relative_outline_ref.html
similarity index 100%
rename from tests/ref/stacking_context_overflow_relative_outline_ref.html
rename to tests/wpt/mozilla/tests/css/stacking_context_overflow_relative_outline_ref.html
diff --git a/tests/ref/style_is_in_doc.html b/tests/wpt/mozilla/tests/css/style_is_in_doc.html
similarity index 94%
rename from tests/ref/style_is_in_doc.html
rename to tests/wpt/mozilla/tests/css/style_is_in_doc.html
index 9cc72e43343..cb3a56c7671 100644
--- a/tests/ref/style_is_in_doc.html
+++ b/tests/wpt/mozilla/tests/css/style_is_in_doc.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='style_is_in_doc_ref.html'>
 <meta charset="UTF-8">
 <style>
 .from_html { color: blue; }
diff --git a/tests/ref/style_is_in_doc_ref.html b/tests/wpt/mozilla/tests/css/style_is_in_doc_ref.html
similarity index 100%
rename from tests/ref/style_is_in_doc_ref.html
rename to tests/wpt/mozilla/tests/css/style_is_in_doc_ref.html
diff --git a/tests/ref/submit_focus_a.html b/tests/wpt/mozilla/tests/css/submit_focus_a.html
similarity index 77%
rename from tests/ref/submit_focus_a.html
rename to tests/wpt/mozilla/tests/css/submit_focus_a.html
index 261f3f005ec..e351bd22fa7 100644
--- a/tests/ref/submit_focus_a.html
+++ b/tests/wpt/mozilla/tests/css/submit_focus_a.html
@@ -1,3 +1,4 @@
+<link rel='match' href='submit_focus_b.html'>
 <style>
 button {
     display: inline-block;
diff --git a/tests/ref/submit_focus_b.html b/tests/wpt/mozilla/tests/css/submit_focus_b.html
similarity index 100%
rename from tests/ref/submit_focus_b.html
rename to tests/wpt/mozilla/tests/css/submit_focus_b.html
diff --git a/tests/ref/table_auto_width.html b/tests/wpt/mozilla/tests/css/table_auto_width.html
similarity index 79%
rename from tests/ref/table_auto_width.html
rename to tests/wpt/mozilla/tests/css/table_auto_width.html
index 62f0def0086..6571bc84f39 100644
--- a/tests/ref/table_auto_width.html
+++ b/tests/wpt/mozilla/tests/css/table_auto_width.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
+    <link rel='match' href='table_auto_width_ref.html'>
 	</head>
 	<body>
 		<table>
diff --git a/tests/ref/table_auto_width_ref.html b/tests/wpt/mozilla/tests/css/table_auto_width_ref.html
similarity index 100%
rename from tests/ref/table_auto_width_ref.html
rename to tests/wpt/mozilla/tests/css/table_auto_width_ref.html
diff --git a/tests/ref/table_caption_bottom_a.html b/tests/wpt/mozilla/tests/css/table_caption_bottom_a.html
similarity index 91%
rename from tests/ref/table_caption_bottom_a.html
rename to tests/wpt/mozilla/tests/css/table_caption_bottom_a.html
index 239abb84b3c..6eb0b0c1270 100644
--- a/tests/ref/table_caption_bottom_a.html
+++ b/tests/wpt/mozilla/tests/css/table_caption_bottom_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_caption_bottom_ref.html'>
 <!-- Tests that `caption-side` places the caption on the right side. -->
 <style>
 caption {
diff --git a/tests/ref/table_caption_bottom_ref.html b/tests/wpt/mozilla/tests/css/table_caption_bottom_ref.html
similarity index 100%
rename from tests/ref/table_caption_bottom_ref.html
rename to tests/wpt/mozilla/tests/css/table_caption_bottom_ref.html
diff --git a/tests/ref/table_caption_top_a.html b/tests/wpt/mozilla/tests/css/table_caption_top_a.html
similarity index 92%
rename from tests/ref/table_caption_top_a.html
rename to tests/wpt/mozilla/tests/css/table_caption_top_a.html
index 16b87dcec9b..ab921e9a3e6 100644
--- a/tests/ref/table_caption_top_a.html
+++ b/tests/wpt/mozilla/tests/css/table_caption_top_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_caption_top_ref.html'>
 <!-- Tests that `caption-side` places the caption on the right side. -->
 <style>
 caption {
diff --git a/tests/ref/table_caption_top_ref.html b/tests/wpt/mozilla/tests/css/table_caption_top_ref.html
similarity index 100%
rename from tests/ref/table_caption_top_ref.html
rename to tests/wpt/mozilla/tests/css/table_caption_top_ref.html
diff --git a/tests/ref/table_cell_float_a.html b/tests/wpt/mozilla/tests/css/table_cell_float_a.html
similarity index 89%
rename from tests/ref/table_cell_float_a.html
rename to tests/wpt/mozilla/tests/css/table_cell_float_a.html
index aafc61c7023..8c19383465d 100644
--- a/tests/ref/table_cell_float_a.html
+++ b/tests/wpt/mozilla/tests/css/table_cell_float_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='table_cell_float_ref.html'>
 <head>
 <!-- Tests that an element with `display: table-cell` is correctly positioned next to a float. -->
 <style>
diff --git a/tests/ref/table_cell_float_ref.html b/tests/wpt/mozilla/tests/css/table_cell_float_ref.html
similarity index 100%
rename from tests/ref/table_cell_float_ref.html
rename to tests/wpt/mozilla/tests/css/table_cell_float_ref.html
diff --git a/tests/ref/table_center_a.html b/tests/wpt/mozilla/tests/css/table_center_a.html
similarity index 83%
rename from tests/ref/table_center_a.html
rename to tests/wpt/mozilla/tests/css/table_center_a.html
index 8f7af8a8fa6..423e34c5258 100644
--- a/tests/ref/table_center_a.html
+++ b/tests/wpt/mozilla/tests/css/table_center_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='table_center_ref.html'>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/ref/table_center_ref.html b/tests/wpt/mozilla/tests/css/table_center_ref.html
similarity index 100%
rename from tests/ref/table_center_ref.html
rename to tests/wpt/mozilla/tests/css/table_center_ref.html
diff --git a/tests/ref/table_colspan_fixed_a.html b/tests/wpt/mozilla/tests/css/table_colspan_fixed_a.html
similarity index 91%
rename from tests/ref/table_colspan_fixed_a.html
rename to tests/wpt/mozilla/tests/css/table_colspan_fixed_a.html
index ba1b7d9419a..627fe798dc2 100644
--- a/tests/ref/table_colspan_fixed_a.html
+++ b/tests/wpt/mozilla/tests/css/table_colspan_fixed_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='table_colspan_fixed_ref.html'>
 <style>
 table {
     width: 300px;
diff --git a/tests/ref/table_colspan_fixed_ref.html b/tests/wpt/mozilla/tests/css/table_colspan_fixed_ref.html
similarity index 100%
rename from tests/ref/table_colspan_fixed_ref.html
rename to tests/wpt/mozilla/tests/css/table_colspan_fixed_ref.html
diff --git a/tests/ref/table_colspan_simple_a.html b/tests/wpt/mozilla/tests/css/table_colspan_simple_a.html
similarity index 89%
rename from tests/ref/table_colspan_simple_a.html
rename to tests/wpt/mozilla/tests/css/table_colspan_simple_a.html
index 41993cc01f5..0bd5292552c 100644
--- a/tests/ref/table_colspan_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/table_colspan_simple_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='table_colspan_simple_ref.html'>
 <style>
 td[colspan="2"] {
     background-color: blue;
diff --git a/tests/ref/table_colspan_simple_ref.html b/tests/wpt/mozilla/tests/css/table_colspan_simple_ref.html
similarity index 100%
rename from tests/ref/table_colspan_simple_ref.html
rename to tests/wpt/mozilla/tests/css/table_colspan_simple_ref.html
diff --git a/tests/ref/table_containing_block_a.html b/tests/wpt/mozilla/tests/css/table_containing_block_a.html
similarity index 87%
rename from tests/ref/table_containing_block_a.html
rename to tests/wpt/mozilla/tests/css/table_containing_block_a.html
index 980bd945ed6..1118412eccf 100644
--- a/tests/ref/table_containing_block_a.html
+++ b/tests/wpt/mozilla/tests/css/table_containing_block_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+    <link rel='match' href='table_containing_block_ref.html'>
     <head>
         <style type="text/css">
         .rel {
diff --git a/tests/ref/table_containing_block_ref.html b/tests/wpt/mozilla/tests/css/table_containing_block_ref.html
similarity index 100%
rename from tests/ref/table_containing_block_ref.html
rename to tests/wpt/mozilla/tests/css/table_containing_block_ref.html
diff --git a/tests/ref/table_expansion_to_fit_a.html b/tests/wpt/mozilla/tests/css/table_expansion_to_fit_a.html
similarity index 84%
rename from tests/ref/table_expansion_to_fit_a.html
rename to tests/wpt/mozilla/tests/css/table_expansion_to_fit_a.html
index 7b7ff7d38b7..ce130e89652 100644
--- a/tests/ref/table_expansion_to_fit_a.html
+++ b/tests/wpt/mozilla/tests/css/table_expansion_to_fit_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_expansion_to_fit_ref.html'>
 <style>
 * {
     margin: 0;
diff --git a/tests/ref/table_expansion_to_fit_ref.html b/tests/wpt/mozilla/tests/css/table_expansion_to_fit_ref.html
similarity index 100%
rename from tests/ref/table_expansion_to_fit_ref.html
rename to tests/wpt/mozilla/tests/css/table_expansion_to_fit_ref.html
diff --git a/tests/ref/table_float_translation_a.html b/tests/wpt/mozilla/tests/css/table_float_translation_a.html
similarity index 96%
rename from tests/ref/table_float_translation_a.html
rename to tests/wpt/mozilla/tests/css/table_float_translation_a.html
index 52d41296830..41ceefa012d 100644
--- a/tests/ref/table_float_translation_a.html
+++ b/tests/wpt/mozilla/tests/css/table_float_translation_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_float_translation_ref.html'>
 <style>
 #float {
     width: 33%;
diff --git a/tests/ref/table_float_translation_ref.html b/tests/wpt/mozilla/tests/css/table_float_translation_ref.html
similarity index 100%
rename from tests/ref/table_float_translation_ref.html
rename to tests/wpt/mozilla/tests/css/table_float_translation_ref.html
diff --git a/tests/ref/table_intrinsic_style_specified_width_a.html b/tests/wpt/mozilla/tests/css/table_intrinsic_style_specified_width_a.html
similarity index 86%
rename from tests/ref/table_intrinsic_style_specified_width_a.html
rename to tests/wpt/mozilla/tests/css/table_intrinsic_style_specified_width_a.html
index 42b72c63246..0e1a95148af 100644
--- a/tests/ref/table_intrinsic_style_specified_width_a.html
+++ b/tests/wpt/mozilla/tests/css/table_intrinsic_style_specified_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_intrinsic_style_specified_width_ref.html'>
 <style>
 section {
     width: 400px;
diff --git a/tests/ref/table_intrinsic_style_specified_width_ref.html b/tests/wpt/mozilla/tests/css/table_intrinsic_style_specified_width_ref.html
similarity index 100%
rename from tests/ref/table_intrinsic_style_specified_width_ref.html
rename to tests/wpt/mozilla/tests/css/table_intrinsic_style_specified_width_ref.html
diff --git a/tests/ref/table_margin_auto_a.html b/tests/wpt/mozilla/tests/css/table_margin_auto_a.html
similarity index 83%
rename from tests/ref/table_margin_auto_a.html
rename to tests/wpt/mozilla/tests/css/table_margin_auto_a.html
index 3a052e5f861..447e1cacdda 100644
--- a/tests/ref/table_margin_auto_a.html
+++ b/tests/wpt/mozilla/tests/css/table_margin_auto_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_margin_auto_ref.html'>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/ref/table_margin_auto_ref.html b/tests/wpt/mozilla/tests/css/table_margin_auto_ref.html
similarity index 100%
rename from tests/ref/table_margin_auto_ref.html
rename to tests/wpt/mozilla/tests/css/table_margin_auto_ref.html
diff --git a/tests/ref/table_padding_a.html b/tests/wpt/mozilla/tests/css/table_padding_a.html
similarity index 92%
rename from tests/ref/table_padding_a.html
rename to tests/wpt/mozilla/tests/css/table_padding_a.html
index 7fc0f3ec609..6c2feb22058 100644
--- a/tests/ref/table_padding_a.html
+++ b/tests/wpt/mozilla/tests/css/table_padding_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='table_padding_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/table_padding_ref.html b/tests/wpt/mozilla/tests/css/table_padding_ref.html
similarity index 100%
rename from tests/ref/table_padding_ref.html
rename to tests/wpt/mozilla/tests/css/table_padding_ref.html
diff --git a/tests/ref/table_percentage_capping_a.html b/tests/wpt/mozilla/tests/css/table_percentage_capping_a.html
similarity index 83%
rename from tests/ref/table_percentage_capping_a.html
rename to tests/wpt/mozilla/tests/css/table_percentage_capping_a.html
index 820c360e391..fcd92507200 100644
--- a/tests/ref/table_percentage_capping_a.html
+++ b/tests/wpt/mozilla/tests/css/table_percentage_capping_a.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<link rel='match' href='table_percentage_capping_ref.html'>
 <title>Test for capping percentages</title>
 <style>
 div { width:300px; background:yellow; height:50px; }
diff --git a/tests/ref/table_percentage_capping_ref.html b/tests/wpt/mozilla/tests/css/table_percentage_capping_ref.html
similarity index 100%
rename from tests/ref/table_percentage_capping_ref.html
rename to tests/wpt/mozilla/tests/css/table_percentage_capping_ref.html
diff --git a/tests/ref/table_percentage_width_a.html b/tests/wpt/mozilla/tests/css/table_percentage_width_a.html
similarity index 84%
rename from tests/ref/table_percentage_width_a.html
rename to tests/wpt/mozilla/tests/css/table_percentage_width_a.html
index bea62a825f8..c5ed8f64199 100644
--- a/tests/ref/table_percentage_width_a.html
+++ b/tests/wpt/mozilla/tests/css/table_percentage_width_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_percentage_width_ref.html'>
 <style>
 * {
     margin: 0;
diff --git a/tests/ref/table_percentage_width_ref.html b/tests/wpt/mozilla/tests/css/table_percentage_width_ref.html
similarity index 100%
rename from tests/ref/table_percentage_width_ref.html
rename to tests/wpt/mozilla/tests/css/table_percentage_width_ref.html
diff --git a/tests/ref/table_preferred_width_a.html b/tests/wpt/mozilla/tests/css/table_preferred_width_a.html
similarity index 94%
rename from tests/ref/table_preferred_width_a.html
rename to tests/wpt/mozilla/tests/css/table_preferred_width_a.html
index e6815826831..525f6253cfb 100644
--- a/tests/ref/table_preferred_width_a.html
+++ b/tests/wpt/mozilla/tests/css/table_preferred_width_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel='match' href='table_preferred_width_ref.html'>
 <style>
 #a {
     width: 500px;
diff --git a/tests/ref/table_preferred_width_ref.html b/tests/wpt/mozilla/tests/css/table_preferred_width_ref.html
similarity index 100%
rename from tests/ref/table_preferred_width_ref.html
rename to tests/wpt/mozilla/tests/css/table_preferred_width_ref.html
diff --git a/tests/ref/table_row_direction_a.html b/tests/wpt/mozilla/tests/css/table_row_direction_a.html
similarity index 89%
rename from tests/ref/table_row_direction_a.html
rename to tests/wpt/mozilla/tests/css/table_row_direction_a.html
index 6a5264d0d9c..88cd6fa6345 100644
--- a/tests/ref/table_row_direction_a.html
+++ b/tests/wpt/mozilla/tests/css/table_row_direction_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='table_row_direction_ref.html'>
     <meta charset="UTF-8">
     <link rel="stylesheet" type="text/css" href="css/ahem.css">
     <style>
diff --git a/tests/ref/table_row_direction_ref.html b/tests/wpt/mozilla/tests/css/table_row_direction_ref.html
similarity index 100%
rename from tests/ref/table_row_direction_ref.html
rename to tests/wpt/mozilla/tests/css/table_row_direction_ref.html
diff --git a/tests/ref/table_specified_width_a.html b/tests/wpt/mozilla/tests/css/table_specified_width_a.html
similarity index 92%
rename from tests/ref/table_specified_width_a.html
rename to tests/wpt/mozilla/tests/css/table_specified_width_a.html
index aa9912add20..ea0f69ee086 100644
--- a/tests/ref/table_specified_width_a.html
+++ b/tests/wpt/mozilla/tests/css/table_specified_width_a.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <link rel='match' href='table_specified_width_ref.html'>
         <style>
             body {
                 margin: 0;
diff --git a/tests/ref/table_specified_width_ref.html b/tests/wpt/mozilla/tests/css/table_specified_width_ref.html
similarity index 100%
rename from tests/ref/table_specified_width_ref.html
rename to tests/wpt/mozilla/tests/css/table_specified_width_ref.html
diff --git a/tests/ref/table_width_attribute_a.html b/tests/wpt/mozilla/tests/css/table_width_attribute_a.html
similarity index 73%
rename from tests/ref/table_width_attribute_a.html
rename to tests/wpt/mozilla/tests/css/table_width_attribute_a.html
index 463deb178de..59c0ed5fa73 100644
--- a/tests/ref/table_width_attribute_a.html
+++ b/tests/wpt/mozilla/tests/css/table_width_attribute_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='table_width_attribute_ref.html'>
 <style>
 table {
     background: gold;
diff --git a/tests/ref/table_width_attribute_ref.html b/tests/wpt/mozilla/tests/css/table_width_attribute_ref.html
similarity index 100%
rename from tests/ref/table_width_attribute_ref.html
rename to tests/wpt/mozilla/tests/css/table_width_attribute_ref.html
diff --git a/tests/ref/text_align_complex_a.html b/tests/wpt/mozilla/tests/css/text_align_complex_a.html
similarity index 91%
rename from tests/ref/text_align_complex_a.html
rename to tests/wpt/mozilla/tests/css/text_align_complex_a.html
index 3a80d4e8c60..5fe118020db 100644
--- a/tests/ref/text_align_complex_a.html
+++ b/tests/wpt/mozilla/tests/css/text_align_complex_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_align_complex_ref.html'>
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
 <style>
 
diff --git a/tests/ref/text_align_complex_ref.html b/tests/wpt/mozilla/tests/css/text_align_complex_ref.html
similarity index 100%
rename from tests/ref/text_align_complex_ref.html
rename to tests/wpt/mozilla/tests/css/text_align_complex_ref.html
diff --git a/tests/ref/text_align_justify_a.html b/tests/wpt/mozilla/tests/css/text_align_justify_a.html
similarity index 85%
rename from tests/ref/text_align_justify_a.html
rename to tests/wpt/mozilla/tests/css/text_align_justify_a.html
index da1afc2f595..b1384247a74 100644
--- a/tests/ref/text_align_justify_a.html
+++ b/tests/wpt/mozilla/tests/css/text_align_justify_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel='match' href='text_align_justify_ref.html'>
 <style>
 p {
     text-align: justify;
diff --git a/tests/ref/text_align_justify_ref.html b/tests/wpt/mozilla/tests/css/text_align_justify_ref.html
similarity index 100%
rename from tests/ref/text_align_justify_ref.html
rename to tests/wpt/mozilla/tests/css/text_align_justify_ref.html
diff --git a/tests/ref/text_align_rtl.html b/tests/wpt/mozilla/tests/css/text_align_rtl.html
similarity index 90%
rename from tests/ref/text_align_rtl.html
rename to tests/wpt/mozilla/tests/css/text_align_rtl.html
index 050b900fbce..1ec5be242e9 100644
--- a/tests/ref/text_align_rtl.html
+++ b/tests/wpt/mozilla/tests/css/text_align_rtl.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='text_align_rtl_ref.html'>
     <meta charset="UTF-8">
     <link rel="stylesheet" type="text/css" href="css/ahem.css">
     <style>
diff --git a/tests/ref/text_align_rtl_ref.html b/tests/wpt/mozilla/tests/css/text_align_rtl_ref.html
similarity index 100%
rename from tests/ref/text_align_rtl_ref.html
rename to tests/wpt/mozilla/tests/css/text_align_rtl_ref.html
diff --git a/tests/ref/text_align_start_end.html b/tests/wpt/mozilla/tests/css/text_align_start_end.html
similarity index 89%
rename from tests/ref/text_align_start_end.html
rename to tests/wpt/mozilla/tests/css/text_align_start_end.html
index 7c63d14e290..25b156ea004 100644
--- a/tests/ref/text_align_start_end.html
+++ b/tests/wpt/mozilla/tests/css/text_align_start_end.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='text_align_start_end_ref.html'>
     <meta charset="UTF-8">
     <link rel="stylesheet" type="text/css" href="css/ahem.css">
     <style>
diff --git a/tests/ref/text_align_start_end_ref.html b/tests/wpt/mozilla/tests/css/text_align_start_end_ref.html
similarity index 100%
rename from tests/ref/text_align_start_end_ref.html
rename to tests/wpt/mozilla/tests/css/text_align_start_end_ref.html
diff --git a/tests/ref/text_decoration_cached.html b/tests/wpt/mozilla/tests/css/text_decoration_cached.html
similarity index 78%
rename from tests/ref/text_decoration_cached.html
rename to tests/wpt/mozilla/tests/css/text_decoration_cached.html
index effd1359fe0..10557883e6a 100644
--- a/tests/ref/text_decoration_cached.html
+++ b/tests/wpt/mozilla/tests/css/text_decoration_cached.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='text_decoration_cached_ref.html'>
     <meta charset="UTF-8">
     <title>text-decoration cache test</title>
     <style>
diff --git a/tests/ref/text_decoration_cached_ref.html b/tests/wpt/mozilla/tests/css/text_decoration_cached_ref.html
similarity index 100%
rename from tests/ref/text_decoration_cached_ref.html
rename to tests/wpt/mozilla/tests/css/text_decoration_cached_ref.html
diff --git a/tests/ref/text_indent_a.html b/tests/wpt/mozilla/tests/css/text_indent_a.html
similarity index 93%
rename from tests/ref/text_indent_a.html
rename to tests/wpt/mozilla/tests/css/text_indent_a.html
index 9f99909b90e..3f3f925f459 100644
--- a/tests/ref/text_indent_a.html
+++ b/tests/wpt/mozilla/tests/css/text_indent_a.html
@@ -2,6 +2,7 @@
 <html>
 <!-- Tests that `text-indent` works, in particular when combined with `text-align`. -->
 <head>
+<link rel='match' href='text_indent_ref.html'>
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
 <style>
 section {
diff --git a/tests/ref/text_indent_ref.html b/tests/wpt/mozilla/tests/css/text_indent_ref.html
similarity index 100%
rename from tests/ref/text_indent_ref.html
rename to tests/wpt/mozilla/tests/css/text_indent_ref.html
diff --git a/tests/ref/text_justify_none_a.html b/tests/wpt/mozilla/tests/css/text_justify_none_a.html
similarity index 89%
rename from tests/ref/text_justify_none_a.html
rename to tests/wpt/mozilla/tests/css/text_justify_none_a.html
index b46cc654212..925a13e6e15 100644
--- a/tests/ref/text_justify_none_a.html
+++ b/tests/wpt/mozilla/tests/css/text_justify_none_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_justify_none_ref.html'>
 <!-- Tests that `text-justify: none` disables justification. -->
 <style>
 p {
diff --git a/tests/ref/text_justify_none_ref.html b/tests/wpt/mozilla/tests/css/text_justify_none_ref.html
similarity index 100%
rename from tests/ref/text_justify_none_ref.html
rename to tests/wpt/mozilla/tests/css/text_justify_none_ref.html
diff --git a/tests/ref/text_overflow_basic_a.html b/tests/wpt/mozilla/tests/css/text_overflow_basic_a.html
similarity index 80%
rename from tests/ref/text_overflow_basic_a.html
rename to tests/wpt/mozilla/tests/css/text_overflow_basic_a.html
index e8da344f467..7fa2222ece2 100644
--- a/tests/ref/text_overflow_basic_a.html
+++ b/tests/wpt/mozilla/tests/css/text_overflow_basic_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_overflow_basic_ref.html'>
 <style>
 section {
     border: solid black 1px;
diff --git a/tests/ref/text_overflow_basic_ref.html b/tests/wpt/mozilla/tests/css/text_overflow_basic_ref.html
similarity index 100%
rename from tests/ref/text_overflow_basic_ref.html
rename to tests/wpt/mozilla/tests/css/text_overflow_basic_ref.html
diff --git a/tests/ref/text_shadow_blur_a.html b/tests/wpt/mozilla/tests/css/text_shadow_blur_a.html
similarity index 85%
rename from tests/ref/text_shadow_blur_a.html
rename to tests/wpt/mozilla/tests/css/text_shadow_blur_a.html
index 5846bf0a221..a87f3584d1b 100644
--- a/tests/ref/text_shadow_blur_a.html
+++ b/tests/wpt/mozilla/tests/css/text_shadow_blur_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_shadow_blur_ref.html'>
 <!-- Tests that `text-shadow` mirrors `box-shadow` in the way that it blurs. -->
 <link rel="stylesheet" type="text/css" href="css/ahem.css">
 <style>
diff --git a/tests/ref/text_shadow_blur_ref.html b/tests/wpt/mozilla/tests/css/text_shadow_blur_ref.html
similarity index 100%
rename from tests/ref/text_shadow_blur_ref.html
rename to tests/wpt/mozilla/tests/css/text_shadow_blur_ref.html
diff --git a/tests/ref/text_shadow_decorations_a.html b/tests/wpt/mozilla/tests/css/text_shadow_decorations_a.html
similarity index 84%
rename from tests/ref/text_shadow_decorations_a.html
rename to tests/wpt/mozilla/tests/css/text_shadow_decorations_a.html
index e61b2d4725f..3df81eb610a 100644
--- a/tests/ref/text_shadow_decorations_a.html
+++ b/tests/wpt/mozilla/tests/css/text_shadow_decorations_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_shadow_decorations_ref.html'>
 <!-- Tests that `text-shadow` shadows decorations. -->
 <style>
 #a {
diff --git a/tests/ref/text_shadow_decorations_ref.html b/tests/wpt/mozilla/tests/css/text_shadow_decorations_ref.html
similarity index 100%
rename from tests/ref/text_shadow_decorations_ref.html
rename to tests/wpt/mozilla/tests/css/text_shadow_decorations_ref.html
diff --git a/tests/ref/text_shadow_multiple_shadows_a.html b/tests/wpt/mozilla/tests/css/text_shadow_multiple_shadows_a.html
similarity index 84%
rename from tests/ref/text_shadow_multiple_shadows_a.html
rename to tests/wpt/mozilla/tests/css/text_shadow_multiple_shadows_a.html
index 40b1dfbe799..95855a7d24c 100644
--- a/tests/ref/text_shadow_multiple_shadows_a.html
+++ b/tests/wpt/mozilla/tests/css/text_shadow_multiple_shadows_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_shadow_multiple_shadows_ref.html'>
 <!-- Tests that multiple `text-shadow`s paint in the right order. -->
 <style>
 #a {
diff --git a/tests/ref/text_shadow_multiple_shadows_ref.html b/tests/wpt/mozilla/tests/css/text_shadow_multiple_shadows_ref.html
similarity index 100%
rename from tests/ref/text_shadow_multiple_shadows_ref.html
rename to tests/wpt/mozilla/tests/css/text_shadow_multiple_shadows_ref.html
diff --git a/tests/ref/text_shadow_simple_a.html b/tests/wpt/mozilla/tests/css/text_shadow_simple_a.html
similarity index 89%
rename from tests/ref/text_shadow_simple_a.html
rename to tests/wpt/mozilla/tests/css/text_shadow_simple_a.html
index 5e177238bda..af43aa60435 100644
--- a/tests/ref/text_shadow_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/text_shadow_simple_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='text_shadow_simple_ref.html'>
 <!--
      Tests that `text-shadow` works with multiple unblurred shadows in the right order with the
      right offsets.
diff --git a/tests/ref/text_shadow_simple_ref.html b/tests/wpt/mozilla/tests/css/text_shadow_simple_ref.html
similarity index 100%
rename from tests/ref/text_shadow_simple_ref.html
rename to tests/wpt/mozilla/tests/css/text_shadow_simple_ref.html
diff --git a/tests/ref/text_transform_capitalize_a.html b/tests/wpt/mozilla/tests/css/text_transform_capitalize_a.html
similarity index 80%
rename from tests/ref/text_transform_capitalize_a.html
rename to tests/wpt/mozilla/tests/css/text_transform_capitalize_a.html
index 4e040ef9370..6a77ff56d76 100644
--- a/tests/ref/text_transform_capitalize_a.html
+++ b/tests/wpt/mozilla/tests/css/text_transform_capitalize_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='text_transform_capitalize_ref.html'>
 <meta charset="UTF-8">
 <!-- Tests that `text-transform: capitalize` works. -->
 <body>
diff --git a/tests/ref/text_transform_capitalize_ref.html b/tests/wpt/mozilla/tests/css/text_transform_capitalize_ref.html
similarity index 100%
rename from tests/ref/text_transform_capitalize_ref.html
rename to tests/wpt/mozilla/tests/css/text_transform_capitalize_ref.html
diff --git a/tests/ref/text_transform_lowercase_a.html b/tests/wpt/mozilla/tests/css/text_transform_lowercase_a.html
similarity index 78%
rename from tests/ref/text_transform_lowercase_a.html
rename to tests/wpt/mozilla/tests/css/text_transform_lowercase_a.html
index 3e32a24dc6e..6971c40c411 100644
--- a/tests/ref/text_transform_lowercase_a.html
+++ b/tests/wpt/mozilla/tests/css/text_transform_lowercase_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='text_transform_lowercase_ref.html'>
 <!-- Tests that `text-transform: lowercase` works. -->
 <body>
 <h1 style='text-transform: lowercase; font-family: Hiragino Maru Gothic Pro'>YoU CaN dO ÁnYtHiNg At ゾムボ.cOm</h1>
diff --git a/tests/ref/text_transform_lowercase_ref.html b/tests/wpt/mozilla/tests/css/text_transform_lowercase_ref.html
similarity index 100%
rename from tests/ref/text_transform_lowercase_ref.html
rename to tests/wpt/mozilla/tests/css/text_transform_lowercase_ref.html
diff --git a/tests/ref/text_transform_none_a.html b/tests/wpt/mozilla/tests/css/text_transform_none_a.html
similarity index 79%
rename from tests/ref/text_transform_none_a.html
rename to tests/wpt/mozilla/tests/css/text_transform_none_a.html
index 80ec1a26e93..59f77f2f13c 100644
--- a/tests/ref/text_transform_none_a.html
+++ b/tests/wpt/mozilla/tests/css/text_transform_none_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='text_transform_none_ref.html'>
 <!-- Tests that `text-transform: none` works. -->
 <body>
 <h1 style='text-transform: none; font-family: Hiragino Maru Gothic Pro'>You can do anything at ゾムボ.com</h1>
diff --git a/tests/ref/text_transform_none_ref.html b/tests/wpt/mozilla/tests/css/text_transform_none_ref.html
similarity index 100%
rename from tests/ref/text_transform_none_ref.html
rename to tests/wpt/mozilla/tests/css/text_transform_none_ref.html
diff --git a/tests/ref/text_transform_uppercase_a.html b/tests/wpt/mozilla/tests/css/text_transform_uppercase_a.html
similarity index 78%
rename from tests/ref/text_transform_uppercase_a.html
rename to tests/wpt/mozilla/tests/css/text_transform_uppercase_a.html
index e70ba05cd6c..fe96b8ad645 100644
--- a/tests/ref/text_transform_uppercase_a.html
+++ b/tests/wpt/mozilla/tests/css/text_transform_uppercase_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel='match' href='text_transform_uppercase_ref.html'>
 <!-- Tests that `text-transform: uppercase` works. -->
 <body>
 <h1 style='text-transform: uppercase; font-family: Hiragino Maru Gothic Pro'>You çan do anything at ゾムボ.com</h1>
diff --git a/tests/ref/text_transform_uppercase_ref.html b/tests/wpt/mozilla/tests/css/text_transform_uppercase_ref.html
similarity index 100%
rename from tests/ref/text_transform_uppercase_ref.html
rename to tests/wpt/mozilla/tests/css/text_transform_uppercase_ref.html
diff --git a/tests/ref/transform_3d.html b/tests/wpt/mozilla/tests/css/transform_3d.html
similarity index 98%
rename from tests/ref/transform_3d.html
rename to tests/wpt/mozilla/tests/css/transform_3d.html
index 2d2880c7d4d..ec4e26eef16 100644
--- a/tests/ref/transform_3d.html
+++ b/tests/wpt/mozilla/tests/css/transform_3d.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='transform_3d_ref.html'>
         <style type="text/css">
             #div_t3d_1 {
                 position: absolute;
diff --git a/tests/ref/transform_3d_ref.html b/tests/wpt/mozilla/tests/css/transform_3d_ref.html
similarity index 100%
rename from tests/ref/transform_3d_ref.html
rename to tests/wpt/mozilla/tests/css/transform_3d_ref.html