diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index cccf1d3d8c5..2d1f09c47b4 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -40,11 +40,8 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
 # == link_style_dynamic_addition.html link_style_dynamic_addition_ref.html
 # Should be == with expected failure. See #2797
 != overconstrained_block.html overconstrained_block_ref.html
-== overflow_auto.html overflow_simple_b.html
 # Should be ==?
 != overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_b.html
-== overflow_scroll.html overflow_simple_b.html
-== overflow_simple_a.html overflow_simple_b.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
 # commented out because multiple layers don't work with reftests --pcwalton
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 277002d10d5..b865a87d4ca 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2983,6 +2983,18 @@
             "url": "/_mozilla/css/outset_blackborder.html"
           }
         ],
+        "css/overflow_auto.html": [
+          {
+            "path": "css/overflow_auto.html",
+            "references": [
+              [
+                "/_mozilla/css/overflow_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/overflow_auto.html"
+          }
+        ],
         "css/overflow_auto_stacking_order_a.html": [
           {
             "path": "css/overflow_auto_stacking_order_a.html",
@@ -3031,6 +3043,30 @@
             "url": "/_mozilla/css/overflow_position_rel_inline_block.html"
           }
         ],
+        "css/overflow_scroll.html": [
+          {
+            "path": "css/overflow_scroll.html",
+            "references": [
+              [
+                "/_mozilla/css/overflow_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/overflow_scroll.html"
+          }
+        ],
+        "css/overflow_simple_a.html": [
+          {
+            "path": "css/overflow_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/overflow_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/overflow_simple_a.html"
+          }
+        ],
         "css/overflow_wrap_a.html": [
           {
             "path": "css/overflow_wrap_a.html",
@@ -8280,6 +8316,18 @@
           "url": "/_mozilla/css/outset_blackborder.html"
         }
       ],
+      "css/overflow_auto.html": [
+        {
+          "path": "css/overflow_auto.html",
+          "references": [
+            [
+              "/_mozilla/css/overflow_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/overflow_auto.html"
+        }
+      ],
       "css/overflow_auto_stacking_order_a.html": [
         {
           "path": "css/overflow_auto_stacking_order_a.html",
@@ -8328,6 +8376,30 @@
           "url": "/_mozilla/css/overflow_position_rel_inline_block.html"
         }
       ],
+      "css/overflow_scroll.html": [
+        {
+          "path": "css/overflow_scroll.html",
+          "references": [
+            [
+              "/_mozilla/css/overflow_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/overflow_scroll.html"
+        }
+      ],
+      "css/overflow_simple_a.html": [
+        {
+          "path": "css/overflow_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/overflow_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/overflow_simple_a.html"
+        }
+      ],
       "css/overflow_wrap_a.html": [
         {
           "path": "css/overflow_wrap_a.html",
diff --git a/tests/ref/overflow_auto.html b/tests/wpt/mozilla/tests/css/overflow_auto.html
similarity index 86%
rename from tests/ref/overflow_auto.html
rename to tests/wpt/mozilla/tests/css/overflow_auto.html
index 29eb7e2e2c1..3529fd29131 100644
--- a/tests/ref/overflow_auto.html
+++ b/tests/wpt/mozilla/tests/css/overflow_auto.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=overflow_simple_b.html>
     <style>
       #first {
       height: 100px;
diff --git a/tests/ref/overflow_scroll.html b/tests/wpt/mozilla/tests/css/overflow_scroll.html
similarity index 86%
rename from tests/ref/overflow_scroll.html
rename to tests/wpt/mozilla/tests/css/overflow_scroll.html
index 26c333f4efe..bf32fbc01d1 100644
--- a/tests/ref/overflow_scroll.html
+++ b/tests/wpt/mozilla/tests/css/overflow_scroll.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=overflow_simple_b.html>
     <style>
       #first {
       height: 100px;
diff --git a/tests/ref/overflow_simple_a.html b/tests/wpt/mozilla/tests/css/overflow_simple_a.html
similarity index 86%
rename from tests/ref/overflow_simple_a.html
rename to tests/wpt/mozilla/tests/css/overflow_simple_a.html
index 9b8b53eff89..96951aa172f 100644
--- a/tests/ref/overflow_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/overflow_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=overflow_simple_b.html>
     <style>
       #first {
       height: 100px;
diff --git a/tests/ref/overflow_simple_b.html b/tests/wpt/mozilla/tests/css/overflow_simple_b.html
similarity index 100%
rename from tests/ref/overflow_simple_b.html
rename to tests/wpt/mozilla/tests/css/overflow_simple_b.html