diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index ead25bc53d7..ce35db3cf9a 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -34,17 +34,7 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m
 == iframe/stacking_context.html iframe/stacking_context_ref.html
 == iframe/stacking_context_position_a.html iframe/stacking_context_position_ref.html
 
-!= inline_background_a.html inline_background_ref.html
-== inline_block_margin_auto_a.html inline_block_margin_auto_ref.html
-== inline_block_parent_width.html inline_block_parent_width_ref.html
-== inline_block_parent_width_percentage.html inline_block_parent_width_ref.html
 # inline_border_a.html inline_border_b.html
-== inline_whitespace_a.html inline_whitespace_ref.html
-== inline_whitespace_b.html inline_whitespace_ref.html
-!= input_height_a.html input_height_ref.html
-!= inset_blackborder.html blackborder_ref.html
-== jpeg_normal.html jpeg_ref.html
-== jpeg_progressive.html jpeg_ref.html
 == legacy_cellspacing_attribute_a.html border_spacing_ref.html
 == legacy_td_width_attribute_a.html legacy_td_width_attribute_ref.html
 == legacy_th_width_attribute_a.html legacy_td_width_attribute_ref.html
@@ -62,7 +52,6 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
 != octicons_a.html octicons_ref.html
 == ol_japanese_iroha_a.html ol_japanese_iroha_ref.html
 != ol_japanese_iroha_bullet_styles.html ol_japanese_iroha_ref.html
-!= outset_blackborder.html blackborder_ref.html
 # Should be == with expected failure. See #2797
 != overconstrained_block.html overconstrained_block_ref.html
 == overflow_auto.html overflow_simple_b.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 340cbde980b..fe522509cdf 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -1763,6 +1763,18 @@
             "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
           }
         ],
+        "css/inline_background_a.html": [
+          {
+            "path": "css/inline_background_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_background_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_background_a.html"
+          }
+        ],
         "css/inline_block_baseline_a.html": [
           {
             "path": "css/inline_block_baseline_a.html",
@@ -1835,6 +1847,18 @@
             "url": "/_mozilla/css/inline_block_margin_a.html"
           }
         ],
+        "css/inline_block_margin_auto_a.html": [
+          {
+            "path": "css/inline_block_margin_auto_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_margin_auto_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_margin_auto_a.html"
+          }
+        ],
         "css/inline_block_margin_auto_zero_a.html": [
           {
             "path": "css/inline_block_margin_auto_zero_a.html",
@@ -1895,6 +1919,30 @@
             "url": "/_mozilla/css/inline_block_parent_padding_a.html"
           }
         ],
+        "css/inline_block_parent_width.html": [
+          {
+            "path": "css/inline_block_parent_width.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_parent_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_parent_width.html"
+          }
+        ],
+        "css/inline_block_parent_width_percentage.html": [
+          {
+            "path": "css/inline_block_parent_width_percentage.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_block_parent_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_block_parent_width_percentage.html"
+          }
+        ],
         "css/inline_block_percentage_height_a.html": [
           {
             "path": "css/inline_block_percentage_height_a.html",
@@ -2027,6 +2075,30 @@
             "url": "/_mozilla/css/inline_text_align_a.html"
           }
         ],
+        "css/inline_whitespace_a.html": [
+          {
+            "path": "css/inline_whitespace_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_whitespace_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_whitespace_a.html"
+          }
+        ],
+        "css/inline_whitespace_b.html": [
+          {
+            "path": "css/inline_whitespace_b.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_whitespace_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_whitespace_b.html"
+          }
+        ],
         "css/input_button_margins_a.html": [
           {
             "path": "css/input_button_margins_a.html",
@@ -2051,6 +2123,18 @@
             "url": "/_mozilla/css/input_button_size_a.html"
           }
         ],
+        "css/input_height_a.html": [
+          {
+            "path": "css/input_height_a.html",
+            "references": [
+              [
+                "/_mozilla/css/input_height_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/input_height_a.html"
+          }
+        ],
         "css/inset.html": [
           {
             "path": "css/inset.html",
@@ -2063,6 +2147,18 @@
             "url": "/_mozilla/css/inset.html"
           }
         ],
+        "css/inset_blackborder.html": [
+          {
+            "path": "css/inset_blackborder.html",
+            "references": [
+              [
+                "/_mozilla/css/blackborder_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/inset_blackborder.html"
+          }
+        ],
         "css/issue-1324.html": [
           {
             "path": "css/issue-1324.html",
@@ -2075,6 +2171,30 @@
             "url": "/_mozilla/css/issue-1324.html"
           }
         ],
+        "css/jpeg_normal.html": [
+          {
+            "path": "css/jpeg_normal.html",
+            "references": [
+              [
+                "/_mozilla/css/jpeg_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/jpeg_normal.html"
+          }
+        ],
+        "css/jpeg_progressive.html": [
+          {
+            "path": "css/jpeg_progressive.html",
+            "references": [
+              [
+                "/_mozilla/css/jpeg_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/jpeg_progressive.html"
+          }
+        ],
         "css/jumpiness_a.html": [
           {
             "path": "css/jumpiness_a.html",
@@ -2675,6 +2795,18 @@
             "url": "/_mozilla/css/outset.html"
           }
         ],
+        "css/outset_blackborder.html": [
+          {
+            "path": "css/outset_blackborder.html",
+            "references": [
+              [
+                "/_mozilla/css/blackborder_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/outset_blackborder.html"
+          }
+        ],
         "css/overflow_auto_stacking_order_a.html": [
           {
             "path": "css/overflow_auto_stacking_order_a.html",
@@ -6696,6 +6828,18 @@
           "url": "/_mozilla/css/inline_absolute_out_of_flow_a.html"
         }
       ],
+      "css/inline_background_a.html": [
+        {
+          "path": "css/inline_background_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_background_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_background_a.html"
+        }
+      ],
       "css/inline_block_baseline_a.html": [
         {
           "path": "css/inline_block_baseline_a.html",
@@ -6768,6 +6912,18 @@
           "url": "/_mozilla/css/inline_block_margin_a.html"
         }
       ],
+      "css/inline_block_margin_auto_a.html": [
+        {
+          "path": "css/inline_block_margin_auto_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_margin_auto_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_margin_auto_a.html"
+        }
+      ],
       "css/inline_block_margin_auto_zero_a.html": [
         {
           "path": "css/inline_block_margin_auto_zero_a.html",
@@ -6828,6 +6984,30 @@
           "url": "/_mozilla/css/inline_block_parent_padding_a.html"
         }
       ],
+      "css/inline_block_parent_width.html": [
+        {
+          "path": "css/inline_block_parent_width.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_parent_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_parent_width.html"
+        }
+      ],
+      "css/inline_block_parent_width_percentage.html": [
+        {
+          "path": "css/inline_block_parent_width_percentage.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_block_parent_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_block_parent_width_percentage.html"
+        }
+      ],
       "css/inline_block_percentage_height_a.html": [
         {
           "path": "css/inline_block_percentage_height_a.html",
@@ -6960,6 +7140,30 @@
           "url": "/_mozilla/css/inline_text_align_a.html"
         }
       ],
+      "css/inline_whitespace_a.html": [
+        {
+          "path": "css/inline_whitespace_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_whitespace_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_whitespace_a.html"
+        }
+      ],
+      "css/inline_whitespace_b.html": [
+        {
+          "path": "css/inline_whitespace_b.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_whitespace_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_whitespace_b.html"
+        }
+      ],
       "css/input_button_margins_a.html": [
         {
           "path": "css/input_button_margins_a.html",
@@ -6984,6 +7188,18 @@
           "url": "/_mozilla/css/input_button_size_a.html"
         }
       ],
+      "css/input_height_a.html": [
+        {
+          "path": "css/input_height_a.html",
+          "references": [
+            [
+              "/_mozilla/css/input_height_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/input_height_a.html"
+        }
+      ],
       "css/inset.html": [
         {
           "path": "css/inset.html",
@@ -6996,6 +7212,18 @@
           "url": "/_mozilla/css/inset.html"
         }
       ],
+      "css/inset_blackborder.html": [
+        {
+          "path": "css/inset_blackborder.html",
+          "references": [
+            [
+              "/_mozilla/css/blackborder_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/inset_blackborder.html"
+        }
+      ],
       "css/issue-1324.html": [
         {
           "path": "css/issue-1324.html",
@@ -7008,6 +7236,30 @@
           "url": "/_mozilla/css/issue-1324.html"
         }
       ],
+      "css/jpeg_normal.html": [
+        {
+          "path": "css/jpeg_normal.html",
+          "references": [
+            [
+              "/_mozilla/css/jpeg_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/jpeg_normal.html"
+        }
+      ],
+      "css/jpeg_progressive.html": [
+        {
+          "path": "css/jpeg_progressive.html",
+          "references": [
+            [
+              "/_mozilla/css/jpeg_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/jpeg_progressive.html"
+        }
+      ],
       "css/jumpiness_a.html": [
         {
           "path": "css/jumpiness_a.html",
@@ -7608,6 +7860,18 @@
           "url": "/_mozilla/css/outset.html"
         }
       ],
+      "css/outset_blackborder.html": [
+        {
+          "path": "css/outset_blackborder.html",
+          "references": [
+            [
+              "/_mozilla/css/blackborder_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/outset_blackborder.html"
+        }
+      ],
       "css/overflow_auto_stacking_order_a.html": [
         {
           "path": "css/overflow_auto_stacking_order_a.html",
diff --git a/tests/ref/blackborder_ref.html b/tests/wpt/mozilla/tests/css/blackborder_ref.html
similarity index 100%
rename from tests/ref/blackborder_ref.html
rename to tests/wpt/mozilla/tests/css/blackborder_ref.html
diff --git a/tests/ref/inline_background_a.html b/tests/wpt/mozilla/tests/css/inline_background_a.html
similarity index 87%
rename from tests/ref/inline_background_a.html
rename to tests/wpt/mozilla/tests/css/inline_background_a.html
index 58a34046d5d..31b45aabe15 100644
--- a/tests/ref/inline_background_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_background_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
+        <link rel=mismatch href=inline_background_ref.html>
         <style type="text/css">
         .white {
             color: white;
diff --git a/tests/ref/inline_background_ref.html b/tests/wpt/mozilla/tests/css/inline_background_ref.html
similarity index 100%
rename from tests/ref/inline_background_ref.html
rename to tests/wpt/mozilla/tests/css/inline_background_ref.html
diff --git a/tests/ref/inline_block_margin_auto_a.html b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_a.html
similarity index 83%
rename from tests/ref/inline_block_margin_auto_a.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_auto_a.html
index 3fa23c34563..cba325fd717 100644
--- a/tests/ref/inline_block_margin_auto_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_a.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=match href=inline_block_margin_auto_ref.html>
 <style>
 html, body {
     margin: 0;
diff --git a/tests/ref/inline_block_margin_auto_ref.html b/tests/wpt/mozilla/tests/css/inline_block_margin_auto_ref.html
similarity index 100%
rename from tests/ref/inline_block_margin_auto_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_margin_auto_ref.html
diff --git a/tests/ref/inline_block_parent_width.html b/tests/wpt/mozilla/tests/css/inline_block_parent_width.html
similarity index 89%
rename from tests/ref/inline_block_parent_width.html
rename to tests/wpt/mozilla/tests/css/inline_block_parent_width.html
index 520339a5a51..4a878a32d6a 100644
--- a/tests/ref/inline_block_parent_width.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_parent_width.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=inline_block_parent_width_ref.html>
 <body>
 <div style="display: block; width: 300px;">
     <div style="display: inline-block">
diff --git a/tests/ref/inline_block_parent_width_percentage.html b/tests/wpt/mozilla/tests/css/inline_block_parent_width_percentage.html
similarity index 90%
rename from tests/ref/inline_block_parent_width_percentage.html
rename to tests/wpt/mozilla/tests/css/inline_block_parent_width_percentage.html
index ed6bcf1ee89..53a04ad8382 100644
--- a/tests/ref/inline_block_parent_width_percentage.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_parent_width_percentage.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=match href=inline_block_parent_width_ref.html>
 <body>
 <div style="display: block; width: 600px;">
     <div style="width: 50%; display: inline-block;">
diff --git a/tests/ref/inline_block_parent_width_ref.html b/tests/wpt/mozilla/tests/css/inline_block_parent_width_ref.html
similarity index 100%
rename from tests/ref/inline_block_parent_width_ref.html
rename to tests/wpt/mozilla/tests/css/inline_block_parent_width_ref.html
diff --git a/tests/ref/inline_whitespace_a.html b/tests/wpt/mozilla/tests/css/inline_whitespace_a.html
similarity index 82%
rename from tests/ref/inline_whitespace_a.html
rename to tests/wpt/mozilla/tests/css/inline_whitespace_a.html
index f454de56674..930f3b3b016 100644
--- a/tests/ref/inline_whitespace_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_whitespace_a.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<link rel="stylesheet" type="text/css" href="css/ahem.css">
+		<link rel=match href=inline_whitespace_ref.html>
 		<style type="text/css">
 			body {
 				background-color: #f6f6f6;
diff --git a/tests/ref/inline_whitespace_b.html b/tests/wpt/mozilla/tests/css/inline_whitespace_b.html
similarity index 82%
rename from tests/ref/inline_whitespace_b.html
rename to tests/wpt/mozilla/tests/css/inline_whitespace_b.html
index 9e1b40ba08e..a9b1bbaf290 100644
--- a/tests/ref/inline_whitespace_b.html
+++ b/tests/wpt/mozilla/tests/css/inline_whitespace_b.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<link rel="stylesheet" type="text/css" href="css/ahem.css">
+		<link rel=match href=inline_whitespace_ref.html>
 		<style type="text/css">
 			body {
 				background-color: #f6f6f6;
diff --git a/tests/ref/inline_whitespace_ref.html b/tests/wpt/mozilla/tests/css/inline_whitespace_ref.html
similarity index 100%
rename from tests/ref/inline_whitespace_ref.html
rename to tests/wpt/mozilla/tests/css/inline_whitespace_ref.html
diff --git a/tests/ref/input_height_a.html b/tests/wpt/mozilla/tests/css/input_height_a.html
similarity index 80%
rename from tests/ref/input_height_a.html
rename to tests/wpt/mozilla/tests/css/input_height_a.html
index 7c6f7dbfa8a..9375d302eae 100644
--- a/tests/ref/input_height_a.html
+++ b/tests/wpt/mozilla/tests/css/input_height_a.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<link rel=mismatch href=input_height_ref.html>
 <body>
 <!-- We assume that inputs are not 100px high on any platform, since that would be absurd -->
 <input type=text style="height: 100px;"></input>
diff --git a/tests/ref/input_height_ref.html b/tests/wpt/mozilla/tests/css/input_height_ref.html
similarity index 100%
rename from tests/ref/input_height_ref.html
rename to tests/wpt/mozilla/tests/css/input_height_ref.html
diff --git a/tests/ref/inset_blackborder.html b/tests/wpt/mozilla/tests/css/inset_blackborder.html
similarity index 83%
rename from tests/ref/inset_blackborder.html
rename to tests/wpt/mozilla/tests/css/inset_blackborder.html
index ffacd8a7855..565760bedc2 100644
--- a/tests/ref/inset_blackborder.html
+++ b/tests/wpt/mozilla/tests/css/inset_blackborder.html
@@ -1,4 +1,5 @@
 <html>
+<link rel=mismatch href=blackborder_ref.html>
 <style>
 body {
     margin: 0px;
diff --git a/tests/ref/jpeg_normal.html b/tests/wpt/mozilla/tests/css/jpeg_normal.html
similarity index 71%
rename from tests/ref/jpeg_normal.html
rename to tests/wpt/mozilla/tests/css/jpeg_normal.html
index 51b5231f7a2..512731a03ca 100644
--- a/tests/ref/jpeg_normal.html
+++ b/tests/wpt/mozilla/tests/css/jpeg_normal.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <style type="text/css">
-    </style>
+    <link rel=match href=jpeg_ref.html>
   </head>
   <body>
     <img src="jpeg_normal.jpg">
diff --git a/tests/ref/jpeg_normal.jpg b/tests/wpt/mozilla/tests/css/jpeg_normal.jpg
similarity index 100%
rename from tests/ref/jpeg_normal.jpg
rename to tests/wpt/mozilla/tests/css/jpeg_normal.jpg
diff --git a/tests/ref/jpeg_progressive.html b/tests/wpt/mozilla/tests/css/jpeg_progressive.html
similarity index 72%
rename from tests/ref/jpeg_progressive.html
rename to tests/wpt/mozilla/tests/css/jpeg_progressive.html
index fe2bda0c2e2..447c78877fe 100644
--- a/tests/ref/jpeg_progressive.html
+++ b/tests/wpt/mozilla/tests/css/jpeg_progressive.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <style type="text/css">
-    </style>
+    <link rel=match href=jpeg_ref.html>
   </head>
   <body>
     <img src="jpeg_progressive.jpg">
diff --git a/tests/ref/jpeg_progressive.jpg b/tests/wpt/mozilla/tests/css/jpeg_progressive.jpg
similarity index 100%
rename from tests/ref/jpeg_progressive.jpg
rename to tests/wpt/mozilla/tests/css/jpeg_progressive.jpg
diff --git a/tests/ref/jpeg_ref.html b/tests/wpt/mozilla/tests/css/jpeg_ref.html
similarity index 100%
rename from tests/ref/jpeg_ref.html
rename to tests/wpt/mozilla/tests/css/jpeg_ref.html
diff --git a/tests/ref/outset_blackborder.html b/tests/wpt/mozilla/tests/css/outset_blackborder.html
similarity index 83%
rename from tests/ref/outset_blackborder.html
rename to tests/wpt/mozilla/tests/css/outset_blackborder.html
index 35cda879793..15fedb63a7d 100644
--- a/tests/ref/outset_blackborder.html
+++ b/tests/wpt/mozilla/tests/css/outset_blackborder.html
@@ -1,4 +1,5 @@
 <html>
+<link rel=mismatch href=blackborder_ref.html>
 <style>
 body {
     margin: 0px;