diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index a3b301b3a99..cdc448a8173 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -13,16 +13,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 flaky_cpu == append_style_a.html append_style_b.html
 # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
 
-== iframe/bg_color.html iframe/bg_color_ref.html
-== iframe/hide_after_load.html iframe/hide_after_load_ref.html
-== iframe/hide_and_show.html iframe/hide_and_show_ref.html
-== iframe/hide_layers1.html iframe/hide_layers_ref.html
-== iframe/hide_layers2.html iframe/hide_layers_ref.html
-== iframe/multiple_external.html iframe/multiple_external_ref.html
-== iframe/overflow.html iframe/overflow_ref.html
-== iframe/positioning_margin.html iframe/positioning_margin_ref.html
-== iframe/simple.html iframe/simple_ref.html
-== iframe/simple_inline_default.html iframe/simple_inline_default_ref.html
 == iframe/simple_inline_height.html iframe/simple_inline_height_ref.html
 == iframe/simple_inline_max.html iframe/simple_inline_max_ref.html
 == iframe/simple_inline_min.html iframe/simple_inline_min_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 5dadda08d55..654239d05b0 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -1567,6 +1567,126 @@
             "url": "/_mozilla/css/hide_after_create.html"
           }
         ],
+        "css/iframe/bg_color.html": [
+          {
+            "path": "css/iframe/bg_color.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/bg_color_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/bg_color.html"
+          }
+        ],
+        "css/iframe/hide_after_load.html": [
+          {
+            "path": "css/iframe/hide_after_load.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/hide_after_load_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/hide_after_load.html"
+          }
+        ],
+        "css/iframe/hide_and_show.html": [
+          {
+            "path": "css/iframe/hide_and_show.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/hide_and_show_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/hide_and_show.html"
+          }
+        ],
+        "css/iframe/hide_layers1.html": [
+          {
+            "path": "css/iframe/hide_layers1.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/hide_layers_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/hide_layers1.html"
+          }
+        ],
+        "css/iframe/hide_layers2.html": [
+          {
+            "path": "css/iframe/hide_layers2.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/hide_layers_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/hide_layers2.html"
+          }
+        ],
+        "css/iframe/multiple_external.html": [
+          {
+            "path": "css/iframe/multiple_external.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/multiple_external_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/multiple_external.html"
+          }
+        ],
+        "css/iframe/overflow.html": [
+          {
+            "path": "css/iframe/overflow.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/overflow_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/overflow.html"
+          }
+        ],
+        "css/iframe/positioning_margin.html": [
+          {
+            "path": "css/iframe/positioning_margin.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/positioning_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/positioning_margin.html"
+          }
+        ],
+        "css/iframe/simple.html": [
+          {
+            "path": "css/iframe/simple.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/simple.html"
+          }
+        ],
+        "css/iframe/simple_inline_default.html": [
+          {
+            "path": "css/iframe/simple_inline_default.html",
+            "references": [
+              [
+                "/_mozilla/css/iframe/simple_inline_default_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/iframe/simple_inline_default.html"
+          }
+        ],
         "css/image_rendering_auto_a.html": [
           {
             "path": "css/image_rendering_auto_a.html",
@@ -7008,6 +7128,126 @@
           "url": "/_mozilla/css/hide_after_create.html"
         }
       ],
+      "css/iframe/bg_color.html": [
+        {
+          "path": "css/iframe/bg_color.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/bg_color_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/bg_color.html"
+        }
+      ],
+      "css/iframe/hide_after_load.html": [
+        {
+          "path": "css/iframe/hide_after_load.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/hide_after_load_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/hide_after_load.html"
+        }
+      ],
+      "css/iframe/hide_and_show.html": [
+        {
+          "path": "css/iframe/hide_and_show.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/hide_and_show_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/hide_and_show.html"
+        }
+      ],
+      "css/iframe/hide_layers1.html": [
+        {
+          "path": "css/iframe/hide_layers1.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/hide_layers_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/hide_layers1.html"
+        }
+      ],
+      "css/iframe/hide_layers2.html": [
+        {
+          "path": "css/iframe/hide_layers2.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/hide_layers_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/hide_layers2.html"
+        }
+      ],
+      "css/iframe/multiple_external.html": [
+        {
+          "path": "css/iframe/multiple_external.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/multiple_external_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/multiple_external.html"
+        }
+      ],
+      "css/iframe/overflow.html": [
+        {
+          "path": "css/iframe/overflow.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/overflow_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/overflow.html"
+        }
+      ],
+      "css/iframe/positioning_margin.html": [
+        {
+          "path": "css/iframe/positioning_margin.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/positioning_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/positioning_margin.html"
+        }
+      ],
+      "css/iframe/simple.html": [
+        {
+          "path": "css/iframe/simple.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/simple.html"
+        }
+      ],
+      "css/iframe/simple_inline_default.html": [
+        {
+          "path": "css/iframe/simple_inline_default.html",
+          "references": [
+            [
+              "/_mozilla/css/iframe/simple_inline_default_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/iframe/simple_inline_default.html"
+        }
+      ],
       "css/image_rendering_auto_a.html": [
         {
           "path": "css/image_rendering_auto_a.html",
diff --git a/tests/ref/iframe/bg_color.html b/tests/wpt/mozilla/tests/css/iframe/bg_color.html
similarity index 84%
rename from tests/ref/iframe/bg_color.html
rename to tests/wpt/mozilla/tests/css/iframe/bg_color.html
index a139865a2b6..7fab6e2371c 100644
--- a/tests/ref/iframe/bg_color.html
+++ b/tests/wpt/mozilla/tests/css/iframe/bg_color.html
@@ -1,4 +1,5 @@
 <html>
+    <link rel=match href=bg_color_ref.html>
     <body style="background-color: blue; margin: 0;">
         <div style="margin: 20px;">
             <iframe src="about:blank" style="border: 0; background-color: green;">
diff --git a/tests/ref/iframe/bg_color_ref.html b/tests/wpt/mozilla/tests/css/iframe/bg_color_ref.html
similarity index 100%
rename from tests/ref/iframe/bg_color_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/bg_color_ref.html
diff --git a/tests/ref/iframe/hide_after_load.html b/tests/wpt/mozilla/tests/css/iframe/hide_after_load.html
similarity index 93%
rename from tests/ref/iframe/hide_after_load.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_after_load.html
index 386b8f543e2..71879e25b64 100644
--- a/tests/ref/iframe/hide_after_load.html
+++ b/tests/wpt/mozilla/tests/css/iframe/hide_after_load.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+    <link rel=match href=hide_after_load_ref.html>
     <body style="background: green;">
         <iframe style="border: 0" src="hide_after_load_inner_frame.html"></iframe>
         <script type="text/javascript">
diff --git a/tests/ref/iframe/hide_after_load_inner_frame.html b/tests/wpt/mozilla/tests/css/iframe/hide_after_load_inner_frame.html
similarity index 100%
rename from tests/ref/iframe/hide_after_load_inner_frame.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_after_load_inner_frame.html
diff --git a/tests/ref/iframe/hide_after_load_ref.html b/tests/wpt/mozilla/tests/css/iframe/hide_after_load_ref.html
similarity index 100%
rename from tests/ref/iframe/hide_after_load_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_after_load_ref.html
diff --git a/tests/ref/iframe/hide_and_show.html b/tests/wpt/mozilla/tests/css/iframe/hide_and_show.html
similarity index 92%
rename from tests/ref/iframe/hide_and_show.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_and_show.html
index 29ab83dfe2a..6acdaf6dc6f 100644
--- a/tests/ref/iframe/hide_and_show.html
+++ b/tests/wpt/mozilla/tests/css/iframe/hide_and_show.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+	<link rel=match href=hide_and_show_ref.html>
 	<style type="text/css">
 		.hidden {
 			display: none;
diff --git a/tests/ref/iframe/hide_and_show_ref.html b/tests/wpt/mozilla/tests/css/iframe/hide_and_show_ref.html
similarity index 100%
rename from tests/ref/iframe/hide_and_show_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_and_show_ref.html
diff --git a/tests/ref/iframe/hide_layers1.html b/tests/wpt/mozilla/tests/css/iframe/hide_layers1.html
similarity index 92%
rename from tests/ref/iframe/hide_layers1.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_layers1.html
index 159723211de..4445aea9ef8 100644
--- a/tests/ref/iframe/hide_layers1.html
+++ b/tests/wpt/mozilla/tests/css/iframe/hide_layers1.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+    <link rel=match href=hide_layers_ref.html>
     <style type="text/css">
         .hidden {
             display: none;
diff --git a/tests/ref/iframe/hide_layers2.html b/tests/wpt/mozilla/tests/css/iframe/hide_layers2.html
similarity index 92%
rename from tests/ref/iframe/hide_layers2.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_layers2.html
index 1bc79c654da..54cfef0db5d 100644
--- a/tests/ref/iframe/hide_layers2.html
+++ b/tests/wpt/mozilla/tests/css/iframe/hide_layers2.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+    <link rel=match href=hide_layers_ref.html>
     <style type="text/css">
         body {
             background-color: green;
diff --git a/tests/ref/iframe/hide_layers_ref.html b/tests/wpt/mozilla/tests/css/iframe/hide_layers_ref.html
similarity index 100%
rename from tests/ref/iframe/hide_layers_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/hide_layers_ref.html
diff --git a/tests/ref/iframe/multiple_external.html b/tests/wpt/mozilla/tests/css/iframe/multiple_external.html
similarity index 89%
rename from tests/ref/iframe/multiple_external.html
rename to tests/wpt/mozilla/tests/css/iframe/multiple_external.html
index e527131724a..c2d66f25cec 100644
--- a/tests/ref/iframe/multiple_external.html
+++ b/tests/wpt/mozilla/tests/css/iframe/multiple_external.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel=match href=multiple_external_ref.html>
         <style>
           iframe {
             margin: 10px;
diff --git a/tests/ref/iframe/multiple_external_child.html b/tests/wpt/mozilla/tests/css/iframe/multiple_external_child.html
similarity index 100%
rename from tests/ref/iframe/multiple_external_child.html
rename to tests/wpt/mozilla/tests/css/iframe/multiple_external_child.html
diff --git a/tests/ref/iframe/multiple_external_ref.html b/tests/wpt/mozilla/tests/css/iframe/multiple_external_ref.html
similarity index 100%
rename from tests/ref/iframe/multiple_external_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/multiple_external_ref.html
diff --git a/tests/ref/iframe/overflow.html b/tests/wpt/mozilla/tests/css/iframe/overflow.html
similarity index 86%
rename from tests/ref/iframe/overflow.html
rename to tests/wpt/mozilla/tests/css/iframe/overflow.html
index 405ee9fa8e6..473f21dc418 100644
--- a/tests/ref/iframe/overflow.html
+++ b/tests/wpt/mozilla/tests/css/iframe/overflow.html
@@ -1,4 +1,5 @@
 <html>
+<link rel=match href=overflow_ref.html>
  <body>
    <iframe src="data:text/html,%3Cdiv%20style%3D%22background%3Agreen%3B%20width%3A%20200px%3B%20height%3A%20200px%3B%22%3E%3C%2Fdiv%3E"
            style="display: block; width: 108px; height: 108px; border: none">
diff --git a/tests/ref/iframe/overflow_ref.html b/tests/wpt/mozilla/tests/css/iframe/overflow_ref.html
similarity index 100%
rename from tests/ref/iframe/overflow_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/overflow_ref.html
diff --git a/tests/ref/iframe/positioning_margin.html b/tests/wpt/mozilla/tests/css/iframe/positioning_margin.html
similarity index 88%
rename from tests/ref/iframe/positioning_margin.html
rename to tests/wpt/mozilla/tests/css/iframe/positioning_margin.html
index f0a464be04c..57e7a875034 100644
--- a/tests/ref/iframe/positioning_margin.html
+++ b/tests/wpt/mozilla/tests/css/iframe/positioning_margin.html
@@ -1,4 +1,5 @@
 <html>
+  <link rel=match href=positioning_margin_ref.html>
   <body style="margin: 0px;">
     <iframe src="data:text/html,%3Chtml%3E%3Cbody%20style%3D%22margin%3A%200px%3B%22%3E%3Cdiv%20style%3D%22background%3A%20green%3B%20height%3A%20100px%3B%20width%3A%20100px%3B%22%3E%3C%2Fdiv%3E%3C%2Fbody%3E%3C%2Fhtml%3E"
         style="display: block; border: 0px; width: 100px; height: 100px; margin-top: 100px;">
diff --git a/tests/ref/iframe/positioning_margin_ref.html b/tests/wpt/mozilla/tests/css/iframe/positioning_margin_ref.html
similarity index 100%
rename from tests/ref/iframe/positioning_margin_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/positioning_margin_ref.html
diff --git a/tests/ref/iframe/simple.html b/tests/wpt/mozilla/tests/css/iframe/simple.html
similarity index 88%
rename from tests/ref/iframe/simple.html
rename to tests/wpt/mozilla/tests/css/iframe/simple.html
index 3625f863b0b..9578e773186 100644
--- a/tests/ref/iframe/simple.html
+++ b/tests/wpt/mozilla/tests/css/iframe/simple.html
@@ -1,4 +1,5 @@
 <html>
+<link rel=match href=simple_ref.html>
  <body>
    <div style="margin-top: 20px">
    <iframe src="data:text/html,%3Cspan%3EJust%20a%20simple%20little%20iframe.%3C%2Fspan%3E"
diff --git a/tests/ref/iframe/simple_inline_default.html b/tests/wpt/mozilla/tests/css/iframe/simple_inline_default.html
similarity index 81%
rename from tests/ref/iframe/simple_inline_default.html
rename to tests/wpt/mozilla/tests/css/iframe/simple_inline_default.html
index c4d268304f5..e5777b0001a 100644
--- a/tests/ref/iframe/simple_inline_default.html
+++ b/tests/wpt/mozilla/tests/css/iframe/simple_inline_default.html
@@ -1,4 +1,5 @@
 <html>
+<link rel=match href=simple_inline_default_ref.html>
  <body>
    <div style="margin-top: 20px;">
    <iframe src="data:text/html,%3Cspan%3EJust%20a%20simple%20little%20iframe.%3C%2Fspan%3E"
diff --git a/tests/ref/iframe/simple_inline_default_ref.html b/tests/wpt/mozilla/tests/css/iframe/simple_inline_default_ref.html
similarity index 100%
rename from tests/ref/iframe/simple_inline_default_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/simple_inline_default_ref.html
diff --git a/tests/ref/iframe/simple_ref.html b/tests/wpt/mozilla/tests/css/iframe/simple_ref.html
similarity index 100%
rename from tests/ref/iframe/simple_ref.html
rename to tests/wpt/mozilla/tests/css/iframe/simple_ref.html