diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index d274da12d91..745cf6cfdc7 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_image.html 500x300_green.html
-!= block_image.html noteq_500x300_white.html
-== block_replaced_content_a.html block_replaced_content_ref.html
-== block_replaced_content_b.html block_replaced_content_ref.html
-!= blur_a.html blur_ref.html
-!= border_black_groove.html border_black_solid.html
-!= border_black_ridge.html border_black_groove.html
-!= border_black_ridge.html border_black_solid.html
-== border_code_tag.html border_code_tag_ref.html
-== border_collapse_missing_cell_a.html border_collapse_missing_cell_ref.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
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index e5b39863e76..36ddeecf0ff 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -555,6 +555,110 @@
             "url": "/_mozilla/css/block_formatting_context_with_margin_a.html"
           }
         ],
+        "css/block_image.html": [
+          {
+            "path": "css/block_image.html",
+            "references": [
+              [
+                "/_mozilla/css/500x300_green.html",
+                "=="
+              ],
+              [
+                "/_mozilla/css/noteq_500x300_white.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/block_image.html"
+          }
+        ],
+        "css/block_replaced_content_a.html": [
+          {
+            "path": "css/block_replaced_content_a.html",
+            "references": [
+              [
+                "/_mozilla/css/block_replaced_content_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_replaced_content_a.html"
+          }
+        ],
+        "css/block_replaced_content_b.html": [
+          {
+            "path": "css/block_replaced_content_b.html",
+            "references": [
+              [
+                "/_mozilla/css/block_replaced_content_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/block_replaced_content_b.html"
+          }
+        ],
+        "css/blur_a.html": [
+          {
+            "path": "css/blur_a.html",
+            "references": [
+              [
+                "/_mozilla/css/blur_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/blur_a.html"
+          }
+        ],
+        "css/border_black_groove.html": [
+          {
+            "path": "css/border_black_groove.html",
+            "references": [
+              [
+                "/_mozilla/css/border_black_solid.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/border_black_groove.html"
+          }
+        ],
+        "css/border_black_ridge.html": [
+          {
+            "path": "css/border_black_ridge.html",
+            "references": [
+              [
+                "/_mozilla/css/border_black_groove.html",
+                "!="
+              ],
+              [
+                "/_mozilla/css/border_black_solid.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/border_black_ridge.html"
+          }
+        ],
+        "css/border_code_tag.html": [
+          {
+            "path": "css/border_code_tag.html",
+            "references": [
+              [
+                "/_mozilla/css/border_code_tag_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_code_tag.html"
+          }
+        ],
+        "css/border_collapse_missing_cell_a.html": [
+          {
+            "path": "css/border_collapse_missing_cell_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_collapse_missing_cell_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_collapse_missing_cell_a.html"
+          }
+        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
@@ -2636,6 +2740,110 @@
           "url": "/_mozilla/css/block_formatting_context_with_margin_a.html"
         }
       ],
+      "css/block_image.html": [
+        {
+          "path": "css/block_image.html",
+          "references": [
+            [
+              "/_mozilla/css/500x300_green.html",
+              "=="
+            ],
+            [
+              "/_mozilla/css/noteq_500x300_white.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/block_image.html"
+        }
+      ],
+      "css/block_replaced_content_a.html": [
+        {
+          "path": "css/block_replaced_content_a.html",
+          "references": [
+            [
+              "/_mozilla/css/block_replaced_content_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_replaced_content_a.html"
+        }
+      ],
+      "css/block_replaced_content_b.html": [
+        {
+          "path": "css/block_replaced_content_b.html",
+          "references": [
+            [
+              "/_mozilla/css/block_replaced_content_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/block_replaced_content_b.html"
+        }
+      ],
+      "css/blur_a.html": [
+        {
+          "path": "css/blur_a.html",
+          "references": [
+            [
+              "/_mozilla/css/blur_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/blur_a.html"
+        }
+      ],
+      "css/border_black_groove.html": [
+        {
+          "path": "css/border_black_groove.html",
+          "references": [
+            [
+              "/_mozilla/css/border_black_solid.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/border_black_groove.html"
+        }
+      ],
+      "css/border_black_ridge.html": [
+        {
+          "path": "css/border_black_ridge.html",
+          "references": [
+            [
+              "/_mozilla/css/border_black_groove.html",
+              "!="
+            ],
+            [
+              "/_mozilla/css/border_black_solid.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/border_black_ridge.html"
+        }
+      ],
+      "css/border_code_tag.html": [
+        {
+          "path": "css/border_code_tag.html",
+          "references": [
+            [
+              "/_mozilla/css/border_code_tag_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_code_tag.html"
+        }
+      ],
+      "css/border_collapse_missing_cell_a.html": [
+        {
+          "path": "css/border_collapse_missing_cell_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_collapse_missing_cell_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_collapse_missing_cell_a.html"
+        }
+      ],
       "css/class-namespaces.html": [
         {
           "path": "css/class-namespaces.html",
diff --git a/tests/wpt/mozilla/tests/css/400x400_green.png b/tests/wpt/mozilla/tests/css/400x400_green.png
new file mode 100644
index 00000000000..484469eb140
Binary files /dev/null and b/tests/wpt/mozilla/tests/css/400x400_green.png differ
diff --git a/tests/ref/500x300_green.html b/tests/wpt/mozilla/tests/css/500x300_green.html
similarity index 100%
rename from tests/ref/500x300_green.html
rename to tests/wpt/mozilla/tests/css/500x300_green.html
diff --git a/tests/ref/block_image.html b/tests/wpt/mozilla/tests/css/block_image.html
similarity index 60%
rename from tests/ref/block_image.html
rename to tests/wpt/mozilla/tests/css/block_image.html
index cf262775a41..7bba4554786 100644
--- a/tests/ref/block_image.html
+++ b/tests/wpt/mozilla/tests/css/block_image.html
@@ -1,4 +1,6 @@
 <html>
+<link rel=match href=500x300_green.html>
+<link rel=mismatch href=noteq_500x300_white.html>
 <body>
 <img style="display: block; width: 500px; height: 300px; background-color: red;"
      src="400x400_green.png">
diff --git a/tests/ref/block_replaced_content_a.html b/tests/wpt/mozilla/tests/css/block_replaced_content_a.html
similarity index 84%
rename from tests/ref/block_replaced_content_a.html
rename to tests/wpt/mozilla/tests/css/block_replaced_content_a.html
index 24dd273c908..639da0036a0 100644
--- a/tests/ref/block_replaced_content_a.html
+++ b/tests/wpt/mozilla/tests/css/block_replaced_content_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel=match href=block_replaced_content_ref.html>
         <style>
             body {
                 margin: 0;
diff --git a/tests/ref/block_replaced_content_b.html b/tests/wpt/mozilla/tests/css/block_replaced_content_b.html
similarity index 84%
rename from tests/ref/block_replaced_content_b.html
rename to tests/wpt/mozilla/tests/css/block_replaced_content_b.html
index b021434ba20..c6fd40fc6a3 100644
--- a/tests/ref/block_replaced_content_b.html
+++ b/tests/wpt/mozilla/tests/css/block_replaced_content_b.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel=match href=block_replaced_content_ref.html>
         <style>
             body {
                 margin: 0;
diff --git a/tests/ref/block_replaced_content_ref.html b/tests/wpt/mozilla/tests/css/block_replaced_content_ref.html
similarity index 100%
rename from tests/ref/block_replaced_content_ref.html
rename to tests/wpt/mozilla/tests/css/block_replaced_content_ref.html
diff --git a/tests/ref/blur_a.html b/tests/wpt/mozilla/tests/css/blur_a.html
similarity index 94%
rename from tests/ref/blur_a.html
rename to tests/wpt/mozilla/tests/css/blur_a.html
index 8a589b52b80..a75af6a0207 100644
--- a/tests/ref/blur_a.html
+++ b/tests/wpt/mozilla/tests/css/blur_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=mismatch href=blur_ref.html>
 <style type="text/css">
 div {
    width: 200px;
diff --git a/tests/ref/blur_ref.html b/tests/wpt/mozilla/tests/css/blur_ref.html
similarity index 100%
rename from tests/ref/blur_ref.html
rename to tests/wpt/mozilla/tests/css/blur_ref.html
diff --git a/tests/ref/border_black_groove.html b/tests/wpt/mozilla/tests/css/border_black_groove.html
similarity index 89%
rename from tests/ref/border_black_groove.html
rename to tests/wpt/mozilla/tests/css/border_black_groove.html
index c572f1d4df0..49e1647a6f7 100644
--- a/tests/ref/border_black_groove.html
+++ b/tests/wpt/mozilla/tests/css/border_black_groove.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+  <link rel=mismatch href=border_black_solid.html>
   <style>
     .box {
       width: 100px;
diff --git a/tests/ref/border_black_ridge.html b/tests/wpt/mozilla/tests/css/border_black_ridge.html
similarity index 80%
rename from tests/ref/border_black_ridge.html
rename to tests/wpt/mozilla/tests/css/border_black_ridge.html
index b1434ef3671..79c7b93f21f 100644
--- a/tests/ref/border_black_ridge.html
+++ b/tests/wpt/mozilla/tests/css/border_black_ridge.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+  <link rel=mismatch href=border_black_groove.html>
+  <link rel=mismatch href=border_black_solid.html>
   <style>
     .box {
       width: 100px;
diff --git a/tests/ref/border_black_solid.html b/tests/wpt/mozilla/tests/css/border_black_solid.html
similarity index 100%
rename from tests/ref/border_black_solid.html
rename to tests/wpt/mozilla/tests/css/border_black_solid.html
diff --git a/tests/ref/border_code_tag.html b/tests/wpt/mozilla/tests/css/border_code_tag.html
similarity index 73%
rename from tests/ref/border_code_tag.html
rename to tests/wpt/mozilla/tests/css/border_code_tag.html
index 9e5a6479969..41a35862242 100644
--- a/tests/ref/border_code_tag.html
+++ b/tests/wpt/mozilla/tests/css/border_code_tag.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<link rel=match href=border_code_tag_ref.html>
 <style>
 code {
 border: 2px solid #ccc;
diff --git a/tests/ref/border_code_tag_ref.html b/tests/wpt/mozilla/tests/css/border_code_tag_ref.html
similarity index 100%
rename from tests/ref/border_code_tag_ref.html
rename to tests/wpt/mozilla/tests/css/border_code_tag_ref.html
diff --git a/tests/ref/border_collapse_missing_cell_a.html b/tests/wpt/mozilla/tests/css/border_collapse_missing_cell_a.html
similarity index 87%
rename from tests/ref/border_collapse_missing_cell_a.html
rename to tests/wpt/mozilla/tests/css/border_collapse_missing_cell_a.html
index 023ea8c541b..e5e24f21107 100644
--- a/tests/ref/border_collapse_missing_cell_a.html
+++ b/tests/wpt/mozilla/tests/css/border_collapse_missing_cell_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <!-- Tests that missing cells don't cause a crash in border collapse code. -->
+<link rel=match href=border_collapse_missing_cell_ref.html>
 <style>
 table {
     border-collapse: collapse;
diff --git a/tests/ref/border_collapse_missing_cell_ref.html b/tests/wpt/mozilla/tests/css/border_collapse_missing_cell_ref.html
similarity index 100%
rename from tests/ref/border_collapse_missing_cell_ref.html
rename to tests/wpt/mozilla/tests/css/border_collapse_missing_cell_ref.html
diff --git a/tests/ref/noteq_500x300_white.html b/tests/wpt/mozilla/tests/css/noteq_500x300_white.html
similarity index 100%
rename from tests/ref/noteq_500x300_white.html
rename to tests/wpt/mozilla/tests/css/noteq_500x300_white.html