diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini
new file mode 100644
index 00000000000..9a99c2d9f53
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini
@@ -0,0 +1,2 @@
+[flex-aspect-ratio-img-column-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
deleted file mode 100644
index 3fb853b53f8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-row-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini
new file mode 100644
index 00000000000..ac4180f61a7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-004.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini
new file mode 100644
index 00000000000..ca977d8203d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini
new file mode 100644
index 00000000000..06b866be1a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini
new file mode 100644
index 00000000000..59646670c59
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-020.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-012.html.ini
deleted file mode 100644
index 7d30e64e0cc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-012.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html.ini
deleted file mode 100644
index 16e2fab0c39..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-definite-cross-size-constrained-percentage.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
deleted file mode 100644
index 2afbeeb72ed..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-whitespace-handling-001a.xhtml]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml.ini
deleted file mode 100644
index e8e9d4e0582..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-whitespace-handling-001b.xhtml]
-  expected: FAIL