diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index c3cdd1df6fa..3c909f95a18 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -12,16 +12,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 == acid1_a.html acid1_b.html
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-== block_formatting_context_a.html block_formatting_context_ref.html
-== block_formatting_context_cleared_float_a.html block_formatting_context_cleared_float_ref.html
-== block_formatting_context_complex_a.html block_formatting_context_complex_ref.html
-== block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html
-== block_formatting_context_float_placement_a.html block_formatting_context_float_placement_ref.html
-== block_formatting_context_max_width_a.html block_formatting_context_max_width_ref.html
-== block_formatting_context_overflow_a.html block_formatting_context_overflow_ref.html
-== block_formatting_context_relative_a.html block_formatting_context_ref.html
-== block_formatting_context_translation_a.html block_formatting_context_translation_ref.html
-== block_formatting_context_with_margin_a.html block_formatting_context_with_margin_ref.html
 == block_image.html 500x300_green.html
 != block_image.html noteq_500x300_white.html
 == block_replaced_content_a.html block_replaced_content_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index cca460351f1..23743b433e9 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -435,6 +435,126 @@
             "url": "/_mozilla/css/basic_width_px.html"
           }
         ],
+        "css/block_formatting_context_a.html": [
+          {
+            "path": "css/block_formatting_context_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_a.html"
+          }
+        ],
+        "css/block_formatting_context_cleared_float_a.html": [
+          {
+            "path": "css/block_formatting_context_cleared_float_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_cleared_float_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_cleared_float_a.html"
+          }
+        ],
+        "css/block_formatting_context_complex_a.html": [
+          {
+            "path": "css/block_formatting_context_complex_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_complex_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_complex_a.html"
+          }
+        ],
+        "css/block_formatting_context_containing_floats_a.html": [
+          {
+            "path": "css/block_formatting_context_containing_floats_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_containing_floats_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_containing_floats_a.html"
+          }
+        ],
+        "css/block_formatting_context_float_placement_a.html": [
+          {
+            "path": "css/block_formatting_context_float_placement_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_float_placement_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_float_placement_a.html"
+          }
+        ],
+        "css/block_formatting_context_max_width_a.html": [
+          {
+            "path": "css/block_formatting_context_max_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_max_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_max_width_a.html"
+          }
+        ],
+        "css/block_formatting_context_overflow_a.html": [
+          {
+            "path": "css/block_formatting_context_overflow_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_overflow_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_overflow_a.html"
+          }
+        ],
+        "css/block_formatting_context_relative_a.html": [
+          {
+            "path": "css/block_formatting_context_relative_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_relative_a.html"
+          }
+        ],
+        "css/block_formatting_context_translation_a.html": [
+          {
+            "path": "css/block_formatting_context_translation_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_translation_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_translation_a.html"
+          }
+        ],
+        "css/block_formatting_context_with_margin_a.html": [
+          {
+            "path": "css/block_formatting_context_with_margin_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_formatting_context_with_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_formatting_context_with_margin_a.html"
+          }
+        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
@@ -1652,6 +1772,126 @@
           "url": "/_mozilla/css/basic_width_px.html"
         }
       ],
+      "css/block_formatting_context_a.html": [
+        {
+          "path": "css/block_formatting_context_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_a.html"
+        }
+      ],
+      "css/block_formatting_context_cleared_float_a.html": [
+        {
+          "path": "css/block_formatting_context_cleared_float_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_cleared_float_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_cleared_float_a.html"
+        }
+      ],
+      "css/block_formatting_context_complex_a.html": [
+        {
+          "path": "css/block_formatting_context_complex_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_complex_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_complex_a.html"
+        }
+      ],
+      "css/block_formatting_context_containing_floats_a.html": [
+        {
+          "path": "css/block_formatting_context_containing_floats_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_containing_floats_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_containing_floats_a.html"
+        }
+      ],
+      "css/block_formatting_context_float_placement_a.html": [
+        {
+          "path": "css/block_formatting_context_float_placement_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_float_placement_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_float_placement_a.html"
+        }
+      ],
+      "css/block_formatting_context_max_width_a.html": [
+        {
+          "path": "css/block_formatting_context_max_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_max_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_max_width_a.html"
+        }
+      ],
+      "css/block_formatting_context_overflow_a.html": [
+        {
+          "path": "css/block_formatting_context_overflow_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_overflow_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_overflow_a.html"
+        }
+      ],
+      "css/block_formatting_context_relative_a.html": [
+        {
+          "path": "css/block_formatting_context_relative_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_relative_a.html"
+        }
+      ],
+      "css/block_formatting_context_translation_a.html": [
+        {
+          "path": "css/block_formatting_context_translation_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_translation_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_translation_a.html"
+        }
+      ],
+      "css/block_formatting_context_with_margin_a.html": [
+        {
+          "path": "css/block_formatting_context_with_margin_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_formatting_context_with_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_formatting_context_with_margin_a.html"
+        }
+      ],
       "css/class-namespaces.html": [
         {
           "path": "css/class-namespaces.html",
diff --git a/tests/ref/block_formatting_context_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_a.html
similarity index 72%
rename from tests/ref/block_formatting_context_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_a.html
index 241de2e22e4..eecad30e3e7 100644
--- a/tests/ref/block_formatting_context_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=block_formatting_context_ref.html>
 <body>
     <div style="float: left;">4913</div>
     <div style="overflow: hidden;">RIP Richard Kiel</div>
diff --git a/tests/ref/block_formatting_context_cleared_float_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html
similarity index 86%
rename from tests/ref/block_formatting_context_cleared_float_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html
index 495a09cc119..d91265b494d 100644
--- a/tests/ref/block_formatting_context_cleared_float_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html
@@ -5,6 +5,7 @@
     Tests that block formatting context inline-size speculation works when the floats that impact
     the block formatting context are cleared.
 -->
+<link rel=match href=block_formatting_context_cleared_float_ref.html>
 <style>
 #a {
     background: silver;
diff --git a/tests/ref/block_formatting_context_cleared_float_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_cleared_float_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_ref.html
diff --git a/tests/ref/block_formatting_context_complex_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_complex_a.html
similarity index 95%
rename from tests/ref/block_formatting_context_complex_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_complex_a.html
index aa79a65a6af..14163ec3547 100644
--- a/tests/ref/block_formatting_context_complex_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_complex_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=match href=block_formatting_context_complex_ref.html>
 <style>
 .a {
     height: 999999px;
diff --git a/tests/ref/block_formatting_context_complex_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_complex_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_complex_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_complex_ref.html
diff --git a/tests/ref/block_formatting_context_containing_floats_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_containing_floats_a.html
similarity index 71%
rename from tests/ref/block_formatting_context_containing_floats_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_containing_floats_a.html
index 41666502b75..20aa80fe629 100644
--- a/tests/ref/block_formatting_context_containing_floats_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_containing_floats_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=block_formatting_context_containing_floats_ref.html>
 <body>
 <div style="overflow: hidden; background: green;">
     <div style="width: 250px; height: 250px; float: left; background: blue;"></div>
diff --git a/tests/ref/block_formatting_context_containing_floats_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_containing_floats_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_containing_floats_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_containing_floats_ref.html
diff --git a/tests/ref/block_formatting_context_float_placement_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_float_placement_a.html
similarity index 85%
rename from tests/ref/block_formatting_context_float_placement_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_float_placement_a.html
index 33cf261ef8d..77c3f5cfc64 100644
--- a/tests/ref/block_formatting_context_float_placement_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_float_placement_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=match href=block_formatting_context_float_placement_ref.html>
 <style>
 #nav-searchbar {
 	overflow: hidden;
diff --git a/tests/ref/block_formatting_context_float_placement_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_float_placement_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_float_placement_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_float_placement_ref.html
diff --git a/tests/ref/block_formatting_context_max_width_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_max_width_a.html
similarity index 81%
rename from tests/ref/block_formatting_context_max_width_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_max_width_a.html
index 94cdedd3782..5e5e59c2841 100644
--- a/tests/ref/block_formatting_context_max_width_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_max_width_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=block_formatting_context_max_width_ref.html>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/block_formatting_context_max_width_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_max_width_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_max_width_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_max_width_ref.html
diff --git a/tests/ref/block_formatting_context_overflow_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_overflow_a.html
similarity index 79%
rename from tests/ref/block_formatting_context_overflow_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_overflow_a.html
index c38766870cf..1376c99962f 100644
--- a/tests/ref/block_formatting_context_overflow_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_overflow_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=block_formatting_context_overflow_ref.html>
 <style>
 section {
     display: block;
diff --git a/tests/ref/block_formatting_context_overflow_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_overflow_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_overflow_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_overflow_ref.html
diff --git a/tests/ref/block_formatting_context_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_ref.html
diff --git a/tests/ref/block_formatting_context_relative_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_relative_a.html
similarity index 74%
rename from tests/ref/block_formatting_context_relative_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_relative_a.html
index 3e8c6b66df4..fc399cfa7ad 100644
--- a/tests/ref/block_formatting_context_relative_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_relative_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=block_formatting_context_ref.html>
 <body>
     <div style="float: left;">4913</div>
     <div style="overflow: hidden; position: relative;">RIP Richard Kiel</div>
diff --git a/tests/ref/block_formatting_context_translation_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_translation_a.html
similarity index 83%
rename from tests/ref/block_formatting_context_translation_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_translation_a.html
index 0b7ea4e1f67..cf5054c158c 100644
--- a/tests/ref/block_formatting_context_translation_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_translation_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=block_formatting_context_translation_ref.html>
 <body>
     <div style="height: 32px; margin: 0 0 0;">
         <div style="float: left; background: blue; width: 64px; height: 32px;"></div>
diff --git a/tests/ref/block_formatting_context_translation_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_translation_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_translation_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_translation_ref.html
diff --git a/tests/ref/block_formatting_context_with_margin_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_with_margin_a.html
similarity index 83%
rename from tests/ref/block_formatting_context_with_margin_a.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_with_margin_a.html
index 0259628231e..0ed0a8607b8 100644
--- a/tests/ref/block_formatting_context_with_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/block_formatting_context_with_margin_a.html
@@ -2,6 +2,7 @@
 
 <html>
 <head>
+<link rel=match href=block_formatting_context_with_margin_ref.html>
 <style>
 #float {
     float: right;
diff --git a/tests/ref/block_formatting_context_with_margin_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_with_margin_ref.html
similarity index 100%
rename from tests/ref/block_formatting_context_with_margin_ref.html
rename to tests/wpt/mozilla/tests/css/block_formatting_context_with_margin_ref.html