diff --git a/tests/wpt/include-layout-2020.ini b/tests/wpt/include-layout-2020.ini
index eb6b04d3080..3e64f798792 100644
--- a/tests/wpt/include-layout-2020.ini
+++ b/tests/wpt/include-layout-2020.ini
@@ -13,6 +13,10 @@ skip: true
       skip: false
     [box-display]
       skip: false
+    [zindex]
+      skip: false
+    [zorder]
+      skip: false
   [css-backgrounds]
     skip: false
   [cssom-view]
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-001.xht.ini
new file mode 100644
index 00000000000..51b3c04a7f4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-001.xht.ini
@@ -0,0 +1,2 @@
+[stack-floats-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-002.xht.ini
new file mode 100644
index 00000000000..413e005eeda
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-002.xht.ini
@@ -0,0 +1,2 @@
+[stack-floats-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-003.xht.ini
new file mode 100644
index 00000000000..1eb716de2a9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-003.xht.ini
@@ -0,0 +1,2 @@
+[stack-floats-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-004.xht.ini
new file mode 100644
index 00000000000..0e8029cf3cb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/stack-floats-004.xht.ini
@@ -0,0 +1,2 @@
+[stack-floats-004.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-001.xht.ini
new file mode 100644
index 00000000000..be45426fd17
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-001.xht.ini
@@ -0,0 +1,2 @@
+[z-index-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-002.xht.ini
new file mode 100644
index 00000000000..c070fd97625
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-002.xht.ini
@@ -0,0 +1,2 @@
+[z-index-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-003.xht.ini
new file mode 100644
index 00000000000..e5d8191c167
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-003.xht.ini
@@ -0,0 +1,2 @@
+[z-index-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-007.xht.ini
new file mode 100644
index 00000000000..ecc9686181b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-007.xht.ini
@@ -0,0 +1,2 @@
+[z-index-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-008.xht.ini
new file mode 100644
index 00000000000..31bdee6f0aa
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-008.xht.ini
@@ -0,0 +1,2 @@
+[z-index-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-009.xht.ini
new file mode 100644
index 00000000000..9f81df5a055
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-009.xht.ini
@@ -0,0 +1,2 @@
+[z-index-009.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-010.xht.ini
new file mode 100644
index 00000000000..96a53382b48
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-010.xht.ini
@@ -0,0 +1,2 @@
+[z-index-010.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-011.xht.ini
new file mode 100644
index 00000000000..b3bfadfe8d8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-011.xht.ini
@@ -0,0 +1,2 @@
+[z-index-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-012.xht.ini
new file mode 100644
index 00000000000..3dfc42df0f4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-012.xht.ini
@@ -0,0 +1,2 @@
+[z-index-012.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-014.xht.ini
new file mode 100644
index 00000000000..ec47f89df87
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-014.xht.ini
@@ -0,0 +1,2 @@
+[z-index-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini
new file mode 100644
index 00000000000..526b65fe1f6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini
@@ -0,0 +1,2 @@
+[z-index-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini
new file mode 100644
index 00000000000..f0711265db9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini
@@ -0,0 +1,2 @@
+[z-index-016.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini
new file mode 100644
index 00000000000..c95651a4c30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini
@@ -0,0 +1,2 @@
+[z-index-017.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini
new file mode 100644
index 00000000000..96ee3b9a4bc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini
@@ -0,0 +1,2 @@
+[z-index-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini
new file mode 100644
index 00000000000..74c4c6da678
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini
@@ -0,0 +1,2 @@
+[z-index-019.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini
new file mode 100644
index 00000000000..b04bdf766b2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini
new file mode 100644
index 00000000000..bb6273f48e0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini
new file mode 100644
index 00000000000..815ea4bba35
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini
new file mode 100644
index 00000000000..d5769066030
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-004.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini
new file mode 100644
index 00000000000..7c066ff8ff6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini
new file mode 100644
index 00000000000..855e9980a3d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini
@@ -0,0 +1,2 @@
+[z-index-abspos-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-dynamic-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-dynamic-001.xht.ini
new file mode 100644
index 00000000000..28cc8b1f425
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-dynamic-001.xht.ini
@@ -0,0 +1,2 @@
+[z-index-dynamic-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zorder/z-index-020.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zorder/z-index-020.xht.ini
new file mode 100644
index 00000000000..e896f829816
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/zorder/z-index-020.xht.ini
@@ -0,0 +1,2 @@
+[z-index-020.xht]
+  expected: FAIL