diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 3c909f95a18..62500b43965 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -344,31 +344,13 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_
 == 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
-== transform_optimization.html transform_optimization_ref.html
-== transform_simple_a.html transform_simple_ref.html
-== transform_skew_a.html transform_skew_ref.html
-== transform_stacking_context_a.html transform_stacking_context_ref.html
-== transition_calc.html transition_calc_ref.html
-== upper_id_attr.html upper_id_attr_ref.html
 flaky_cpu,prefs:"layout.writing-mode.enabled" == vertical-lr-blocks.html vertical-lr-blocks_ref.html
-== vertical_align_bottom_a.html vertical_align_bottom_ref.html
-== vertical_align_inline_block_a.html vertical_align_inline_block_ref.html
-== vertical_align_inside_table_a.html vertical_align_inside_table_ref.html
-== vertical_align_sub_a.html vertical_align_sub_ref.html
-== vertical_align_super_a.html vertical_align_super_ref.html
-== vertical_align_super_nested_a.html vertical_align_super_nested_ref.html
-== vertical_align_text_bottom_a.html vertical_align_text_bottom_ref.html
-== vertical_align_text_top_a.html vertical_align_text_top_ref.html
-== vertical_align_top_a.html vertical_align_top_ref.html
-== vertical_align_top_bottom_a.html vertical_align_top_bottom_ref.html
-== vertical_align_top_span_a.html vertical_align_top_span_ref.html
 == viewport_meta.html viewport_rule_ref.html
 resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html
 # resolution=600x800 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_b.html
 resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.html
 # resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html
 prefs:"layout.viewport.enabled" == viewport_rule.html viewport_rule_ref.html
-== visibility_hidden.html visibility_hidden_ref.html
 
 # https://github.com/servo/servo/issues/7931
 # == webgl-context/clearcolor.html webgl-context/clearcolor_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 23743b433e9..f64a9c710ed 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -603,6 +603,222 @@
             "url": "/_mozilla/css/stacking_context_rtl.html"
           }
         ],
+        "css/transform_optimization.html": [
+          {
+            "path": "css/transform_optimization.html",
+            "references": [
+              [
+                "/_mozilla/css/transform_optimization_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transform_optimization.html"
+          }
+        ],
+        "css/transform_simple_a.html": [
+          {
+            "path": "css/transform_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/transform_simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transform_simple_a.html"
+          }
+        ],
+        "css/transform_skew_a.html": [
+          {
+            "path": "css/transform_skew_a.html",
+            "references": [
+              [
+                "/_mozilla/css/transform_skew_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transform_skew_a.html"
+          }
+        ],
+        "css/transform_stacking_context_a.html": [
+          {
+            "path": "css/transform_stacking_context_a.html",
+            "references": [
+              [
+                "/_mozilla/css/transform_stacking_context_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transform_stacking_context_a.html"
+          }
+        ],
+        "css/transition_calc.html": [
+          {
+            "path": "css/transition_calc.html",
+            "references": [
+              [
+                "/_mozilla/css/transition_calc_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/transition_calc.html"
+          }
+        ],
+        "css/upper_id_attr.html": [
+          {
+            "path": "css/upper_id_attr.html",
+            "references": [
+              [
+                "/_mozilla/css/upper_id_attr_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/upper_id_attr.html"
+          }
+        ],
+        "css/vertical_align_bottom_a.html": [
+          {
+            "path": "css/vertical_align_bottom_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_bottom_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_bottom_a.html"
+          }
+        ],
+        "css/vertical_align_inline_block_a.html": [
+          {
+            "path": "css/vertical_align_inline_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_inline_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_inline_block_a.html"
+          }
+        ],
+        "css/vertical_align_inside_table_a.html": [
+          {
+            "path": "css/vertical_align_inside_table_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_inside_table_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_inside_table_a.html"
+          }
+        ],
+        "css/vertical_align_sub_a.html": [
+          {
+            "path": "css/vertical_align_sub_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_sub_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_sub_a.html"
+          }
+        ],
+        "css/vertical_align_super_a.html": [
+          {
+            "path": "css/vertical_align_super_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_super_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_super_a.html"
+          }
+        ],
+        "css/vertical_align_super_nested_a.html": [
+          {
+            "path": "css/vertical_align_super_nested_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_super_nested_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_super_nested_a.html"
+          }
+        ],
+        "css/vertical_align_text_bottom_a.html": [
+          {
+            "path": "css/vertical_align_text_bottom_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_text_bottom_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_text_bottom_a.html"
+          }
+        ],
+        "css/vertical_align_text_top_a.html": [
+          {
+            "path": "css/vertical_align_text_top_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_text_top_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_text_top_a.html"
+          }
+        ],
+        "css/vertical_align_top_a.html": [
+          {
+            "path": "css/vertical_align_top_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_top_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_top_a.html"
+          }
+        ],
+        "css/vertical_align_top_bottom_a.html": [
+          {
+            "path": "css/vertical_align_top_bottom_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_top_bottom_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_top_bottom_a.html"
+          }
+        ],
+        "css/vertical_align_top_span_a.html": [
+          {
+            "path": "css/vertical_align_top_span_a.html",
+            "references": [
+              [
+                "/_mozilla/css/vertical_align_top_span_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/vertical_align_top_span_a.html"
+          }
+        ],
+        "css/visibility_hidden.html": [
+          {
+            "path": "css/visibility_hidden.html",
+            "references": [
+              [
+                "/_mozilla/css/visibility_hidden_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/visibility_hidden.html"
+          }
+        ],
         "css/word-spacing.html": [
           {
             "path": "css/word-spacing.html",
@@ -1940,6 +2156,222 @@
           "url": "/_mozilla/css/stacking_context_rtl.html"
         }
       ],
+      "css/transform_optimization.html": [
+        {
+          "path": "css/transform_optimization.html",
+          "references": [
+            [
+              "/_mozilla/css/transform_optimization_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transform_optimization.html"
+        }
+      ],
+      "css/transform_simple_a.html": [
+        {
+          "path": "css/transform_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/transform_simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transform_simple_a.html"
+        }
+      ],
+      "css/transform_skew_a.html": [
+        {
+          "path": "css/transform_skew_a.html",
+          "references": [
+            [
+              "/_mozilla/css/transform_skew_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transform_skew_a.html"
+        }
+      ],
+      "css/transform_stacking_context_a.html": [
+        {
+          "path": "css/transform_stacking_context_a.html",
+          "references": [
+            [
+              "/_mozilla/css/transform_stacking_context_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transform_stacking_context_a.html"
+        }
+      ],
+      "css/transition_calc.html": [
+        {
+          "path": "css/transition_calc.html",
+          "references": [
+            [
+              "/_mozilla/css/transition_calc_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/transition_calc.html"
+        }
+      ],
+      "css/upper_id_attr.html": [
+        {
+          "path": "css/upper_id_attr.html",
+          "references": [
+            [
+              "/_mozilla/css/upper_id_attr_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/upper_id_attr.html"
+        }
+      ],
+      "css/vertical_align_bottom_a.html": [
+        {
+          "path": "css/vertical_align_bottom_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_bottom_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_bottom_a.html"
+        }
+      ],
+      "css/vertical_align_inline_block_a.html": [
+        {
+          "path": "css/vertical_align_inline_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_inline_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_inline_block_a.html"
+        }
+      ],
+      "css/vertical_align_inside_table_a.html": [
+        {
+          "path": "css/vertical_align_inside_table_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_inside_table_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_inside_table_a.html"
+        }
+      ],
+      "css/vertical_align_sub_a.html": [
+        {
+          "path": "css/vertical_align_sub_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_sub_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_sub_a.html"
+        }
+      ],
+      "css/vertical_align_super_a.html": [
+        {
+          "path": "css/vertical_align_super_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_super_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_super_a.html"
+        }
+      ],
+      "css/vertical_align_super_nested_a.html": [
+        {
+          "path": "css/vertical_align_super_nested_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_super_nested_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_super_nested_a.html"
+        }
+      ],
+      "css/vertical_align_text_bottom_a.html": [
+        {
+          "path": "css/vertical_align_text_bottom_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_text_bottom_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_text_bottom_a.html"
+        }
+      ],
+      "css/vertical_align_text_top_a.html": [
+        {
+          "path": "css/vertical_align_text_top_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_text_top_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_text_top_a.html"
+        }
+      ],
+      "css/vertical_align_top_a.html": [
+        {
+          "path": "css/vertical_align_top_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_top_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_top_a.html"
+        }
+      ],
+      "css/vertical_align_top_bottom_a.html": [
+        {
+          "path": "css/vertical_align_top_bottom_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_top_bottom_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_top_bottom_a.html"
+        }
+      ],
+      "css/vertical_align_top_span_a.html": [
+        {
+          "path": "css/vertical_align_top_span_a.html",
+          "references": [
+            [
+              "/_mozilla/css/vertical_align_top_span_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/vertical_align_top_span_a.html"
+        }
+      ],
+      "css/visibility_hidden.html": [
+        {
+          "path": "css/visibility_hidden.html",
+          "references": [
+            [
+              "/_mozilla/css/visibility_hidden_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/visibility_hidden.html"
+        }
+      ],
       "css/word-spacing.html": [
         {
           "path": "css/word-spacing.html",
diff --git a/tests/ref/transform_optimization.html b/tests/wpt/mozilla/tests/css/transform_optimization.html
similarity index 88%
rename from tests/ref/transform_optimization.html
rename to tests/wpt/mozilla/tests/css/transform_optimization.html
index db2c1ad4181..9811511e1f8 100644
--- a/tests/ref/transform_optimization.html
+++ b/tests/wpt/mozilla/tests/css/transform_optimization.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
+		<link rel='match' href='transform_optimization_ref.html'>
 		<style type="text/css">
 			body {
 				margin: 0;
diff --git a/tests/ref/transform_optimization_ref.html b/tests/wpt/mozilla/tests/css/transform_optimization_ref.html
similarity index 100%
rename from tests/ref/transform_optimization_ref.html
rename to tests/wpt/mozilla/tests/css/transform_optimization_ref.html
diff --git a/tests/ref/transform_simple_a.html b/tests/wpt/mozilla/tests/css/transform_simple_a.html
similarity index 92%
rename from tests/ref/transform_simple_a.html
rename to tests/wpt/mozilla/tests/css/transform_simple_a.html
index f5753001c5a..8af4ced9f79 100644
--- a/tests/ref/transform_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/transform_simple_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='transform_simple_ref.html'>
 <!-- Tests that basic CSS transforms work. -->
 <style>
 section {
diff --git a/tests/ref/transform_simple_ref.html b/tests/wpt/mozilla/tests/css/transform_simple_ref.html
similarity index 100%
rename from tests/ref/transform_simple_ref.html
rename to tests/wpt/mozilla/tests/css/transform_simple_ref.html
diff --git a/tests/ref/transform_skew_a.html b/tests/wpt/mozilla/tests/css/transform_skew_a.html
similarity index 92%
rename from tests/ref/transform_skew_a.html
rename to tests/wpt/mozilla/tests/css/transform_skew_a.html
index 72ca4790880..5b2dde5d3d0 100644
--- a/tests/ref/transform_skew_a.html
+++ b/tests/wpt/mozilla/tests/css/transform_skew_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='transform_skew_ref.html'>
 <style>
 div {
     height: 150px;
diff --git a/tests/ref/transform_skew_ref.html b/tests/wpt/mozilla/tests/css/transform_skew_ref.html
similarity index 100%
rename from tests/ref/transform_skew_ref.html
rename to tests/wpt/mozilla/tests/css/transform_skew_ref.html
diff --git a/tests/ref/transform_stacking_context_a.html b/tests/wpt/mozilla/tests/css/transform_stacking_context_a.html
similarity index 91%
rename from tests/ref/transform_stacking_context_a.html
rename to tests/wpt/mozilla/tests/css/transform_stacking_context_a.html
index d966f9676f3..15dcf3e8326 100644
--- a/tests/ref/transform_stacking_context_a.html
+++ b/tests/wpt/mozilla/tests/css/transform_stacking_context_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='transform_stacking_context_ref.html'>
 <!-- Tests that `transform` causes a new stacking context to be formed. -->
 <style>
 body {
diff --git a/tests/ref/transform_stacking_context_ref.html b/tests/wpt/mozilla/tests/css/transform_stacking_context_ref.html
similarity index 100%
rename from tests/ref/transform_stacking_context_ref.html
rename to tests/wpt/mozilla/tests/css/transform_stacking_context_ref.html
diff --git a/tests/ref/transition_calc.html b/tests/wpt/mozilla/tests/css/transition_calc.html
similarity index 90%
rename from tests/ref/transition_calc.html
rename to tests/wpt/mozilla/tests/css/transition_calc.html
index 2497ddeed0c..8b7650450f6 100644
--- a/tests/ref/transition_calc.html
+++ b/tests/wpt/mozilla/tests/css/transition_calc.html
@@ -1,3 +1,4 @@
+<link rel='match' href='transition_calc_ref.html'>
 <style>
 .outer {
     width: 100px;
diff --git a/tests/ref/transition_calc_ref.html b/tests/wpt/mozilla/tests/css/transition_calc_ref.html
similarity index 100%
rename from tests/ref/transition_calc_ref.html
rename to tests/wpt/mozilla/tests/css/transition_calc_ref.html
diff --git a/tests/ref/upper_id_attr.html b/tests/wpt/mozilla/tests/css/upper_id_attr.html
similarity index 79%
rename from tests/ref/upper_id_attr.html
rename to tests/wpt/mozilla/tests/css/upper_id_attr.html
index 0f6c20f6391..58052e02259 100644
--- a/tests/ref/upper_id_attr.html
+++ b/tests/wpt/mozilla/tests/css/upper_id_attr.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<link rel='match' href='upper_id_attr_ref.html'>
 <style>
 div { height: 2em; background: green; }
 #id { background: red; }
diff --git a/tests/ref/upper_id_attr_ref.html b/tests/wpt/mozilla/tests/css/upper_id_attr_ref.html
similarity index 100%
rename from tests/ref/upper_id_attr_ref.html
rename to tests/wpt/mozilla/tests/css/upper_id_attr_ref.html
diff --git a/tests/ref/vertical_align_bottom_a.html b/tests/wpt/mozilla/tests/css/vertical_align_bottom_a.html
similarity index 91%
rename from tests/ref/vertical_align_bottom_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_bottom_a.html
index e09d9397658..c0ffdac8f2b 100644
--- a/tests/ref/vertical_align_bottom_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_bottom_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='vertical_align_bottom_ref.html'>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
             body {
diff --git a/tests/ref/vertical_align_bottom_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_bottom_ref.html
similarity index 100%
rename from tests/ref/vertical_align_bottom_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_bottom_ref.html
diff --git a/tests/ref/vertical_align_inline_block_a.html b/tests/wpt/mozilla/tests/css/vertical_align_inline_block_a.html
similarity index 85%
rename from tests/ref/vertical_align_inline_block_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_inline_block_a.html
index 64927f65bfc..4d44d94f90a 100644
--- a/tests/ref/vertical_align_inline_block_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_inline_block_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='vertical_align_inline_block_ref.html'>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/vertical_align_inline_block_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_inline_block_ref.html
similarity index 100%
rename from tests/ref/vertical_align_inline_block_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_inline_block_ref.html
diff --git a/tests/ref/vertical_align_inside_table_a.html b/tests/wpt/mozilla/tests/css/vertical_align_inside_table_a.html
similarity index 82%
rename from tests/ref/vertical_align_inside_table_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_inside_table_a.html
index 03408aad19a..f459cea8a47 100644
--- a/tests/ref/vertical_align_inside_table_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_inside_table_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='vertical_align_inside_table_ref.html'>
 <!--
     Tests that layout doesn't treat `vertical-align` on table cells as though it were
     `vertical-align` on inlines.
diff --git a/tests/ref/vertical_align_inside_table_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_inside_table_ref.html
similarity index 100%
rename from tests/ref/vertical_align_inside_table_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_inside_table_ref.html
diff --git a/tests/ref/vertical_align_sub_a.html b/tests/wpt/mozilla/tests/css/vertical_align_sub_a.html
similarity index 90%
rename from tests/ref/vertical_align_sub_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_sub_a.html
index 73e6844ed71..de55595f733 100644
--- a/tests/ref/vertical_align_sub_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_sub_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='vertical_align_sub_ref.html'>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
             body {
diff --git a/tests/ref/vertical_align_sub_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_sub_ref.html
similarity index 100%
rename from tests/ref/vertical_align_sub_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_sub_ref.html
diff --git a/tests/ref/vertical_align_super_a.html b/tests/wpt/mozilla/tests/css/vertical_align_super_a.html
similarity index 90%
rename from tests/ref/vertical_align_super_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_super_a.html
index e64fed1aefe..c1780235b83 100644
--- a/tests/ref/vertical_align_super_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_super_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel='match' href='vertical_align_super_ref.html'>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
             body {
diff --git a/tests/ref/vertical_align_super_nested_a.html b/tests/wpt/mozilla/tests/css/vertical_align_super_nested_a.html
similarity index 80%
rename from tests/ref/vertical_align_super_nested_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_super_nested_a.html
index 494a3940d1b..440eef56746 100644
--- a/tests/ref/vertical_align_super_nested_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_super_nested_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel='match' href='vertical_align_super_nested_ref.html'>
 <!-- Tests that `vertical-align: baseline` inside `vertical-align: super` is laid out properly. -->
 <style>
 span {
diff --git a/tests/ref/vertical_align_super_nested_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_super_nested_ref.html
similarity index 100%
rename from tests/ref/vertical_align_super_nested_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_super_nested_ref.html
diff --git a/tests/ref/vertical_align_super_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_super_ref.html
similarity index 100%
rename from tests/ref/vertical_align_super_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_super_ref.html
diff --git a/tests/ref/vertical_align_text_bottom_a.html b/tests/wpt/mozilla/tests/css/vertical_align_text_bottom_a.html
similarity index 90%
rename from tests/ref/vertical_align_text_bottom_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_text_bottom_a.html
index 2e9547742bf..ad06fc711c2 100644
--- a/tests/ref/vertical_align_text_bottom_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_text_bottom_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+    <link rel='match' href='vertical_align_text_bottom_ref.html'>
     <head>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
         <style type="text/css">
diff --git a/tests/ref/vertical_align_text_bottom_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_text_bottom_ref.html
similarity index 100%
rename from tests/ref/vertical_align_text_bottom_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_text_bottom_ref.html
diff --git a/tests/ref/vertical_align_text_top_a.html b/tests/wpt/mozilla/tests/css/vertical_align_text_top_a.html
similarity index 90%
rename from tests/ref/vertical_align_text_top_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_text_top_a.html
index 39439e27f35..e45c30c04be 100644
--- a/tests/ref/vertical_align_text_top_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_text_top_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
+        <link rel='match' href='vertical_align_text_top_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/vertical_align_text_top_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_text_top_ref.html
similarity index 100%
rename from tests/ref/vertical_align_text_top_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_text_top_ref.html
diff --git a/tests/ref/vertical_align_top_a.html b/tests/wpt/mozilla/tests/css/vertical_align_top_a.html
similarity index 91%
rename from tests/ref/vertical_align_top_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_a.html
index 82fba004963..7197e407eb9 100644
--- a/tests/ref/vertical_align_top_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_top_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
+        <link rel='match' href='vertical_align_top_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/vertical_align_top_bottom_a.html b/tests/wpt/mozilla/tests/css/vertical_align_top_bottom_a.html
similarity index 92%
rename from tests/ref/vertical_align_top_bottom_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_bottom_a.html
index 03b8dd5b7b2..de5e108809f 100644
--- a/tests/ref/vertical_align_top_bottom_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_top_bottom_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
+        <link rel='match' href='vertical_align_top_bottom_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/vertical_align_top_bottom_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_top_bottom_ref.html
similarity index 100%
rename from tests/ref/vertical_align_top_bottom_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_bottom_ref.html
diff --git a/tests/ref/vertical_align_top_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_top_ref.html
similarity index 100%
rename from tests/ref/vertical_align_top_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_ref.html
diff --git a/tests/ref/vertical_align_top_span_a.html b/tests/wpt/mozilla/tests/css/vertical_align_top_span_a.html
similarity index 91%
rename from tests/ref/vertical_align_top_span_a.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_span_a.html
index d451124e1cb..e7d384d80e6 100644
--- a/tests/ref/vertical_align_top_span_a.html
+++ b/tests/wpt/mozilla/tests/css/vertical_align_top_span_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel="stylesheet" type="text/css" href="css/ahem.css">
+        <link rel='match' href='vertical_align_top_span_ref.html'>
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/ref/vertical_align_top_span_ref.html b/tests/wpt/mozilla/tests/css/vertical_align_top_span_ref.html
similarity index 100%
rename from tests/ref/vertical_align_top_span_ref.html
rename to tests/wpt/mozilla/tests/css/vertical_align_top_span_ref.html
diff --git a/tests/ref/visibility_hidden.html b/tests/wpt/mozilla/tests/css/visibility_hidden.html
similarity index 88%
rename from tests/ref/visibility_hidden.html
rename to tests/wpt/mozilla/tests/css/visibility_hidden.html
index 2b8e468a8a3..95dbf18a0ea 100644
--- a/tests/ref/visibility_hidden.html
+++ b/tests/wpt/mozilla/tests/css/visibility_hidden.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='match' href='visibility_hidden_ref.html'>
     <title>'visibility: hidden' test</title>
     <style type="text/css">
       body { color: black; background: white }
diff --git a/tests/ref/visibility_hidden_ref.html b/tests/wpt/mozilla/tests/css/visibility_hidden_ref.html
similarity index 100%
rename from tests/ref/visibility_hidden_ref.html
rename to tests/wpt/mozilla/tests/css/visibility_hidden_ref.html