diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index b787c1850d4..87086baa2b8 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
-== border_collapse_simple_a.html border_collapse_simple_ref.html
-== border_radius_asymmetric_sizes_a.html border_radius_asymmetric_sizes_ref.html
-== border_radius_clip_a.html border_radius_clip_ref.html
-!= border_radius_dashed_a.html border_radius_dashed_ref.html
-== border_radius_elliptical_a.html border_radius_elliptical_ref.html
-== border_radius_overlapping_a.html border_radius_overlapping_ref.html
-== border_radius_shorthand_a.html border_radius_shorthand_ref.html
-== border_radius_zero_sizes_a.html border_radius_zero_sizes_ref.html
-== border_rounding_1px_invisible_issue_7184_a.html border_rounding_1px_invisible_issue_7184_ref.html
-== border_spacing_a.html border_spacing_ref.html
 == border_spacing_auto_layout_a.html border_spacing_ref.html
 == border_spacing_empty_table.html border_spacing_empty_table_ref.html
 == border_spacing_fixed_layout_a.html border_spacing_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index d7c45f961fd..ba6d921e301 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -659,6 +659,126 @@
             "url": "/_mozilla/css/border_collapse_missing_cell_a.html"
           }
         ],
+        "css/border_collapse_simple_a.html": [
+          {
+            "path": "css/border_collapse_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_collapse_simple_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_collapse_simple_a.html"
+          }
+        ],
+        "css/border_radius_asymmetric_sizes_a.html": [
+          {
+            "path": "css/border_radius_asymmetric_sizes_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_asymmetric_sizes_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_asymmetric_sizes_a.html"
+          }
+        ],
+        "css/border_radius_clip_a.html": [
+          {
+            "path": "css/border_radius_clip_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_clip_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_clip_a.html"
+          }
+        ],
+        "css/border_radius_dashed_a.html": [
+          {
+            "path": "css/border_radius_dashed_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_dashed_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_dashed_a.html"
+          }
+        ],
+        "css/border_radius_elliptical_a.html": [
+          {
+            "path": "css/border_radius_elliptical_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_elliptical_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_elliptical_a.html"
+          }
+        ],
+        "css/border_radius_overlapping_a.html": [
+          {
+            "path": "css/border_radius_overlapping_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_overlapping_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_overlapping_a.html"
+          }
+        ],
+        "css/border_radius_shorthand_a.html": [
+          {
+            "path": "css/border_radius_shorthand_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_shorthand_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_shorthand_a.html"
+          }
+        ],
+        "css/border_radius_zero_sizes_a.html": [
+          {
+            "path": "css/border_radius_zero_sizes_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_radius_zero_sizes_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_radius_zero_sizes_a.html"
+          }
+        ],
+        "css/border_rounding_1px_invisible_issue_7184_a.html": [
+          {
+            "path": "css/border_rounding_1px_invisible_issue_7184_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_rounding_1px_invisible_issue_7184_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_rounding_1px_invisible_issue_7184_a.html"
+          }
+        ],
+        "css/border_spacing_a.html": [
+          {
+            "path": "css/border_spacing_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_spacing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_spacing_a.html"
+          }
+        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
@@ -4380,6 +4500,126 @@
           "url": "/_mozilla/css/border_collapse_missing_cell_a.html"
         }
       ],
+      "css/border_collapse_simple_a.html": [
+        {
+          "path": "css/border_collapse_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_collapse_simple_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_collapse_simple_a.html"
+        }
+      ],
+      "css/border_radius_asymmetric_sizes_a.html": [
+        {
+          "path": "css/border_radius_asymmetric_sizes_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_asymmetric_sizes_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_asymmetric_sizes_a.html"
+        }
+      ],
+      "css/border_radius_clip_a.html": [
+        {
+          "path": "css/border_radius_clip_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_clip_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_clip_a.html"
+        }
+      ],
+      "css/border_radius_dashed_a.html": [
+        {
+          "path": "css/border_radius_dashed_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_dashed_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_dashed_a.html"
+        }
+      ],
+      "css/border_radius_elliptical_a.html": [
+        {
+          "path": "css/border_radius_elliptical_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_elliptical_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_elliptical_a.html"
+        }
+      ],
+      "css/border_radius_overlapping_a.html": [
+        {
+          "path": "css/border_radius_overlapping_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_overlapping_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_overlapping_a.html"
+        }
+      ],
+      "css/border_radius_shorthand_a.html": [
+        {
+          "path": "css/border_radius_shorthand_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_shorthand_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_shorthand_a.html"
+        }
+      ],
+      "css/border_radius_zero_sizes_a.html": [
+        {
+          "path": "css/border_radius_zero_sizes_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_radius_zero_sizes_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_radius_zero_sizes_a.html"
+        }
+      ],
+      "css/border_rounding_1px_invisible_issue_7184_a.html": [
+        {
+          "path": "css/border_rounding_1px_invisible_issue_7184_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_rounding_1px_invisible_issue_7184_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_rounding_1px_invisible_issue_7184_a.html"
+        }
+      ],
+      "css/border_spacing_a.html": [
+        {
+          "path": "css/border_spacing_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_spacing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_spacing_a.html"
+        }
+      ],
       "css/class-namespaces.html": [
         {
           "path": "css/class-namespaces.html",
@@ -6882,4 +7122,4 @@
   "rev": null,
   "url_base": "/_mozilla/",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/tests/ref/border_collapse_simple_a.html b/tests/wpt/mozilla/tests/css/border_collapse_simple_a.html
similarity index 95%
rename from tests/ref/border_collapse_simple_a.html
rename to tests/wpt/mozilla/tests/css/border_collapse_simple_a.html
index 292b9d6435e..afed02bcb60 100644
--- a/tests/ref/border_collapse_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/border_collapse_simple_a.html
@@ -9,6 +9,7 @@
     don't correctly handle collapsed borders when calculating `table_border_padding` in
     `table_wrapper.rs`.
 -->
+<link rel=match href=border_collapse_simple_ref.html>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/border_collapse_simple_ref.html b/tests/wpt/mozilla/tests/css/border_collapse_simple_ref.html
similarity index 100%
rename from tests/ref/border_collapse_simple_ref.html
rename to tests/wpt/mozilla/tests/css/border_collapse_simple_ref.html
diff --git a/tests/ref/border_radius_asymmetric_sizes_a.html b/tests/wpt/mozilla/tests/css/border_radius_asymmetric_sizes_a.html
similarity index 97%
rename from tests/ref/border_radius_asymmetric_sizes_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_asymmetric_sizes_a.html
index 94676b11941..eb8b9aeefca 100644
--- a/tests/ref/border_radius_asymmetric_sizes_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_asymmetric_sizes_a.html
@@ -3,6 +3,7 @@
     <head>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
         <meta content="utf-8" http-equiv="encoding">
+        <link rel=match href=border_radius_asymmetric_sizes_ref.html>
         <style type="text/css">
          div.box {
              background: white;
diff --git a/tests/ref/border_radius_asymmetric_sizes_ref.html b/tests/wpt/mozilla/tests/css/border_radius_asymmetric_sizes_ref.html
similarity index 100%
rename from tests/ref/border_radius_asymmetric_sizes_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_asymmetric_sizes_ref.html
diff --git a/tests/ref/border_radius_clip_a.html b/tests/wpt/mozilla/tests/css/border_radius_clip_a.html
similarity index 89%
rename from tests/ref/border_radius_clip_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_clip_a.html
index cb866db02d2..3579d248b7d 100644
--- a/tests/ref/border_radius_clip_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_clip_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <!-- Tests that `border-radius` causes the background to be clipped around the corners. -->
+<link rel=match href=border_radius_clip_ref.html>
 <style>
 main {
     display: block;
diff --git a/tests/ref/border_radius_clip_ref.html b/tests/wpt/mozilla/tests/css/border_radius_clip_ref.html
similarity index 100%
rename from tests/ref/border_radius_clip_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_clip_ref.html
diff --git a/tests/ref/border_radius_dashed_a.html b/tests/wpt/mozilla/tests/css/border_radius_dashed_a.html
similarity index 73%
rename from tests/ref/border_radius_dashed_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_dashed_a.html
index 6cf167f2be7..c2a79aae6ef 100644
--- a/tests/ref/border_radius_dashed_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_dashed_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=mismatch href=border_radius_dashed_ref.html>
 <style>
 section {
     border: dashed red 3px;
diff --git a/tests/ref/border_radius_dashed_ref.html b/tests/wpt/mozilla/tests/css/border_radius_dashed_ref.html
similarity index 100%
rename from tests/ref/border_radius_dashed_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_dashed_ref.html
diff --git a/tests/ref/border_radius_elliptical_a.html b/tests/wpt/mozilla/tests/css/border_radius_elliptical_a.html
similarity index 92%
rename from tests/ref/border_radius_elliptical_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_elliptical_a.html
index aebfad351b0..8a70d6ccc69 100644
--- a/tests/ref/border_radius_elliptical_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_elliptical_a.html
@@ -3,6 +3,7 @@
     <head>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
         <meta content="utf-8" http-equiv="encoding">
+        <link rel=match href=border_radius_elliptical_ref.html>
         <style type="text/css">
          div.box {
              background: white;
diff --git a/tests/ref/border_radius_elliptical_ref.html b/tests/wpt/mozilla/tests/css/border_radius_elliptical_ref.html
similarity index 100%
rename from tests/ref/border_radius_elliptical_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_elliptical_ref.html
diff --git a/tests/ref/border_radius_overlapping_a.html b/tests/wpt/mozilla/tests/css/border_radius_overlapping_a.html
similarity index 75%
rename from tests/ref/border_radius_overlapping_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_overlapping_a.html
index 58baa1720ca..b9b811fee9e 100644
--- a/tests/ref/border_radius_overlapping_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_overlapping_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+    <link rel=match href=border_radius_overlapping_ref.html>
     <body>
         <div style='box-sizing:border-box; width:6em; height:2em; border-radius:.5em 2em .5em 2em; background-color:red;'></div>
     </body>
diff --git a/tests/ref/border_radius_overlapping_ref.html b/tests/wpt/mozilla/tests/css/border_radius_overlapping_ref.html
similarity index 100%
rename from tests/ref/border_radius_overlapping_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_overlapping_ref.html
diff --git a/tests/ref/border_radius_shorthand_a.html b/tests/wpt/mozilla/tests/css/border_radius_shorthand_a.html
similarity index 91%
rename from tests/ref/border_radius_shorthand_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_shorthand_a.html
index ed0769e380a..220ac34db9f 100644
--- a/tests/ref/border_radius_shorthand_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_shorthand_a.html
@@ -3,6 +3,7 @@
     <head>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
         <meta content="utf-8" http-equiv="encoding">
+        <link rel=match href=border_radius_shorthand_ref.html>
         <style type="text/css">
          div.box {
              background: white;
diff --git a/tests/ref/border_radius_shorthand_ref.html b/tests/wpt/mozilla/tests/css/border_radius_shorthand_ref.html
similarity index 100%
rename from tests/ref/border_radius_shorthand_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_shorthand_ref.html
diff --git a/tests/ref/border_radius_zero_sizes_a.html b/tests/wpt/mozilla/tests/css/border_radius_zero_sizes_a.html
similarity index 86%
rename from tests/ref/border_radius_zero_sizes_a.html
rename to tests/wpt/mozilla/tests/css/border_radius_zero_sizes_a.html
index d79ed6fd6ce..38b6169f317 100644
--- a/tests/ref/border_radius_zero_sizes_a.html
+++ b/tests/wpt/mozilla/tests/css/border_radius_zero_sizes_a.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <link rel=match href=border_radius_zero_sizes_ref.html>
     </head>
     <body>
         <div style="border-top: 20px solid black; border-radius: 5px"></div>
diff --git a/tests/ref/border_radius_zero_sizes_ref.html b/tests/wpt/mozilla/tests/css/border_radius_zero_sizes_ref.html
similarity index 100%
rename from tests/ref/border_radius_zero_sizes_ref.html
rename to tests/wpt/mozilla/tests/css/border_radius_zero_sizes_ref.html
diff --git a/tests/ref/border_rounding_1px_invisible_issue_7184_a.html b/tests/wpt/mozilla/tests/css/border_rounding_1px_invisible_issue_7184_a.html
similarity index 88%
rename from tests/ref/border_rounding_1px_invisible_issue_7184_a.html
rename to tests/wpt/mozilla/tests/css/border_rounding_1px_invisible_issue_7184_a.html
index c97396bf19f..cd90d70754b 100644
--- a/tests/ref/border_rounding_1px_invisible_issue_7184_a.html
+++ b/tests/wpt/mozilla/tests/css/border_rounding_1px_invisible_issue_7184_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel=match href=border_rounding_1px_invisible_issue_7184_ref.html>
         <style type="text/css">
          .onyx {
              color: white;
diff --git a/tests/ref/border_rounding_1px_invisible_issue_7184_ref.html b/tests/wpt/mozilla/tests/css/border_rounding_1px_invisible_issue_7184_ref.html
similarity index 100%
rename from tests/ref/border_rounding_1px_invisible_issue_7184_ref.html
rename to tests/wpt/mozilla/tests/css/border_rounding_1px_invisible_issue_7184_ref.html
diff --git a/tests/ref/border_spacing_a.html b/tests/wpt/mozilla/tests/css/border_spacing_a.html
similarity index 92%
rename from tests/ref/border_spacing_a.html
rename to tests/wpt/mozilla/tests/css/border_spacing_a.html
index cd76c64b274..b1bb79ad40d 100644
--- a/tests/ref/border_spacing_a.html
+++ b/tests/wpt/mozilla/tests/css/border_spacing_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <!-- Tests that `border-spacing` works. -->
+<link rel=match href=border_spacing_ref.html>
 <style>
 body, html {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/border_spacing_ref.html b/tests/wpt/mozilla/tests/css/border_spacing_ref.html
new file mode 100644
index 00000000000..b5a4827badd
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/border_spacing_ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- Tests that `border-spacing` works. -->
+<style>
+div {
+    background: blue;
+    position: absolute;
+    height: 32px;
+}
+#a, #c {
+    width: 32px;
+}
+#b, #d {
+    width: 64px;
+}
+#a, #b {
+    top: 6px;
+}
+#c, #d {
+    top: 44px;
+}
+#a, #c {
+    left: 6px;
+}
+#b, #d {
+    left: 44px;
+}
+</style>
+</head>
+<body>
+<div id=a></div>
+<div id=b></div>
+<div id=c></div>
+<div id=d></div>
+</body>
+</html>
+
+