diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 2d1f09c47b4..a3b301b3a99 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -48,22 +48,13 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_
 # == position_fixed_a.html position_fixed_b.html
 # == position_fixed_simple_a.html position_fixed_simple_b.html
 # == position_fixed_static_y_a.html position_fixed_static_y_b.html
-== position_fixed_tile_edge.html position_fixed_tile_edge_ref.html
-== position_fixed_tile_edge_2.html position_fixed_tile_edge_ref.html
-== position_fixed_tile_edge_3.html position_fixed_tile_edge_ref.html
-== root_display_inline_a.html root_display_ref.html
-== root_display_without_style_a.html root_display_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_overflow_a.html text_overflow_ref.html
 flaky_cpu,prefs:"layout.writing-mode.enabled" == vertical-lr-blocks.html vertical-lr-blocks_ref.html
-prefs:"layout.viewport.enabled" == 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
 
 flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html
 
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index b865a87d4ca..57ed404dae2 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -3295,6 +3295,42 @@
             "url": "/_mozilla/css/position_fixed_overflow_a.html"
           }
         ],
+        "css/position_fixed_tile_edge.html": [
+          {
+            "path": "css/position_fixed_tile_edge.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_tile_edge_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_tile_edge.html"
+          }
+        ],
+        "css/position_fixed_tile_edge_2.html": [
+          {
+            "path": "css/position_fixed_tile_edge_2.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_tile_edge_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_tile_edge_2.html"
+          }
+        ],
+        "css/position_fixed_tile_edge_3.html": [
+          {
+            "path": "css/position_fixed_tile_edge_3.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_tile_edge_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_tile_edge_3.html"
+          }
+        ],
         "css/position_relative_a.html": [
           {
             "path": "css/position_relative_a.html",
@@ -3487,6 +3523,30 @@
             "url": "/_mozilla/css/restyle_hints_state.html"
           }
         ],
+        "css/root_display_inline_a.html": [
+          {
+            "path": "css/root_display_inline_a.html",
+            "references": [
+              [
+                "/_mozilla/css/root_display_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/root_display_inline_a.html"
+          }
+        ],
+        "css/root_display_without_style_a.html": [
+          {
+            "path": "css/root_display_without_style_a.html",
+            "references": [
+              [
+                "/_mozilla/css/root_display_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/root_display_without_style_a.html"
+          }
+        ],
         "css/root_height_a.html": [
           {
             "path": "css/root_height_a.html",
@@ -3991,6 +4051,30 @@
             "url": "/_mozilla/css/text_decoration_cached.html"
           }
         ],
+        "css/text_decoration_smoke_a.html": [
+          {
+            "path": "css/text_decoration_smoke_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_decoration_smoke_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/text_decoration_smoke_a.html"
+          }
+        ],
+        "css/text_decoration_underline_subpx_a.html": [
+          {
+            "path": "css/text_decoration_underline_subpx_a.html",
+            "references": [
+              [
+                "/_mozilla/css/text_decoration_underline_subpx_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/text_decoration_underline_subpx_a.html"
+          }
+        ],
         "css/text_indent_a.html": [
           {
             "path": "css/text_indent_a.html",
@@ -4363,6 +4447,30 @@
             "url": "/_mozilla/css/viewport_ignore_desktop.html"
           }
         ],
+        "css/viewport_meta.html": [
+          {
+            "path": "css/viewport_meta.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_rule_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_meta.html"
+          }
+        ],
+        "css/viewport_rule.html": [
+          {
+            "path": "css/viewport_rule.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_rule_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_rule.html"
+          }
+        ],
         "css/visibility_hidden.html": [
           {
             "path": "css/visibility_hidden.html",
@@ -8628,6 +8736,42 @@
           "url": "/_mozilla/css/position_fixed_overflow_a.html"
         }
       ],
+      "css/position_fixed_tile_edge.html": [
+        {
+          "path": "css/position_fixed_tile_edge.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_tile_edge_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_tile_edge.html"
+        }
+      ],
+      "css/position_fixed_tile_edge_2.html": [
+        {
+          "path": "css/position_fixed_tile_edge_2.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_tile_edge_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_tile_edge_2.html"
+        }
+      ],
+      "css/position_fixed_tile_edge_3.html": [
+        {
+          "path": "css/position_fixed_tile_edge_3.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_tile_edge_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_tile_edge_3.html"
+        }
+      ],
       "css/position_relative_a.html": [
         {
           "path": "css/position_relative_a.html",
@@ -8820,6 +8964,30 @@
           "url": "/_mozilla/css/restyle_hints_state.html"
         }
       ],
+      "css/root_display_inline_a.html": [
+        {
+          "path": "css/root_display_inline_a.html",
+          "references": [
+            [
+              "/_mozilla/css/root_display_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/root_display_inline_a.html"
+        }
+      ],
+      "css/root_display_without_style_a.html": [
+        {
+          "path": "css/root_display_without_style_a.html",
+          "references": [
+            [
+              "/_mozilla/css/root_display_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/root_display_without_style_a.html"
+        }
+      ],
       "css/root_height_a.html": [
         {
           "path": "css/root_height_a.html",
@@ -9324,6 +9492,30 @@
           "url": "/_mozilla/css/text_decoration_cached.html"
         }
       ],
+      "css/text_decoration_smoke_a.html": [
+        {
+          "path": "css/text_decoration_smoke_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_decoration_smoke_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/text_decoration_smoke_a.html"
+        }
+      ],
+      "css/text_decoration_underline_subpx_a.html": [
+        {
+          "path": "css/text_decoration_underline_subpx_a.html",
+          "references": [
+            [
+              "/_mozilla/css/text_decoration_underline_subpx_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/text_decoration_underline_subpx_a.html"
+        }
+      ],
       "css/text_indent_a.html": [
         {
           "path": "css/text_indent_a.html",
@@ -9696,6 +9888,30 @@
           "url": "/_mozilla/css/viewport_ignore_desktop.html"
         }
       ],
+      "css/viewport_meta.html": [
+        {
+          "path": "css/viewport_meta.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_rule_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_meta.html"
+        }
+      ],
+      "css/viewport_rule.html": [
+        {
+          "path": "css/viewport_rule.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_rule_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_rule.html"
+        }
+      ],
       "css/visibility_hidden.html": [
         {
           "path": "css/visibility_hidden.html",
diff --git a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini
new file mode 100644
index 00000000000..32a48a29459
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini
@@ -0,0 +1 @@
+prefs: ["layout.viewport.enabled:true"]
diff --git a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini
new file mode 100644
index 00000000000..32a48a29459
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini
@@ -0,0 +1 @@
+prefs: ["layout.viewport.enabled:true"]
diff --git a/tests/ref/position_fixed_tile_edge.html b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge.html
similarity index 71%
rename from tests/ref/position_fixed_tile_edge.html
rename to tests/wpt/mozilla/tests/css/position_fixed_tile_edge.html
index 4a0fd898ea0..c9a06afa374 100644
--- a/tests/ref/position_fixed_tile_edge.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge.html
@@ -1,4 +1,5 @@
 <html>
+  <link rel=match href=position_fixed_tile_edge_ref.html>
   <body>
     <div style="background: green; position: fixed; top: 0px; left: 512px; width: 20px; height: 20px;"></div>
   </body>
diff --git a/tests/ref/position_fixed_tile_edge_2.html b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge_2.html
similarity index 85%
rename from tests/ref/position_fixed_tile_edge_2.html
rename to tests/wpt/mozilla/tests/css/position_fixed_tile_edge_2.html
index dde70ad965d..7e72bf09265 100644
--- a/tests/ref/position_fixed_tile_edge_2.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge_2.html
@@ -1,4 +1,5 @@
 <html>
+  <link rel=match href=position_fixed_tile_edge_ref.html>
   <body>
     <div style="position: absolute; top: 0px; left: 512px;">
         <div style="position: absolute; background: green; width: 20px; height: 20px;"></div>
diff --git a/tests/ref/position_fixed_tile_edge_3.html b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge_3.html
similarity index 86%
rename from tests/ref/position_fixed_tile_edge_3.html
rename to tests/wpt/mozilla/tests/css/position_fixed_tile_edge_3.html
index 60e20fb22b0..11d2001a8e9 100644
--- a/tests/ref/position_fixed_tile_edge_3.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge_3.html
@@ -1,4 +1,5 @@
 <html>
+  <link rel=match href=position_fixed_tile_edge_ref.html>
   <body>
     <div style="position: absolute; top: 0px; left: 0px;">
         <div style="position: absolute; background: green; top: 0; margin-left: 512px; width: 20px; height: 20px;"></div>
diff --git a/tests/ref/position_fixed_tile_edge_ref.html b/tests/wpt/mozilla/tests/css/position_fixed_tile_edge_ref.html
similarity index 100%
rename from tests/ref/position_fixed_tile_edge_ref.html
rename to tests/wpt/mozilla/tests/css/position_fixed_tile_edge_ref.html
diff --git a/tests/ref/root_display_inline_a.html b/tests/wpt/mozilla/tests/css/root_display_inline_a.html
similarity index 68%
rename from tests/ref/root_display_inline_a.html
rename to tests/wpt/mozilla/tests/css/root_display_inline_a.html
index 07fe6a96c21..44d4297ad55 100644
--- a/tests/ref/root_display_inline_a.html
+++ b/tests/wpt/mozilla/tests/css/root_display_inline_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html style="display:inline">
 <head>
+<link rel=match href=root_display_ref.html>
 </head>
 <body>
 Hello world!
diff --git a/tests/ref/root_display_ref.html b/tests/wpt/mozilla/tests/css/root_display_ref.html
similarity index 100%
rename from tests/ref/root_display_ref.html
rename to tests/wpt/mozilla/tests/css/root_display_ref.html
diff --git a/tests/ref/root_display_without_style_a.html b/tests/wpt/mozilla/tests/css/root_display_without_style_a.html
similarity index 88%
rename from tests/ref/root_display_without_style_a.html
rename to tests/wpt/mozilla/tests/css/root_display_without_style_a.html
index 9f02354f48f..861a1ba7051 100644
--- a/tests/ref/root_display_without_style_a.html
+++ b/tests/wpt/mozilla/tests/css/root_display_without_style_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=match href=root_display_ref.html>
 <script>
   document.removeChild(document.documentElement);
   root = document.createElementNS(null, "html");
diff --git a/tests/ref/text_decoration_smoke_a.html b/tests/wpt/mozilla/tests/css/text_decoration_smoke_a.html
similarity index 81%
rename from tests/ref/text_decoration_smoke_a.html
rename to tests/wpt/mozilla/tests/css/text_decoration_smoke_a.html
index 443e1bd1502..ac7c814ee43 100644
--- a/tests/ref/text_decoration_smoke_a.html
+++ b/tests/wpt/mozilla/tests/css/text_decoration_smoke_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <!-- Tests that `text-decoration` does something. -->
+<link rel=mismatch href=text_decoration_smoke_ref.html>
 <style>
 #a {
     text-decoration: underline;
diff --git a/tests/ref/text_decoration_smoke_ref.html b/tests/wpt/mozilla/tests/css/text_decoration_smoke_ref.html
similarity index 100%
rename from tests/ref/text_decoration_smoke_ref.html
rename to tests/wpt/mozilla/tests/css/text_decoration_smoke_ref.html
diff --git a/tests/ref/text_decoration_underline_subpx_a.html b/tests/wpt/mozilla/tests/css/text_decoration_underline_subpx_a.html
similarity index 79%
rename from tests/ref/text_decoration_underline_subpx_a.html
rename to tests/wpt/mozilla/tests/css/text_decoration_underline_subpx_a.html
index 36dea4951ba..700641537a8 100644
--- a/tests/ref/text_decoration_underline_subpx_a.html
+++ b/tests/wpt/mozilla/tests/css/text_decoration_underline_subpx_a.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Underline test</title>
+    <link rel=mismatch href=text_decoration_underline_subpx_ref.html>
     <style>
       p {
         font: 14px "Times New Roman";
diff --git a/tests/ref/text_decoration_underline_subpx_ref.html b/tests/wpt/mozilla/tests/css/text_decoration_underline_subpx_ref.html
similarity index 100%
rename from tests/ref/text_decoration_underline_subpx_ref.html
rename to tests/wpt/mozilla/tests/css/text_decoration_underline_subpx_ref.html
diff --git a/tests/ref/viewport_meta.html b/tests/wpt/mozilla/tests/css/viewport_meta.html
similarity index 89%
rename from tests/ref/viewport_meta.html
rename to tests/wpt/mozilla/tests/css/viewport_meta.html
index 5c386bd7d76..e3d336c1e0e 100644
--- a/tests/ref/viewport_meta.html
+++ b/tests/wpt/mozilla/tests/css/viewport_meta.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel=match href=viewport_rule_ref.html>
     <meta name="viewport" content="width=240">
     <style>
       #container {
diff --git a/tests/ref/viewport_rule.html b/tests/wpt/mozilla/tests/css/viewport_rule.html
similarity index 89%
rename from tests/ref/viewport_rule.html
rename to tests/wpt/mozilla/tests/css/viewport_rule.html
index bccd08bb79d..36d0d4c0082 100644
--- a/tests/ref/viewport_rule.html
+++ b/tests/wpt/mozilla/tests/css/viewport_rule.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel=match href=viewport_rule_ref.html>
     <style>
       @viewport {
         height: auto;
diff --git a/tests/ref/viewport_rule_ref.html b/tests/wpt/mozilla/tests/css/viewport_rule_ref.html
similarity index 100%
rename from tests/ref/viewport_rule_ref.html
rename to tests/wpt/mozilla/tests/css/viewport_rule_ref.html