diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flexitem-childmargin.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flexitem-childmargin.htm.ini
deleted file mode 100644
index 33b2beefa68..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flexitem-childmargin.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flexitem-childmargin.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini
deleted file mode 100644
index 0b4084807bf..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-stretch-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_first-line.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_first-line.htm.ini
deleted file mode 100644
index 9d900f41c12..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_first-line.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_first-line.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_generated.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_generated.htm.ini
deleted file mode 100644
index 95e949a063e..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_generated.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_generated.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-bottom-float.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-bottom-float.htm.ini
deleted file mode 100644
index 902f129c2cc..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-bottom-float.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_item-bottom-float.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-top-float.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-top-float.htm.ini
deleted file mode 100644
index f498836c94c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-top-float.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_item-top-float.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_stf-table-caption.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_stf-table-caption.htm.ini
deleted file mode 100644
index d09ec474445..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_stf-table-caption.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_stf-table-caption.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-reverse-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-reverse-row-reverse.htm.ini
deleted file mode 100644
index 091d9decb05..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-reverse-row-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multi-line-wrap-reverse-row-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-with-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-with-row-reverse.htm.ini
deleted file mode 100644
index 190569d7f38..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/multi-line-wrap-with-row-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multi-line-wrap-with-row-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-008.htm.ini
deleted file mode 100644
index 4102d9e6f43..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[after-content-display-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-009.htm.ini
deleted file mode 100644
index 23accfec539..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[after-content-display-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-010.htm.ini
deleted file mode 100644
index 0994a703dea..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-010.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[after-content-display-010.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-011.htm.ini
deleted file mode 100644
index ba5240a35e5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-011.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[after-content-display-011.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini
deleted file mode 100644
index ef7d0e22772..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/after-content-display-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[after-content-display-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-001.htm.ini
deleted file mode 100644
index 923cc00c34f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-002.htm.ini
deleted file mode 100644
index fa81fcf9449..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-003.htm.ini
deleted file mode 100644
index 4761d38a16f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-004.htm.ini
deleted file mode 100644
index 653f02af7fb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-007.htm.ini
deleted file mode 100644
index 209baab0a6b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-014.htm.ini
deleted file mode 100644
index 337d41b4b66..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-position-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-position-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-008.htm.ini
deleted file mode 100644
index 3a8a7505d47..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[before-content-display-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-009.htm.ini
deleted file mode 100644
index 85e3d8874f1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-009.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[before-content-display-009.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-010.htm.ini
deleted file mode 100644
index 592d2df8168..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-010.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[before-content-display-010.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-011.htm.ini
deleted file mode 100644
index 6093733738a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-011.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[before-content-display-011.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini
deleted file mode 100644
index c28b769cf95..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/before-content-display-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[before-content-display-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-009b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-009b.htm.ini
deleted file mode 100644
index b9bfc77cdba..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bidi-009b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bidi-009b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-formatting-contexts-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-formatting-contexts-001.htm.ini
deleted file mode 100644
index 5ac3b0b3cae..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/block-formatting-contexts-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-formatting-contexts-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/blocks-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/blocks-017.htm.ini
deleted file mode 100644
index a833422c66c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/blocks-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[blocks-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-013.htm.ini
deleted file mode 100644
index ba742bf1d2b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-013.htm.ini
deleted file mode 100644
index 8c389cfbd29..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-color-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-color-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-013.htm.ini
deleted file mode 100644
index 46b2f6f6370..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-013.htm.ini
deleted file mode 100644
index 6647b99e3f6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-color-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-013.htm.ini
deleted file mode 100644
index 500dec003b8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-width-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-002.htm.ini
deleted file mode 100644
index e87fdfffbb8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-003.htm.ini
deleted file mode 100644
index 50b95c731ea..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-004.htm.ini
deleted file mode 100644
index 707eb1768d0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/bottom-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c548-ln-ht-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c548-ln-ht-001.htm.ini
deleted file mode 100644
index e4abed4b86c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/c548-ln-ht-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-014.htm.ini
index 56f82b1db72..a3379e753de 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-014.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-014.htm.ini
@@ -1,3 +1,2 @@
 [color-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
+  disabled: https://github.com/servo/servo/pull/13870#issuecomment-255507790
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-014.htm.ini
deleted file mode 100644
index 80fd562da4e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-applies-to-007.htm.ini
deleted file mode 100644
index 53dbdc5d195..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/font-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-style-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-style-applies-to-007.htm.ini
deleted file mode 100644
index 5ac22a8ee3d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/font-style-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-style-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-variant-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-variant-applies-to-007.htm.ini
deleted file mode 100644
index 76826a2c542..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/font-variant-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-variant-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-weight-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-weight-applies-to-007.htm.ini
deleted file mode 100644
index c14be635621..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/font-weight-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-weight-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001.htm.ini
deleted file mode 100644
index 5893894a617..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-width-table-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001a.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001a.htm.ini
deleted file mode 100644
index 160c3069294..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-width-table-001a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001c.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001c.htm.ini
deleted file mode 100644
index f94e8cdf718..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001c.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-width-table-001c.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001d.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001d.htm.ini
deleted file mode 100644
index a9bd51137f0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/height-width-table-001d.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-width-table-001d.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/leading-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/leading-001.htm.ini
deleted file mode 100644
index cc9fa7ee711..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/leading-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[leading-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-002.htm.ini
deleted file mode 100644
index a3f2298e857..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-003.htm.ini
deleted file mode 100644
index f94053966cf..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-004.htm.ini
deleted file mode 100644
index d488a7348e0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-001.htm.ini
deleted file mode 100644
index b2fe9b0b5f8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-002.htm.ini
deleted file mode 100644
index a3ffe96023a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-013.htm.ini
deleted file mode 100644
index 684f70e7361..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-014.htm.ini
deleted file mode 100644
index da11bd1b2b2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-width-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-width-tables-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-width-tables-001.htm.ini
deleted file mode 100644
index b2c8a1cb831..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/min-width-tables-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-tables-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-001.htm.ini
deleted file mode 100644
index 042df0e879b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-002.htm.ini
deleted file mode 100644
index e6422dae39e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-003.htm.ini
deleted file mode 100644
index 5bdffb24ebd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-004.htm.ini
deleted file mode 100644
index 64999f38432..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-005.htm.ini
deleted file mode 100644
index 2ed8dacdc4a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-006.htm.ini
deleted file mode 100644
index 74c8b3d04d2..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/overflow-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-applies-to-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-001.htm.ini
deleted file mode 100644
index 68e3a73c0f4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-002.htm.ini
deleted file mode 100644
index 2691cf5647e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-001.htm.ini
deleted file mode 100644
index cacc6b71ca7..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-002.htm.ini
deleted file mode 100644
index 7db1197030e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-003.htm.ini
deleted file mode 100644
index 0cb64c16027..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-004.htm.ini
deleted file mode 100644
index 08e9e05178c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-005.htm.ini
deleted file mode 100644
index da6fe0c4372..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-006.htm.ini
deleted file mode 100644
index 5d5143fd4a6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013.htm.ini
deleted file mode 100644
index 740e15e4fd6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013a.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013a.htm.ini
deleted file mode 100644
index 750d5453e41..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-applies-to-013a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-applies-to-013a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-013.htm.ini
deleted file mode 100644
index fbe516ab411..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-applies-to-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini
deleted file mode 100644
index d0d392f62bb..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/padding-right-applies-to-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-applies-to-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-002.htm.ini
deleted file mode 100644
index bf65ef409f8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-003.htm.ini
deleted file mode 100644
index 53173334d6a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-004.htm.ini
deleted file mode 100644
index e3e8448f652..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/position-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-001.htm.ini
deleted file mode 100644
index 980b053046d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-002.htm.ini
deleted file mode 100644
index 8fe13474b47..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-003.htm.ini
deleted file mode 100644
index 9a1e859e300..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-004.htm.ini
deleted file mode 100644
index 4a897a79eec..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini
deleted file mode 100644
index 95b1c045605..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-table-cell-between-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini
deleted file mode 100644
index 5ab8feb447e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-cell-between-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-table-cell-between-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-001.htm.ini
deleted file mode 100644
index 7213363350d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-table-row-between-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-002.htm.ini
deleted file mode 100644
index a6a3926d8c8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-table-row-between-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[run-in-table-row-between-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004b.htm.ini
deleted file mode 100644
index 2898ad05950..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[separated-border-model-004b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004d.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004d.htm.ini
deleted file mode 100644
index ff513de9fa0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/separated-border-model-004d.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[separated-border-model-004d.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-009.htm.ini
index 1366343ed8b..c76f6dc5465 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-009.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-009.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-009.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-010.htm.ini
index e2e8e4a4c7c..542a08bf991 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-010.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-010.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-010.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-011.htm.ini
index 7385a9e0cb2..6deaadb5daf 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-011.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-011.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-011.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-012.htm.ini
index 4616d55a853..8db3053a8bb 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-012.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-012.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-012.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-017.htm.ini
index 455677a9224..e6d3a7d416b 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-017.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-017.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-017.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-018.htm.ini
index 1f6a49855cc..47b891155db 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-018.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-018.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-018.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-019.htm.ini
index b46cdf96e13..79af166780a 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-019.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-019.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-019.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-020.htm.ini
index 1dacaae6a70..793ca9e9db1 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-020.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-020.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-020.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-197.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-197.htm.ini
index a7d29fc2b86..37c10a79c8f 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-197.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-197.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-197.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-198.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-198.htm.ini
index 20f797374a2..2f7f2b0d35d 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-198.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-198.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-198.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-199.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-199.htm.ini
index 42887997021..ea0f8a4a7d6 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-199.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-199.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-199.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-200.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-200.htm.ini
index 30575080164..cd4c0ff3f30 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-200.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-200.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-200.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-201.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-201.htm.ini
index 7d20abab634..253cdd03b81 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-201.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-201.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-201.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-202.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-202.htm.ini
index 18beb502110..76fc9446aa0 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-202.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-202.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-202.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-203.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-203.htm.ini
index a184ca0e1de..27be258b157 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-203.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-203.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-203.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-204.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-204.htm.ini
index a609a1d95ae..0808d2e51f6 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-204.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-204.htm.ini
@@ -1,3 +1,4 @@
 [table-anonymous-objects-204.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-margin-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-margin-004.htm.ini
deleted file mode 100644
index 970daa31570..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/table-margin-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-margin-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/text-decoration-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/text-decoration-applies-to-007.htm.ini
deleted file mode 100644
index ed7b1e557c8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/text-decoration-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-decoration-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/text-transform-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/text-transform-applies-to-007.htm.ini
deleted file mode 100644
index cc4a394b3c8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/text-transform-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-applies-to-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini
deleted file mode 100644
index 3814d112c34..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini
deleted file mode 100644
index f791160c7d4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini
deleted file mode 100644
index 866983b0a4a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/top-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-applies-to-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-001.htm.ini
deleted file mode 100644
index 87833226be9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[white-space-normal-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-002.htm.ini
deleted file mode 100644
index 8d564d11d91..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/white-space-normal-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[white-space-normal-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/mediaqueries-3_dev/html/min-width-tables-001.htm.ini b/tests/wpt/metadata-css/mediaqueries-3_dev/html/min-width-tables-001.htm.ini
deleted file mode 100644
index b2c8a1cb831..00000000000
--- a/tests/wpt/metadata-css/mediaqueries-3_dev/html/min-width-tables-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-tables-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 1be92d74c52..c8a5b8bd240 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -1424,6 +1424,18 @@
             "url": "/_mozilla/css/dirty_viewport.html"
           }
         ],
+        "css/display_table_cell_intrinsic_width_a.html": [
+          {
+            "path": "css/display_table_cell_intrinsic_width_a.html",
+            "references": [
+              [
+                "/_mozilla/css/display_table_cell_intrinsic_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/display_table_cell_intrinsic_width_a.html"
+          }
+        ],
         "css/empty_cells_a.html": [
           {
             "path": "css/empty_cells_a.html",
@@ -5982,18 +5994,6 @@
             "url": "/_mozilla/css/white-space-mixed-002.htm"
           }
         ],
-        "css/white-space-normal-001.htm": [
-          {
-            "path": "css/white-space-normal-001.htm",
-            "references": [
-              [
-                "/_mozilla/css/white-space-normal-001-ref.htm",
-                "=="
-              ]
-            ],
-            "url": "/_mozilla/css/white-space-normal-001.htm"
-          }
-        ],
         "css/white-space-pre-line.htm": [
           {
             "path": "css/white-space-pre-line.htm",
@@ -15272,6 +15272,18 @@
           "url": "/_mozilla/css/dirty_viewport.html"
         }
       ],
+      "css/display_table_cell_intrinsic_width_a.html": [
+        {
+          "path": "css/display_table_cell_intrinsic_width_a.html",
+          "references": [
+            [
+              "/_mozilla/css/display_table_cell_intrinsic_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/display_table_cell_intrinsic_width_a.html"
+        }
+      ],
       "css/empty_cells_a.html": [
         {
           "path": "css/empty_cells_a.html",
@@ -19842,18 +19854,6 @@
           "url": "/_mozilla/css/white-space-mixed-002.htm"
         }
       ],
-      "css/white-space-normal-001.htm": [
-        {
-          "path": "css/white-space-normal-001.htm",
-          "references": [
-            [
-              "/_mozilla/css/white-space-normal-001-ref.htm",
-              "=="
-            ]
-          ],
-          "url": "/_mozilla/css/white-space-normal-001.htm"
-        }
-      ],
       "css/white-space-pre-line.htm": [
         {
           "path": "css/white-space-pre-line.htm",
diff --git a/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_a.html
new file mode 100644
index 00000000000..ad9ab9863bc
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_a.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="match" href="display_table_cell_intrinsic_width_ref.html">
+<style>
+body, html {
+    margin: 0;
+}
+table, tbody, tr, td {
+    padding: 0;
+    margin: 0;
+    border: none;
+    border-collapse: collapse;
+}
+</style>
+<div style="display: table-cell">Hello world</div>
diff --git a/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_ref.html b/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_ref.html
new file mode 100644
index 00000000000..7661dd6adf1
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/display_table_cell_intrinsic_width_ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+body, html {
+    margin: 0;
+}
+table, tbody, tr, td {
+    padding: 0;
+    margin: 0;
+    border: none;
+    border-collapse: collapse;
+}
+</style>
+<table><tr><td>Hello world</td></tr></table>
+
diff --git a/tests/wpt/mozilla/tests/css/white-space-normal-001-ref.htm b/tests/wpt/mozilla/tests/css/white-space-normal-001-ref.htm
deleted file mode 100644
index 07d1680fe49..00000000000
--- a/tests/wpt/mozilla/tests/css/white-space-normal-001-ref.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- This is a lightly modified copy of
-     tests/wpt/css-tests/css21_dev/html4/reference/white-space-normal-001-ref.htm,
-     changed to work around a bug in Servo's margin handling (?).
--->
-<html>
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-
-  <style type="text/css">
-  div
-  {
-  background-color: green;
-  border: black solid medium;
-  height: 120px;
-  text-align: center;
-  width: 60px;
-  margin-top: 19px;
-  }
-  
-  img
-  {
-  vertical-align: top;
-  }
-  
-  </style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there is a rectangle with 3 columns (1 dark green, 1 light green and then 1 dark green) and if there is <strong>no red</strong>.</p>
-
-  <div><img src="swatch-lime.png" width="20" height="120" alt="Image download support must be enabled"></div>
-
- </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/css/white-space-normal-001.htm b/tests/wpt/mozilla/tests/css/white-space-normal-001.htm
deleted file mode 100644
index 33eef923592..00000000000
--- a/tests/wpt/mozilla/tests/css/white-space-normal-001.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- This is an exact copy of tests/wpt/css-tests/css21_dev/html4/white-space-normal-001.htm;
-     the corresponding reference page is modified so Servo passes.
--->
-<html>
- <head>
-  <title>CSS Test: white-space normal: simple tests</title>
-  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
-  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-06-29 -->
-  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/001.html" type="text/html">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
-  <link rel="match" href="white-space-normal-001-ref.htm">
-
-  <meta name="flags" content="ahem">
-
-  <style type="text/css">
-   * { white-space: normal; }
-   div { display: block; }
-   span { display: inline; }
-   table { padding: 0; border-spacing: 0; border: solid; }
-   td { font: 20px/1 Ahem; color: red; background: red; padding: 0; }
-   .red { background: red; }
-   .green { color: green; background: lime; }
-   .check { width: 3em; background: lime; color: green; }
-  </style>
- </head>
- <body>
-  <p>Test passes if there is a rectangle with 3 columns (1 dark green, 1 light green and then 1 dark green) and if there is <strong>no red</strong>.</p>
-  <table>
-   <tr>
-    <td>
-     <div class="red"> </div>
-     <div class="red"> <div></div></div>
-     <div class="red"> <div> </div></div>
-     <div class="red"><div> </div></div>
-     <div class="red"><div> </div> </div>
-     <div class="red"><div></div> </div>
-     <div class="red"> <div></div> </div>
-     <div class="red"> <div> </div> </div>
-     <div class="green"><span>X</span> <span>X</span></div>
-     <div class="green"> <span>X</span> <span>X</span></div>
-     <div class="green"><span>X</span> <span>X</span> </div>
-     <div class="green"> <div></div> <span>X</span> <span>X</span> </div>
-     <div class="green"> <span>X</span> <span>X</span> <div></div> </div>
-     <div class="check">X X</div>
-    </td>
-   </tr>
-  </table>
- </body>
-</html>