diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-001.htm.ini
deleted file mode 100644
index d6fb8356981..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-001.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-002.htm.ini
deleted file mode 100644
index 77fd440b3fd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-002.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-003.htm.ini
deleted file mode 100644
index a69aa79a8e9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-003.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-004.htm.ini
deleted file mode 100644
index eda16b797a0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-004.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-007.htm.ini
deleted file mode 100644
index 9cd0f006e84..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-007.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-013.htm.ini
deleted file mode 100644
index a8f2f01595f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-attachment-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-attachment-applies-to-013.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-applies-to-007.htm.ini
deleted file mode 100644
index b4db6fc0ec5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[background-repeat-applies-to-007.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmult-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmult-000.htm.ini
deleted file mode 100644
index 701559c9ddc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmult-000.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltmult-000.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-001.htm.ini
deleted file mode 100644
index b5dbe2c9c8d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-001.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-002.htm.ini
deleted file mode 100644
index b815b8d3b20..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-002.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-003.htm.ini
deleted file mode 100644
index 2d3b43a67e0..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-003.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-004.htm.ini
deleted file mode 100644
index 8cf58ec5d56..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-004.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-006.htm.ini
deleted file mode 100644
index cd7a766a003..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-006.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-007.htm.ini
deleted file mode 100644
index 9b43e802cf5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-007.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-013.htm.ini
deleted file mode 100644
index a3c2b0d532d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/line-height-applies-to-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-height-applies-to-013.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-001.htm.ini
deleted file mode 100644
index b73ad8554ee..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-001.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-002.htm.ini
deleted file mode 100644
index b13cce3b5c4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-002.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-003.htm.ini
deleted file mode 100644
index 25bc328010c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-003.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-004.htm.ini
deleted file mode 100644
index e11b53653d5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-004.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-006.htm.ini
deleted file mode 100644
index f02a0f1d3cf..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-006.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-007.htm.ini
deleted file mode 100644
index d86b9f9d430..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-007.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
index c7e1e1f65d2..9e2f33bfcec 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/run-in-basic-017.htm.ini
@@ -1,3 +1,3 @@
[run-in-basic-017.htm]
type: reftest
- expected: FAIL
\ No newline at end of file
+ expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026a.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026a.htm.ini
deleted file mode 100644
index f9e74fd4bca..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-visual-layout-026a.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026b.htm.ini
deleted file mode 100644
index 1c58d7bd885..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-visual-layout-026b.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026c.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026c.htm.ini
deleted file mode 100644
index 953aff57cd8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026c.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-visual-layout-026c.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026d.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026d.htm.ini
deleted file mode 100644
index 3dd07a1e74b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/table-visual-layout-026d.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-visual-layout-026d.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/vertical-align-baseline-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/vertical-align-baseline-009.htm.ini
new file mode 100644
index 00000000000..e851b181977
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/vertical-align-baseline-009.htm.ini
@@ -0,0 +1,3 @@
+[vertical-align-baseline-009.htm]
+ type: reftest
+ expected: FAIL