diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
deleted file mode 100644
index e352ada2c97..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[anonymous-boxes-inheritance-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
new file mode 100644
index 00000000000..4823cf93169
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
new file mode 100644
index 00000000000..d362d6d33d7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
new file mode 100644
index 00000000000..83752913967
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
new file mode 100644
index 00000000000..36258eb2ff6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
new file mode 100644
index 00000000000..0151ccbabc9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
new file mode 100644
index 00000000000..344e9225521
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
new file mode 100644
index 00000000000..73e2d4c0b4b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
new file mode 100644
index 00000000000..dd630be0f54
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
new file mode 100644
index 00000000000..af40eef0a5d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-010.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
new file mode 100644
index 00000000000..34d11b26c1f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-019.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
new file mode 100644
index 00000000000..6ed5cdb642e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-020.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
new file mode 100644
index 00000000000..bcb9c73edf7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-021.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
new file mode 100644
index 00000000000..3cb914f0bd1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-022.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
new file mode 100644
index 00000000000..652b2c6aaeb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-029.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
new file mode 100644
index 00000000000..a695b3ab39f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
@@ -0,0 +1,2 @@
+[display-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
new file mode 100644
index 00000000000..79555399456
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
@@ -0,0 +1,2 @@
+[display-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
new file mode 100644
index 00000000000..d2e2bf67a12
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
@@ -0,0 +1,2 @@
+[display-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
new file mode 100644
index 00000000000..06ce0c5ef0a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
@@ -0,0 +1,2 @@
+[display-009.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
new file mode 100644
index 00000000000..a973518bec3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
@@ -0,0 +1,2 @@
+[display-010.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
new file mode 100644
index 00000000000..e4f1c95ae8d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
@@ -0,0 +1,2 @@
+[display-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
new file mode 100644
index 00000000000..ab4046e2f0a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
@@ -0,0 +1,2 @@
+[display-012.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
new file mode 100644
index 00000000000..1062e603d52
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
@@ -0,0 +1,2 @@
+[display-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
new file mode 100644
index 00000000000..106af9fd3d5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
@@ -0,0 +1,2 @@
+[display-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
new file mode 100644
index 00000000000..c8bd43b5722
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
@@ -0,0 +1,2 @@
+[display-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
new file mode 100644
index 00000000000..6b39c7c47cb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
@@ -0,0 +1,2 @@
+[display-change-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
new file mode 100644
index 00000000000..1105ba49c29
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
new file mode 100644
index 00000000000..aa7d59a4027
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
new file mode 100644
index 00000000000..608b684db5a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
new file mode 100644
index 00000000000..98aee50c690
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
@@ -0,0 +1,2 @@
+[root-box-002.xht]
+  expected: FAIL