diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 98488fd5239..6ee202f98a0 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -9,19 +9,9 @@
 # Should be == with expected failure:
 fragment=top != ../html/acid2.html acid2_ref.html
 
-== abs_rel_explicit_height.html abs_rel_explicit_height_ref.html
-== absolute_hypothetical_with_intervening_inline_block_a.html absolute_hypothetical_with_intervening_inline_block_ref.html
-== absolute_inline_containing_block_a.html absolute_inline_containing_block_ref.html
-== absolute_table.html absolute_table_ref.html
-== absolute_z_index_auto_paint_order_a.html absolute_z_index_auto_paint_order_ref.html
 == acid1_a.html acid1_b.html
 == acid2_noscroll.html acid2_ref_broken.html
-== after_block_iteration.html after_block_iteration_ref.html
-== alpha_gif_a.html alpha_gif_b.html
-== alpha_png_a.html alpha_png_b.html
-== anon_block_inherit_a.html anon_block_inherit_b.html
 flaky_cpu == append_style_a.html append_style_b.html
-== attr_exists_selector.html attr_exists_selector_ref.html
 == attr_selector_case_sensitivity.html attr_selector_case_sensitivity_ref.html
 == background_clip_a.html background_clip_ref.html
 == background_external_stylesheet.html background_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index ec0f751f6b0..feaa03e7776 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -27,6 +27,18 @@
             "url": "/_mozilla/css/abs_float_pref_width.html"
           }
         ],
+        "css/abs_rel_explicit_height.html": [
+          {
+            "path": "css/abs_rel_explicit_height.html",
+            "references": [
+              [
+                "/_mozilla/css/abs_rel_explicit_height_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/abs_rel_explicit_height.html"
+          }
+        ],
         "css/absolute_clipping_of_own_contents.html": [
           {
             "path": "css/absolute_clipping_of_own_contents.html",
@@ -63,6 +75,114 @@
             "url": "/_mozilla/css/absolute_hypothetical_float.html"
           }
         ],
+        "css/absolute_hypothetical_with_intervening_inline_block_a.html": [
+          {
+            "path": "css/absolute_hypothetical_with_intervening_inline_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/absolute_hypothetical_with_intervening_inline_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/absolute_hypothetical_with_intervening_inline_block_a.html"
+          }
+        ],
+        "css/absolute_inline_containing_block_a.html": [
+          {
+            "path": "css/absolute_inline_containing_block_a.html",
+            "references": [
+              [
+                "/_mozilla/css/absolute_inline_containing_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/absolute_inline_containing_block_a.html"
+          }
+        ],
+        "css/absolute_table.html": [
+          {
+            "path": "css/absolute_table.html",
+            "references": [
+              [
+                "/_mozilla/css/absolute_table_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/absolute_table.html"
+          }
+        ],
+        "css/absolute_z_index_auto_paint_order_a.html": [
+          {
+            "path": "css/absolute_z_index_auto_paint_order_a.html",
+            "references": [
+              [
+                "/_mozilla/css/absolute_z_index_auto_paint_order_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/absolute_z_index_auto_paint_order_a.html"
+          }
+        ],
+        "css/after_block_iteration.html": [
+          {
+            "path": "css/after_block_iteration.html",
+            "references": [
+              [
+                "/_mozilla/css/after_block_iteration_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/after_block_iteration.html"
+          }
+        ],
+        "css/alpha_gif_a.html": [
+          {
+            "path": "css/alpha_gif_a.html",
+            "references": [
+              [
+                "/_mozilla/css/alpha_gif_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/alpha_gif_a.html"
+          }
+        ],
+        "css/alpha_png_a.html": [
+          {
+            "path": "css/alpha_png_a.html",
+            "references": [
+              [
+                "/_mozilla/css/alpha_png_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/alpha_png_a.html"
+          }
+        ],
+        "css/anon_block_inherit_a.html": [
+          {
+            "path": "css/anon_block_inherit_a.html",
+            "references": [
+              [
+                "/_mozilla/css/anon_block_inherit_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/anon_block_inherit_a.html"
+          }
+        ],
+        "css/attr_exists_selector.html": [
+          {
+            "path": "css/attr_exists_selector.html",
+            "references": [
+              [
+                "/_mozilla/css/attr_exists_selector_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/attr_exists_selector.html"
+          }
+        ],
         "css/background.html": [
           {
             "path": "css/background.html",
@@ -884,6 +1004,18 @@
           "url": "/_mozilla/css/abs_float_pref_width.html"
         }
       ],
+      "css/abs_rel_explicit_height.html": [
+        {
+          "path": "css/abs_rel_explicit_height.html",
+          "references": [
+            [
+              "/_mozilla/css/abs_rel_explicit_height_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/abs_rel_explicit_height.html"
+        }
+      ],
       "css/absolute_clipping_of_own_contents.html": [
         {
           "path": "css/absolute_clipping_of_own_contents.html",
@@ -920,6 +1052,114 @@
           "url": "/_mozilla/css/absolute_hypothetical_float.html"
         }
       ],
+      "css/absolute_hypothetical_with_intervening_inline_block_a.html": [
+        {
+          "path": "css/absolute_hypothetical_with_intervening_inline_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/absolute_hypothetical_with_intervening_inline_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/absolute_hypothetical_with_intervening_inline_block_a.html"
+        }
+      ],
+      "css/absolute_inline_containing_block_a.html": [
+        {
+          "path": "css/absolute_inline_containing_block_a.html",
+          "references": [
+            [
+              "/_mozilla/css/absolute_inline_containing_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/absolute_inline_containing_block_a.html"
+        }
+      ],
+      "css/absolute_table.html": [
+        {
+          "path": "css/absolute_table.html",
+          "references": [
+            [
+              "/_mozilla/css/absolute_table_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/absolute_table.html"
+        }
+      ],
+      "css/absolute_z_index_auto_paint_order_a.html": [
+        {
+          "path": "css/absolute_z_index_auto_paint_order_a.html",
+          "references": [
+            [
+              "/_mozilla/css/absolute_z_index_auto_paint_order_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/absolute_z_index_auto_paint_order_a.html"
+        }
+      ],
+      "css/after_block_iteration.html": [
+        {
+          "path": "css/after_block_iteration.html",
+          "references": [
+            [
+              "/_mozilla/css/after_block_iteration_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/after_block_iteration.html"
+        }
+      ],
+      "css/alpha_gif_a.html": [
+        {
+          "path": "css/alpha_gif_a.html",
+          "references": [
+            [
+              "/_mozilla/css/alpha_gif_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/alpha_gif_a.html"
+        }
+      ],
+      "css/alpha_png_a.html": [
+        {
+          "path": "css/alpha_png_a.html",
+          "references": [
+            [
+              "/_mozilla/css/alpha_png_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/alpha_png_a.html"
+        }
+      ],
+      "css/anon_block_inherit_a.html": [
+        {
+          "path": "css/anon_block_inherit_a.html",
+          "references": [
+            [
+              "/_mozilla/css/anon_block_inherit_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/anon_block_inherit_a.html"
+        }
+      ],
+      "css/attr_exists_selector.html": [
+        {
+          "path": "css/attr_exists_selector.html",
+          "references": [
+            [
+              "/_mozilla/css/attr_exists_selector_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/attr_exists_selector.html"
+        }
+      ],
       "css/background.html": [
         {
           "path": "css/background.html",
@@ -968,6 +1208,18 @@
           "url": "/_mozilla/css/setpropertypriority.html"
         }
       ],
+      "css/stacking_context_rtl.html": [
+        {
+          "path": "css/stacking_context_rtl.html",
+          "references": [
+            [
+              "/_mozilla/css/stacking_context_rtl-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/stacking_context_rtl.html"
+        }
+      ],
       "css/word-spacing.html": [
         {
           "path": "css/word-spacing.html",
diff --git a/tests/ref/abs_rel_explicit_height.html b/tests/wpt/mozilla/tests/css/abs_rel_explicit_height.html
similarity index 95%
rename from tests/ref/abs_rel_explicit_height.html
rename to tests/wpt/mozilla/tests/css/abs_rel_explicit_height.html
index 22d3e25be5a..735176bcfee 100644
--- a/tests/ref/abs_rel_explicit_height.html
+++ b/tests/wpt/mozilla/tests/css/abs_rel_explicit_height.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
     <html>
         <head>
+            <link rel=match href=abs_rel_explicit_height_ref.html>
             <style type="text/css">
                 * {
                     margin: 0;
diff --git a/tests/ref/abs_rel_explicit_height_ref.html b/tests/wpt/mozilla/tests/css/abs_rel_explicit_height_ref.html
similarity index 100%
rename from tests/ref/abs_rel_explicit_height_ref.html
rename to tests/wpt/mozilla/tests/css/abs_rel_explicit_height_ref.html
diff --git a/tests/ref/absolute_hypothetical_with_intervening_inline_block_a.html b/tests/wpt/mozilla/tests/css/absolute_hypothetical_with_intervening_inline_block_a.html
similarity index 80%
rename from tests/ref/absolute_hypothetical_with_intervening_inline_block_a.html
rename to tests/wpt/mozilla/tests/css/absolute_hypothetical_with_intervening_inline_block_a.html
index 587dde3c589..261dc086101 100644
--- a/tests/ref/absolute_hypothetical_with_intervening_inline_block_a.html
+++ b/tests/wpt/mozilla/tests/css/absolute_hypothetical_with_intervening_inline_block_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=absolute_hypothetical_with_intervening_inline_block_ref.html>
 <style>
 em {
     position: relative;
diff --git a/tests/ref/absolute_hypothetical_with_intervening_inline_block_ref.html b/tests/wpt/mozilla/tests/css/absolute_hypothetical_with_intervening_inline_block_ref.html
similarity index 100%
rename from tests/ref/absolute_hypothetical_with_intervening_inline_block_ref.html
rename to tests/wpt/mozilla/tests/css/absolute_hypothetical_with_intervening_inline_block_ref.html
diff --git a/tests/ref/absolute_inline_containing_block_a.html b/tests/wpt/mozilla/tests/css/absolute_inline_containing_block_a.html
similarity index 95%
rename from tests/ref/absolute_inline_containing_block_a.html
rename to tests/wpt/mozilla/tests/css/absolute_inline_containing_block_a.html
index a10d4fa9e3d..ab15865df4b 100644
--- a/tests/ref/absolute_inline_containing_block_a.html
+++ b/tests/wpt/mozilla/tests/css/absolute_inline_containing_block_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=match href=absolute_inline_containing_block_ref.html>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/absolute_inline_containing_block_ref.html b/tests/wpt/mozilla/tests/css/absolute_inline_containing_block_ref.html
similarity index 100%
rename from tests/ref/absolute_inline_containing_block_ref.html
rename to tests/wpt/mozilla/tests/css/absolute_inline_containing_block_ref.html
diff --git a/tests/ref/absolute_table.html b/tests/wpt/mozilla/tests/css/absolute_table.html
similarity index 70%
rename from tests/ref/absolute_table.html
rename to tests/wpt/mozilla/tests/css/absolute_table.html
index b0dc978e34f..731bf9a123f 100644
--- a/tests/ref/absolute_table.html
+++ b/tests/wpt/mozilla/tests/css/absolute_table.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=absolute_table_ref.html>
 <style>
 div { display:table;position:absolute;top:0px;right:40px }
 </style>
diff --git a/tests/ref/absolute_table_ref.html b/tests/wpt/mozilla/tests/css/absolute_table_ref.html
similarity index 100%
rename from tests/ref/absolute_table_ref.html
rename to tests/wpt/mozilla/tests/css/absolute_table_ref.html
diff --git a/tests/ref/absolute_z_index_auto_paint_order_a.html b/tests/wpt/mozilla/tests/css/absolute_z_index_auto_paint_order_a.html
similarity index 82%
rename from tests/ref/absolute_z_index_auto_paint_order_a.html
rename to tests/wpt/mozilla/tests/css/absolute_z_index_auto_paint_order_a.html
index 5d725ad9007..14ada33cfe5 100644
--- a/tests/ref/absolute_z_index_auto_paint_order_a.html
+++ b/tests/wpt/mozilla/tests/css/absolute_z_index_auto_paint_order_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=absolute_z_index_auto_paint_order_ref.html>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/ref/absolute_z_index_auto_paint_order_ref.html b/tests/wpt/mozilla/tests/css/absolute_z_index_auto_paint_order_ref.html
similarity index 100%
rename from tests/ref/absolute_z_index_auto_paint_order_ref.html
rename to tests/wpt/mozilla/tests/css/absolute_z_index_auto_paint_order_ref.html
diff --git a/tests/ref/after_block_iteration.html b/tests/wpt/mozilla/tests/css/after_block_iteration.html
similarity index 90%
rename from tests/ref/after_block_iteration.html
rename to tests/wpt/mozilla/tests/css/after_block_iteration.html
index 12c67f80b1f..79efcc13723 100644
--- a/tests/ref/after_block_iteration.html
+++ b/tests/wpt/mozilla/tests/css/after_block_iteration.html
@@ -8,6 +8,7 @@
   corrupted.
 -->
 <title>ack</title>
+<link rel=match href=after_block_iteration_ref.html>
 <style>
 div.after-portlet-lang:after {
     display: block;
diff --git a/tests/ref/after_block_iteration_ref.html b/tests/wpt/mozilla/tests/css/after_block_iteration_ref.html
similarity index 100%
rename from tests/ref/after_block_iteration_ref.html
rename to tests/wpt/mozilla/tests/css/after_block_iteration_ref.html
diff --git a/tests/ref/alpha_gif_a.gif b/tests/wpt/mozilla/tests/css/alpha_gif_a.gif
similarity index 100%
rename from tests/ref/alpha_gif_a.gif
rename to tests/wpt/mozilla/tests/css/alpha_gif_a.gif
diff --git a/tests/ref/alpha_gif_a.html b/tests/wpt/mozilla/tests/css/alpha_gif_a.html
similarity index 80%
rename from tests/ref/alpha_gif_a.html
rename to tests/wpt/mozilla/tests/css/alpha_gif_a.html
index f61c36ae435..e2ebc3dd096 100644
--- a/tests/ref/alpha_gif_a.html
+++ b/tests/wpt/mozilla/tests/css/alpha_gif_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <title>Kaboom</title>
+<link rel=match href=alpha_gif_b.html>
 <style>
 body {
     background: #00ff00;
diff --git a/tests/ref/alpha_gif_b.gif b/tests/wpt/mozilla/tests/css/alpha_gif_b.gif
similarity index 100%
rename from tests/ref/alpha_gif_b.gif
rename to tests/wpt/mozilla/tests/css/alpha_gif_b.gif
diff --git a/tests/ref/alpha_gif_b.html b/tests/wpt/mozilla/tests/css/alpha_gif_b.html
similarity index 100%
rename from tests/ref/alpha_gif_b.html
rename to tests/wpt/mozilla/tests/css/alpha_gif_b.html
diff --git a/tests/ref/alpha_png_a.html b/tests/wpt/mozilla/tests/css/alpha_png_a.html
similarity index 80%
rename from tests/ref/alpha_png_a.html
rename to tests/wpt/mozilla/tests/css/alpha_png_a.html
index 10abc613fb6..6c718e7b06c 100644
--- a/tests/ref/alpha_png_a.html
+++ b/tests/wpt/mozilla/tests/css/alpha_png_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <title>Kaboom</title>
+<link rel=match href=alpha_png_b.html>
 <style>
 body {
     background: #00ff00;
diff --git a/tests/ref/alpha_png_a.png b/tests/wpt/mozilla/tests/css/alpha_png_a.png
similarity index 100%
rename from tests/ref/alpha_png_a.png
rename to tests/wpt/mozilla/tests/css/alpha_png_a.png
diff --git a/tests/ref/alpha_png_b.html b/tests/wpt/mozilla/tests/css/alpha_png_b.html
similarity index 100%
rename from tests/ref/alpha_png_b.html
rename to tests/wpt/mozilla/tests/css/alpha_png_b.html
diff --git a/tests/ref/alpha_png_b.png b/tests/wpt/mozilla/tests/css/alpha_png_b.png
similarity index 100%
rename from tests/ref/alpha_png_b.png
rename to tests/wpt/mozilla/tests/css/alpha_png_b.png
diff --git a/tests/ref/anon_block_inherit_a.html b/tests/wpt/mozilla/tests/css/anon_block_inherit_a.html
similarity index 74%
rename from tests/ref/anon_block_inherit_a.html
rename to tests/wpt/mozilla/tests/css/anon_block_inherit_a.html
index 855b51e5009..00214c6b848 100644
--- a/tests/ref/anon_block_inherit_a.html
+++ b/tests/wpt/mozilla/tests/css/anon_block_inherit_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <title>hi</title>
+<link rel=match href=anon_block_inherit_b.html>
 </head>
 <body>
 <div style="border: solid">
diff --git a/tests/ref/anon_block_inherit_b.html b/tests/wpt/mozilla/tests/css/anon_block_inherit_b.html
similarity index 100%
rename from tests/ref/anon_block_inherit_b.html
rename to tests/wpt/mozilla/tests/css/anon_block_inherit_b.html
diff --git a/tests/ref/attr_exists_selector.html b/tests/wpt/mozilla/tests/css/attr_exists_selector.html
similarity index 86%
rename from tests/ref/attr_exists_selector.html
rename to tests/wpt/mozilla/tests/css/attr_exists_selector.html
index 43ad48bb62a..a40f01e361d 100644
--- a/tests/ref/attr_exists_selector.html
+++ b/tests/wpt/mozilla/tests/css/attr_exists_selector.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>Attribute exists selector: [foo] and [*|foo]</title>
+    <link rel=match href=attr_exists_selector_ref.html>
     <style>
       p[data-green] { color: green }
       p[*|data-red] { color: red }
diff --git a/tests/ref/attr_exists_selector_ref.html b/tests/wpt/mozilla/tests/css/attr_exists_selector_ref.html
similarity index 100%
rename from tests/ref/attr_exists_selector_ref.html
rename to tests/wpt/mozilla/tests/css/attr_exists_selector_ref.html