diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
index 8799559f606a..c7786c737b74 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini
@@ -1,4 +1,3 @@
 [bidi-inline-002.htm]
   type: reftest
-  expected:
-    FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini
index ab3603941f4b..ba414f439d78 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-001.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini
index 60a49fe7aaa8..344a81e5d9d7 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-002.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini
index cde9f2329981..b8b1b0ca3902 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-003.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini
index 0c5661bef277..0398928458f8 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-004.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini
index 6f46650ed112..54b95f28a880 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-005.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini
index e6b4863e833b..662545c687bb 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-006.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini
index 02cd3c896337..6bdca5570df9 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-013.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini
index b714bd5970c4..d8f2b123aa4f 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini
@@ -1,5 +1,4 @@
 [color-applies-to-015.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini
index 9a59e20f3e13..d12254cd75b3 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini
@@ -1,6 +1,5 @@
 [content-177.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini
index b4d85ed114fa..85b6be4b7bd6 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini
@@ -1,5 +1,4 @@
 [display-008.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini
index 94195c57f4be..d5367595bfd8 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini
@@ -1,5 +1,4 @@
 [display-009.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini
index f0c85310fbe8..6bfc3a2f34fd 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini
@@ -1,5 +1,4 @@
 [float-applies-to-008.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini
index bdd6d07ad726..9e64e8f7e3c2 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini
@@ -1,6 +1,5 @@
 [font-size-001.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini
index 8171afcb2239..5731311dbe01 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini
@@ -1,6 +1,5 @@
 [font-size-002.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini
index ac81bc9ab2c2..94d29b0f40aa 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini
@@ -1,6 +1,5 @@
 [font-size-004.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini
index c83b8734ddc5..5340c65b0a95 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini
@@ -1,6 +1,5 @@
 [font-size-005.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini
index 711f72ccb045..d9bfede5725b 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini
@@ -1,6 +1,5 @@
 [font-size-089.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini
index 6111233ae38b..741d5d9ba11f 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini
@@ -1,6 +1,5 @@
 [font-size-090.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini
index 37703eee6e23..5ea584fad663 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini
@@ -1,6 +1,5 @@
 [font-size-092.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini
index 7efd92200c83..386cbbc9860c 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini
@@ -1,6 +1,5 @@
 [font-size-093.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini
index 7a681eac175c..db17fbfe0832 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini
@@ -1,6 +1,5 @@
 [font-size-100.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini
index ce8e724dee19..fa36de044eef 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini
@@ -1,6 +1,5 @@
 [font-size-101.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini
index 0560a6173ac2..b832dd2c35ec 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini
@@ -1,6 +1,5 @@
 [font-size-102.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
index 851b6361a1b6..4b008a8af9bd 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
@@ -1,5 +1,4 @@
 [inline-block-zorder-003.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini
index 474689943eaa..42db7e86e868 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini
@@ -1,5 +1,4 @@
 [inline-formatting-context-004.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini
index e416e6739897..11735f272d89 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini
@@ -1,5 +1,4 @@
 [inline-formatting-context-005.htm]
   type: reftest
   expected:
-    if (os == "mac") and (version == "OS X 10.8.5"): FAIL
-    if (os == "mac") and (version == "OS X 10.10.3"): FAIL
+    if (os == "mac"): FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
index c99b04cc5369..8f3fd2946a61 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
@@ -1,4 +1,3 @@
 [inline-formatting-context-023.htm]
   type: reftest
-  expected:
-    FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini
index 25e9af4d2c57..b849e528bdd6 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini
@@ -1,6 +1,5 @@
 [line-height-121.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini
index be863f60ab71..f3c5085851b5 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini
@@ -1,6 +1,5 @@
 [line-height-127.htm]
   type: reftest
   expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
+    if (os == "mac"): PASS
     FAIL