10 files changed, 80 insertions, 12 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 68a81c1b76d..fdd53a653ab 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -1,18 +1,9 @@
 # This file must be sorted alphabetically.
 # Please run `./mach test-tidy` to check your changes.
 
-
-# Should be != with expected failure:
-# FIXME: use the real test when pixel-snapping for scrolling is fixed.
-#fragment=top == ../html/acid2.html acid2_ref_broken.html
-
 # Should be == with expected failure:
 fragment=top != ../html/acid2.html acid2_ref.html
 
-== acid2_noscroll.html acid2_ref_broken.html
-flaky_cpu == append_style_a.html append_style_b.html
-# `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
-
 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
 resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html
@@ -20,8 +11,5 @@ resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmi
 resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.html
 # resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html
 
-flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html
-
-
 # This file must be sorted alphabetically.
 # Please run `./mach test-tidy` to check your changes.
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index cdb4e4b59ae..cfa25fec76d 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -151,6 +151,18 @@
             "url": "/_mozilla/css/acid1_a.html"
           }
         ],
+        "css/acid2_noscroll.html": [
+          {
+            "path": "css/acid2_noscroll.html",
+            "references": [
+              [
+                "/_mozilla/css/acid2_ref_broken.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/acid2_noscroll.html"
+          }
+        ],
         "css/after_block_iteration.html": [
           {
             "path": "css/after_block_iteration.html",
@@ -199,6 +211,18 @@
             "url": "/_mozilla/css/anon_block_inherit_a.html"
           }
         ],
+        "css/append_style_a.html": [
+          {
+            "path": "css/append_style_a.html",
+            "references": [
+              [
+                "/_mozilla/css/append_style_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/append_style_a.html"
+          }
+        ],
         "css/attr_exists_selector.html": [
           {
             "path": "css/attr_exists_selector.html",
@@ -4891,6 +4915,18 @@
             "url": "/_mozilla/css/white-space-pre-wrap.htm"
           }
         ],
+        "css/white_space_intrinsic_sizes_a.html": [
+          {
+            "path": "css/white_space_intrinsic_sizes_a.html",
+            "references": [
+              [
+                "/_mozilla/css/white_space_intrinsic_sizes_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/white_space_intrinsic_sizes_a.html"
+          }
+        ],
         "css/whitespace_nowrap_a.html": [
           {
             "path": "css/whitespace_nowrap_a.html",
@@ -5982,6 +6018,18 @@
           "url": "/_mozilla/css/acid1_a.html"
         }
       ],
+      "css/acid2_noscroll.html": [
+        {
+          "path": "css/acid2_noscroll.html",
+          "references": [
+            [
+              "/_mozilla/css/acid2_ref_broken.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/acid2_noscroll.html"
+        }
+      ],
       "css/after_block_iteration.html": [
         {
           "path": "css/after_block_iteration.html",
@@ -6030,6 +6078,18 @@
           "url": "/_mozilla/css/anon_block_inherit_a.html"
         }
       ],
+      "css/append_style_a.html": [
+        {
+          "path": "css/append_style_a.html",
+          "references": [
+            [
+              "/_mozilla/css/append_style_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/append_style_a.html"
+        }
+      ],
       "css/attr_exists_selector.html": [
         {
           "path": "css/attr_exists_selector.html",
@@ -10722,6 +10782,18 @@
           "url": "/_mozilla/css/white-space-pre-wrap.htm"
         }
       ],
+      "css/white_space_intrinsic_sizes_a.html": [
+        {
+          "path": "css/white_space_intrinsic_sizes_a.html",
+          "references": [
+            [
+              "/_mozilla/css/white_space_intrinsic_sizes_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/white_space_intrinsic_sizes_a.html"
+        }
+      ],
       "css/whitespace_nowrap_a.html": [
         {
           "path": "css/whitespace_nowrap_a.html",
diff --git a/tests/wpt/mozilla/meta/css/white_space_intrinsic_sizes_a.html.ini b/tests/wpt/mozilla/meta/css/white_space_intrinsic_sizes_a.html.ini
new file mode 100644
index 00000000000..5e63331f2f8
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/white_space_intrinsic_sizes_a.html.ini
@@ -0,0 +1,5 @@
+[white_space_intrinsic_sizes_a.html]
+  type: reftest
+  expected:
+    if os == "mac": FAIL
+  bug: https://github.com/servo/servo/issues/3926
diff --git a/tests/ref/acid2_noscroll.html b/tests/wpt/mozilla/tests/css/acid2_noscroll.html
index 9dc184e9ee5..0af3ae3c263 100755
--- a/tests/ref/acid2_noscroll.html
+++ b/tests/wpt/mozilla/tests/css/acid2_noscroll.html
@@ -2,6 +2,7 @@
 <html>
  <head>
   <title>The Second Acid Test</title>
+  <link rel=match href=acid2_ref_broken.html>
   <style>
     /* This disables the "scroll" part of the test,
        which causes layering bugs */
diff --git a/tests/ref/acid2_ref_broken.html b/tests/wpt/mozilla/tests/css/acid2_ref_broken.html
index aecefd1ef02..aecefd1ef02 100644
--- a/tests/ref/acid2_ref_broken.html
+++ b/tests/wpt/mozilla/tests/css/acid2_ref_broken.html
diff --git a/tests/ref/acid2_ref_broken.png b/tests/wpt/mozilla/tests/css/acid2_ref_broken.png
index 4076473cec3..4076473cec3 100644
--- a/tests/ref/acid2_ref_broken.png
+++ b/tests/wpt/mozilla/tests/css/acid2_ref_broken.png
diff --git a/tests/ref/append_style_a.html b/tests/wpt/mozilla/tests/css/append_style_a.html
index 40521ba3d08..3856eb98f47 100644
--- a/tests/ref/append_style_a.html
+++ b/tests/wpt/mozilla/tests/css/append_style_a.html
@@ -1 +1,2 @@
+<link rel=match href=append_style_b.html>
 <div style="background-color: blue">this is the story of a girl</div>
diff --git a/tests/ref/append_style_b.html b/tests/wpt/mozilla/tests/css/append_style_b.html
index 4792dbc86e2..4792dbc86e2 100644
--- a/tests/ref/append_style_b.html
+++ b/tests/wpt/mozilla/tests/css/append_style_b.html
diff --git a/tests/ref/white_space_intrinsic_sizes_a.html b/tests/wpt/mozilla/tests/css/white_space_intrinsic_sizes_a.html
index 87944c21b5c..66d7a80ce37 100644
--- a/tests/ref/white_space_intrinsic_sizes_a.html
+++ b/tests/wpt/mozilla/tests/css/white_space_intrinsic_sizes_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel=match href=white_space_intrinsic_sizes_ref.html>
 <style type="text/css">
     table {
         width: 0;
diff --git a/tests/ref/white_space_intrinsic_sizes_ref.html b/tests/wpt/mozilla/tests/css/white_space_intrinsic_sizes_ref.html
index cd54f8a7e08..cd54f8a7e08 100644
--- a/tests/ref/white_space_intrinsic_sizes_ref.html
+++ b/tests/wpt/mozilla/tests/css/white_space_intrinsic_sizes_ref.html