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
new file mode 100644
index 00000000000..0b4084807bf
--- /dev/null
+++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini
@@ -0,0 +1,3 @@
+[flexbox_align-items-stretch-2.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-inline.htm.ini
similarity index 51%
rename from tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-001.htm.ini
rename to tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-inline.htm.ini
index 1068b64b97f..4f004f76131 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-001.htm.ini
+++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-inline.htm.ini
@@ -1,3 +1,3 @@
-[c414-flt-fit-001.htm]
+[ttwf-reftest-flex-inline.htm]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini
deleted file mode 100644
index c49077dc944..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c414-flt-wrap-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini
deleted file mode 100644
index 3fbcc8501c8..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltmrgn-000.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini
deleted file mode 100644
index e4109d0f3b3..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltwidth-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini
deleted file mode 100644
index fd506d75e9d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[first-line-pseudo-014.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini
deleted file mode 100644
index db688eec6bc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[first-line-pseudo-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini
deleted file mode 100644
index aa8d5c0077b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-132.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini
deleted file mode 100644
index e93e1abaf40..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-top-below-inline-002l.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini
deleted file mode 100644
index 4ab1abcfff9..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-wrap-top-below-inline-002r.htm]
-  type: reftest
-  expected: 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
deleted file mode 100644
index 93496ef1249..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-block-zorder-003.htm]
-  type: reftest
-  expected:
-    if os == "mac": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini
deleted file mode 100644
index b8a73649761..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-replaced-width-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini
deleted file mode 100644
index 112842c664c..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-replaced-width-013.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini
deleted file mode 100644
index 467d013b3cc..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-replaced-width-015.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini
deleted file mode 100644
index 964e540a51e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini
deleted file mode 100644
index a7994c62eff..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-applies-to-012.htm]
-  type: reftest
-  expected: FAIL