diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-descendent-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-descendent-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini
new file mode 100644
index 00000000000..686875f9895
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini
new file mode 100644
index 00000000000..db3c2ac1e0e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini
new file mode 100644
index 00000000000..b6fafbd8268
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini
new file mode 100644
index 00000000000..aad65625720
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini
new file mode 100644
index 00000000000..0639312c24c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini
new file mode 100644
index 00000000000..63a9b9fbac7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini
new file mode 100644
index 00000000000..b4424508ea3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini
new file mode 100644
index 00000000000..7fd5bfc7a49
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini
new file mode 100644
index 00000000000..05dba5a3e93
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini
new file mode 100644
index 00000000000..918d32ff059
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini
new file mode 100644
index 00000000000..c42f6fc1b83
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini
new file mode 100644
index 00000000000..7a9c07cc98a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini
new file mode 100644
index 00000000000..1c4dc9478ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini
new file mode 100644
index 00000000000..3a9a6b96500
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini
new file mode 100644
index 00000000000..0751f3d22e0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini
new file mode 100644
index 00000000000..b722da9d464
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini
new file mode 100644
index 00000000000..e96111069ea
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini
new file mode 100644
index 00000000000..2bc836a2e8d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini
new file mode 100644
index 00000000000..63f0f767ab8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini
new file mode 100644
index 00000000000..0b56e46fd46
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini
new file mode 100644
index 00000000000..0a40f411e72
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini
new file mode 100644
index 00000000000..f73b5021ca2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini
new file mode 100644
index 00000000000..fbce15fb822
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini
new file mode 100644
index 00000000000..4894e46177e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini
new file mode 100644
index 00000000000..fed7b7591b1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini
new file mode 100644
index 00000000000..bc5bd28ff2e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini
new file mode 100644
index 00000000000..a7f06ef6fdd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini
new file mode 100644
index 00000000000..4192bc4a25e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini
new file mode 100644
index 00000000000..ea3d17154e5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-fallback-align-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini
new file mode 100644
index 00000000000..6b3686e412c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-fallback-justify-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini
new file mode 100644
index 00000000000..3604c4bdf55
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini
new file mode 100644
index 00000000000..972be66bd80
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini
new file mode 100644
index 00000000000..df58aa8afa3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini
new file mode 100644
index 00000000000..68e5d2d2bdc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini
new file mode 100644
index 00000000000..8962f3d4da1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini
new file mode 100644
index 00000000000..5eb8bcdfcb4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini
new file mode 100644
index 00000000000..609820f0c7c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini
new file mode 100644
index 00000000000..7bcd20d154c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini
new file mode 100644
index 00000000000..a9706038a55
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini
new file mode 100644
index 00000000000..ed69d89b40e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini
new file mode 100644
index 00000000000..1dacd25bae1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini
new file mode 100644
index 00000000000..71a5bfd0c25
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini
new file mode 100644
index 00000000000..faf06cde65b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-margin-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001a.html.ini
new file mode 100644
index 00000000000..68fffd0e180
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-abspos-child-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001b.html.ini
new file mode 100644
index 00000000000..1da441c5d40
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox-abspos-child-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-abspos-child-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox_absolute-atomic.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox_absolute-atomic.html.ini
new file mode 100644
index 00000000000..4ac53227ffc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flexbox_absolute-atomic.html.ini
@@ -0,0 +1,2 @@
+[flexbox_absolute-atomic.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini
new file mode 100644
index 00000000000..ff646d65345
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini
@@ -0,0 +1,361 @@
+[position-absolute-001.html]
+  [.flexbox 38]
+    expected: FAIL
+
+  [.flexbox 39]
+    expected: FAIL
+
+  [.flexbox 34]
+    expected: FAIL
+
+  [.flexbox 35]
+    expected: FAIL
+
+  [.flexbox 36]
+    expected: FAIL
+
+  [.flexbox 37]
+    expected: FAIL
+
+  [.flexbox 30]
+    expected: FAIL
+
+  [.flexbox 31]
+    expected: FAIL
+
+  [.flexbox 33]
+    expected: FAIL
+
+  [.flexbox 89]
+    expected: FAIL
+
+  [.flexbox 88]
+    expected: FAIL
+
+  [.flexbox 80]
+    expected: FAIL
+
+  [.flexbox 83]
+    expected: FAIL
+
+  [.flexbox 82]
+    expected: FAIL
+
+  [.flexbox 85]
+    expected: FAIL
+
+  [.flexbox 87]
+    expected: FAIL
+
+  [.flexbox 86]
+    expected: FAIL
+
+  [.flexbox 16]
+    expected: FAIL
+
+  [.flexbox 17]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 109]
+    expected: FAIL
+
+  [.flexbox 18]
+    expected: FAIL
+
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 108]
+    expected: FAIL
+
+  [.flexbox 98]
+    expected: FAIL
+
+  [.flexbox 99]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 97]
+    expected: FAIL
+
+  [.flexbox 95]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 90]
+    expected: FAIL
+
+  [.flexbox 107]
+    expected: FAIL
+
+  [.flexbox 106]
+    expected: FAIL
+
+  [.flexbox 63]
+    expected: FAIL
+
+  [.flexbox 62]
+    expected: FAIL
+
+  [.flexbox 61]
+    expected: FAIL
+
+  [.flexbox 60]
+    expected: FAIL
+
+  [.flexbox 67]
+    expected: FAIL
+
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 65]
+    expected: FAIL
+
+  [.flexbox 64]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
+  [.flexbox 68]
+    expected: FAIL
+
+  [.flexbox 118]
+    expected: FAIL
+
+  [.flexbox 119]
+    expected: FAIL
+
+  [.flexbox 70]
+    expected: FAIL
+
+  [.flexbox 72]
+    expected: FAIL
+
+  [.flexbox 73]
+    expected: FAIL
+
+  [.flexbox 75]
+    expected: FAIL
+
+  [.flexbox 76]
+    expected: FAIL
+
+  [.flexbox 77]
+    expected: FAIL
+
+  [.flexbox 78]
+    expected: FAIL
+
+  [.flexbox 79]
+    expected: FAIL
+
+  [.flexbox 113]
+    expected: FAIL
+
+  [.flexbox 114]
+    expected: FAIL
+
+  [.flexbox 115]
+    expected: FAIL
+
+  [.flexbox 116]
+    expected: FAIL
+
+  [.flexbox 117]
+    expected: FAIL
+
+  [.flexbox 110]
+    expected: FAIL
+
+  [.flexbox 111]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 40]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 42]
+    expected: FAIL
+
+  [.flexbox 103]
+    expected: FAIL
+
+  [.flexbox 101]
+    expected: FAIL
+
+  [.flexbox 100]
+    expected: FAIL
+
+  [.flexbox 49]
+    expected: FAIL
+
+  [.flexbox 48]
+    expected: FAIL
+
+  [.flexbox 105]
+    expected: FAIL
+
+  [.flexbox 104]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
+  [.flexbox 58]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 50]
+    expected: FAIL
+
+  [.flexbox 51]
+    expected: FAIL
+
+  [.flexbox 56]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 28]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 25]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 23]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 20]
+    expected: FAIL
+
+  [.flexbox 120]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 22]
+    expected: FAIL
+
+  [.flexbox 32]
+    expected: FAIL
+
+  [.flexbox 52]
+    expected: FAIL
+
+  [.flexbox 71]
+    expected: FAIL
+
+  [.flexbox 74]
+    expected: FAIL
+
+  [.flexbox 81]
+    expected: FAIL
+
+  [.flexbox 84]
+    expected: FAIL
+
+  [.flexbox 91]
+    expected: FAIL
+
+  [.flexbox 94]
+    expected: FAIL
+
+  [.flexbox 102]
+    expected: FAIL
+
+  [.flexbox 112]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini
new file mode 100644
index 00000000000..d7108fac0cf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini
@@ -0,0 +1,28 @@
+[position-absolute-002.html]
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini
new file mode 100644
index 00000000000..0a8dcb053e7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini
@@ -0,0 +1,37 @@
+[position-absolute-003.html]
+  [.rect 13]
+    expected: FAIL
+
+  [.rect 15]
+    expected: FAIL
+
+  [.rect 8]
+    expected: FAIL
+
+  [.rect 7]
+    expected: FAIL
+
+  [.rect 6]
+    expected: FAIL
+
+  [.rect 5]
+    expected: FAIL
+
+  [.rect 4]
+    expected: FAIL
+
+  [.rect 3]
+    expected: FAIL
+
+  [.rect 2]
+    expected: FAIL
+
+  [.rect 1]
+    expected: FAIL
+
+  [.rect 14]
+    expected: FAIL
+
+  [.rect 16]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini
new file mode 100644
index 00000000000..195e514a68b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini
@@ -0,0 +1,4 @@
+[position-absolute-004.html]
+  [#flex 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-012.html.ini
new file mode 100644
index 00000000000..39c3959f78a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-012.html.ini
@@ -0,0 +1,217 @@
+[position-absolute-012.html]
+  [.flexbox 38]
+    expected: FAIL
+
+  [.flexbox 39]
+    expected: FAIL
+
+  [.flexbox 35]
+    expected: FAIL
+
+  [.flexbox 36]
+    expected: FAIL
+
+  [.flexbox 37]
+    expected: FAIL
+
+  [.flexbox 30]
+    expected: FAIL
+
+  [.flexbox 32]
+    expected: FAIL
+
+  [.flexbox 33]
+    expected: FAIL
+
+  [.flexbox 88]
+    expected: FAIL
+
+  [.flexbox 80]
+    expected: FAIL
+
+  [.flexbox 83]
+    expected: FAIL
+
+  [.flexbox 82]
+    expected: FAIL
+
+  [.flexbox 85]
+    expected: FAIL
+
+  [.flexbox 84]
+    expected: FAIL
+
+  [.flexbox 86]
+    expected: FAIL
+
+  [.flexbox 16]
+    expected: FAIL
+
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 18]
+    expected: FAIL
+
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 94]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 90]
+    expected: FAIL
+
+  [.flexbox 91]
+    expected: FAIL
+
+  [.flexbox 63]
+    expected: FAIL
+
+  [.flexbox 62]
+    expected: FAIL
+
+  [.flexbox 61]
+    expected: FAIL
+
+  [.flexbox 60]
+    expected: FAIL
+
+  [.flexbox 67]
+    expected: FAIL
+
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
+  [.flexbox 68]
+    expected: FAIL
+
+  [.flexbox 70]
+    expected: FAIL
+
+  [.flexbox 72]
+    expected: FAIL
+
+  [.flexbox 74]
+    expected: FAIL
+
+  [.flexbox 75]
+    expected: FAIL
+
+  [.flexbox 76]
+    expected: FAIL
+
+  [.flexbox 77]
+    expected: FAIL
+
+  [.flexbox 78]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 49]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 52]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 51]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 28]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 22]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 20]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
new file mode 100644
index 00000000000..e32da21630a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -0,0 +1,967 @@
+[position-absolute-013.html]
+  [.flexbox 309]
+    expected: FAIL
+
+  [.flexbox 302]
+    expected: FAIL
+
+  [.flexbox 305]
+    expected: FAIL
+
+  [.flexbox 304]
+    expected: FAIL
+
+  [.flexbox 307]
+    expected: FAIL
+
+  [.flexbox 306]
+    expected: FAIL
+
+  [.flexbox 38]
+    expected: FAIL
+
+  [.flexbox 39]
+    expected: FAIL
+
+  [.flexbox 34]
+    expected: FAIL
+
+  [.flexbox 35]
+    expected: FAIL
+
+  [.flexbox 36]
+    expected: FAIL
+
+  [.flexbox 37]
+    expected: FAIL
+
+  [.flexbox 32]
+    expected: FAIL
+
+  [.flexbox 396]
+    expected: FAIL
+
+  [.flexbox 397]
+    expected: FAIL
+
+  [.flexbox 394]
+    expected: FAIL
+
+  [.flexbox 392]
+    expected: FAIL
+
+  [.flexbox 393]
+    expected: FAIL
+
+  [.flexbox 390]
+    expected: FAIL
+
+  [.flexbox 391]
+    expected: FAIL
+
+  [.flexbox 399]
+    expected: FAIL
+
+  [.flexbox 275]
+    expected: FAIL
+
+  [.flexbox 274]
+    expected: FAIL
+
+  [.flexbox 277]
+    expected: FAIL
+
+  [.flexbox 276]
+    expected: FAIL
+
+  [.flexbox 272]
+    expected: FAIL
+
+  [.flexbox 374]
+    expected: FAIL
+
+  [.flexbox 375]
+    expected: FAIL
+
+  [.flexbox 377]
+    expected: FAIL
+
+  [.flexbox 279]
+    expected: FAIL
+
+  [.flexbox 372]
+    expected: FAIL
+
+  [.flexbox 373]
+    expected: FAIL
+
+  [.flexbox 89]
+    expected: FAIL
+
+  [.flexbox 80]
+    expected: FAIL
+
+  [.flexbox 83]
+    expected: FAIL
+
+  [.flexbox 82]
+    expected: FAIL
+
+  [.flexbox 85]
+    expected: FAIL
+
+  [.flexbox 84]
+    expected: FAIL
+
+  [.flexbox 87]
+    expected: FAIL
+
+  [.flexbox 86]
+    expected: FAIL
+
+  [.flexbox 182]
+    expected: FAIL
+
+  [.flexbox 180]
+    expected: FAIL
+
+  [.flexbox 187]
+    expected: FAIL
+
+  [.flexbox 186]
+    expected: FAIL
+
+  [.flexbox 185]
+    expected: FAIL
+
+  [.flexbox 184]
+    expected: FAIL
+
+  [.flexbox 189]
+    expected: FAIL
+
+  [.flexbox 118]
+    expected: FAIL
+
+  [.flexbox 119]
+    expected: FAIL
+
+  [.flexbox 111]
+    expected: FAIL
+
+  [.flexbox 112]
+    expected: FAIL
+
+  [.flexbox 113]
+    expected: FAIL
+
+  [.flexbox 114]
+    expected: FAIL
+
+  [.flexbox 116]
+    expected: FAIL
+
+  [.flexbox 239]
+    expected: FAIL
+
+  [.flexbox 238]
+    expected: FAIL
+
+  [.flexbox 230]
+    expected: FAIL
+
+  [.flexbox 233]
+    expected: FAIL
+
+  [.flexbox 232]
+    expected: FAIL
+
+  [.flexbox 235]
+    expected: FAIL
+
+  [.flexbox 234]
+    expected: FAIL
+
+  [.flexbox 237]
+    expected: FAIL
+
+  [.flexbox 331]
+    expected: FAIL
+
+  [.flexbox 332]
+    expected: FAIL
+
+  [.flexbox 333]
+    expected: FAIL
+
+  [.flexbox 334]
+    expected: FAIL
+
+  [.flexbox 336]
+    expected: FAIL
+
+  [.flexbox 338]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 48]
+    expected: FAIL
+
+  [.flexbox 248]
+    expected: FAIL
+
+  [.flexbox 249]
+    expected: FAIL
+
+  [.flexbox 244]
+    expected: FAIL
+
+  [.flexbox 245]
+    expected: FAIL
+
+  [.flexbox 246]
+    expected: FAIL
+
+  [.flexbox 247]
+    expected: FAIL
+
+  [.flexbox 240]
+    expected: FAIL
+
+  [.flexbox 242]
+    expected: FAIL
+
+  [.flexbox 379]
+    expected: FAIL
+
+  [.flexbox 147]
+    expected: FAIL
+
+  [.flexbox 145]
+    expected: FAIL
+
+  [.flexbox 143]
+    expected: FAIL
+
+  [.flexbox 141]
+    expected: FAIL
+
+  [.flexbox 140]
+    expected: FAIL
+
+  [.flexbox 419]
+    expected: FAIL
+
+  [.flexbox 418]
+    expected: FAIL
+
+  [.flexbox 149]
+    expected: FAIL
+
+  [.flexbox 148]
+    expected: FAIL
+
+  [.flexbox 370]
+    expected: FAIL
+
+  [.flexbox 371]
+    expected: FAIL
+
+  [.flexbox 381]
+    expected: FAIL
+
+  [.flexbox 380]
+    expected: FAIL
+
+  [.flexbox 382]
+    expected: FAIL
+
+  [.flexbox 385]
+    expected: FAIL
+
+  [.flexbox 384]
+    expected: FAIL
+
+  [.flexbox 387]
+    expected: FAIL
+
+  [.flexbox 389]
+    expected: FAIL
+
+  [.flexbox 388]
+    expected: FAIL
+
+  [.flexbox 200]
+    expected: FAIL
+
+  [.flexbox 201]
+    expected: FAIL
+
+  [.flexbox 202]
+    expected: FAIL
+
+  [.flexbox 204]
+    expected: FAIL
+
+  [.flexbox 205]
+    expected: FAIL
+
+  [.flexbox 206]
+    expected: FAIL
+
+  [.flexbox 207]
+    expected: FAIL
+
+  [.flexbox 209]
+    expected: FAIL
+
+  [.flexbox 365]
+    expected: FAIL
+
+  [.flexbox 363]
+    expected: FAIL
+
+  [.flexbox 362]
+    expected: FAIL
+
+  [.flexbox 361]
+    expected: FAIL
+
+  [.flexbox 360]
+    expected: FAIL
+
+  [.flexbox 99]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 97]
+    expected: FAIL
+
+  [.flexbox 94]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 91]
+    expected: FAIL
+
+  [.flexbox 72]
+    expected: FAIL
+
+  [.flexbox 73]
+    expected: FAIL
+
+  [.flexbox 428]
+    expected: FAIL
+
+  [.flexbox 429]
+    expected: FAIL
+
+  [.flexbox 420]
+    expected: FAIL
+
+  [.flexbox 421]
+    expected: FAIL
+
+  [.flexbox 422]
+    expected: FAIL
+
+  [.flexbox 423]
+    expected: FAIL
+
+  [.flexbox 424]
+    expected: FAIL
+
+  [.flexbox 426]
+    expected: FAIL
+
+  [.flexbox 427]
+    expected: FAIL
+
+  [.flexbox 293]
+    expected: FAIL
+
+  [.flexbox 109]
+    expected: FAIL
+
+  [.flexbox 108]
+    expected: FAIL
+
+  [.flexbox 103]
+    expected: FAIL
+
+  [.flexbox 102]
+    expected: FAIL
+
+  [.flexbox 101]
+    expected: FAIL
+
+  [.flexbox 100]
+    expected: FAIL
+
+  [.flexbox 106]
+    expected: FAIL
+
+  [.flexbox 105]
+    expected: FAIL
+
+  [.flexbox 104]
+    expected: FAIL
+
+  [.flexbox 323]
+    expected: FAIL
+
+  [.flexbox 322]
+    expected: FAIL
+
+  [.flexbox 320]
+    expected: FAIL
+
+  [.flexbox 327]
+    expected: FAIL
+
+  [.flexbox 326]
+    expected: FAIL
+
+  [.flexbox 325]
+    expected: FAIL
+
+  [.flexbox 324]
+    expected: FAIL
+
+  [.flexbox 329]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 52]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 50]
+    expected: FAIL
+
+  [.flexbox 56]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 259]
+    expected: FAIL
+
+  [.flexbox 258]
+    expected: FAIL
+
+  [.flexbox 256]
+    expected: FAIL
+
+  [.flexbox 255]
+    expected: FAIL
+
+  [.flexbox 254]
+    expected: FAIL
+
+  [.flexbox 253]
+    expected: FAIL
+
+  [.flexbox 251]
+    expected: FAIL
+
+  [.flexbox 411]
+    expected: FAIL
+
+  [.flexbox 410]
+    expected: FAIL
+
+  [.flexbox 412]
+    expected: FAIL
+
+  [.flexbox 415]
+    expected: FAIL
+
+  [.flexbox 414]
+    expected: FAIL
+
+  [.flexbox 417]
+    expected: FAIL
+
+  [.flexbox 172]
+    expected: FAIL
+
+  [.flexbox 170]
+    expected: FAIL
+
+  [.flexbox 171]
+    expected: FAIL
+
+  [.flexbox 177]
+    expected: FAIL
+
+  [.flexbox 174]
+    expected: FAIL
+
+  [.flexbox 175]
+    expected: FAIL
+
+  [.flexbox 178]
+    expected: FAIL
+
+  [.flexbox 179]
+    expected: FAIL
+
+  [.flexbox 16]
+    expected: FAIL
+
+  [.flexbox 17]
+    expected: FAIL
+
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 18]
+    expected: FAIL
+
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 213]
+    expected: FAIL
+
+  [.flexbox 212]
+    expected: FAIL
+
+  [.flexbox 211]
+    expected: FAIL
+
+  [.flexbox 217]
+    expected: FAIL
+
+  [.flexbox 216]
+    expected: FAIL
+
+  [.flexbox 214]
+    expected: FAIL
+
+  [.flexbox 352]
+    expected: FAIL
+
+  [.flexbox 353]
+    expected: FAIL
+
+  [.flexbox 219]
+    expected: FAIL
+
+  [.flexbox 218]
+    expected: FAIL
+
+  [.flexbox 357]
+    expected: FAIL
+
+  [.flexbox 354]
+    expected: FAIL
+
+  [.flexbox 355]
+    expected: FAIL
+
+  [.flexbox 358]
+    expected: FAIL
+
+  [.flexbox 62]
+    expected: FAIL
+
+  [.flexbox 67]
+    expected: FAIL
+
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 65]
+    expected: FAIL
+
+  [.flexbox 64]
+    expected: FAIL
+
+  [.flexbox 280]
+    expected: FAIL
+
+  [.flexbox 281]
+    expected: FAIL
+
+  [.flexbox 282]
+    expected: FAIL
+
+  [.flexbox 284]
+    expected: FAIL
+
+  [.flexbox 286]
+    expected: FAIL
+
+  [.flexbox 287]
+    expected: FAIL
+
+  [.flexbox 350]
+    expected: FAIL
+
+  [.flexbox 431]
+    expected: FAIL
+
+  [.flexbox 359]
+    expected: FAIL
+
+  [.flexbox 288]
+    expected: FAIL
+
+  [.flexbox 136]
+    expected: FAIL
+
+  [.flexbox 134]
+    expected: FAIL
+
+  [.flexbox 135]
+    expected: FAIL
+
+  [.flexbox 132]
+    expected: FAIL
+
+  [.flexbox 133]
+    expected: FAIL
+
+  [.flexbox 130]
+    expected: FAIL
+
+  [.flexbox 131]
+    expected: FAIL
+
+  [.flexbox 138]
+    expected: FAIL
+
+  [.flexbox 139]
+    expected: FAIL
+
+  [.flexbox 317]
+    expected: FAIL
+
+  [.flexbox 314]
+    expected: FAIL
+
+  [.flexbox 315]
+    expected: FAIL
+
+  [.flexbox 312]
+    expected: FAIL
+
+  [.flexbox 313]
+    expected: FAIL
+
+  [.flexbox 310]
+    expected: FAIL
+
+  [.flexbox 311]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 25]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 23]
+    expected: FAIL
+
+  [.flexbox 22]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 269]
+    expected: FAIL
+
+  [.flexbox 263]
+    expected: FAIL
+
+  [.flexbox 260]
+    expected: FAIL
+
+  [.flexbox 261]
+    expected: FAIL
+
+  [.flexbox 266]
+    expected: FAIL
+
+  [.flexbox 267]
+    expected: FAIL
+
+  [.flexbox 265]
+    expected: FAIL
+
+  [.flexbox 406]
+    expected: FAIL
+
+  [.flexbox 407]
+    expected: FAIL
+
+  [.flexbox 404]
+    expected: FAIL
+
+  [.flexbox 402]
+    expected: FAIL
+
+  [.flexbox 400]
+    expected: FAIL
+
+  [.flexbox 401]
+    expected: FAIL
+
+  [.flexbox 190]
+    expected: FAIL
+
+  [.flexbox 191]
+    expected: FAIL
+
+  [.flexbox 192]
+    expected: FAIL
+
+  [.flexbox 193]
+    expected: FAIL
+
+  [.flexbox 195]
+    expected: FAIL
+
+  [.flexbox 196]
+    expected: FAIL
+
+  [.flexbox 197]
+    expected: FAIL
+
+  [.flexbox 198]
+    expected: FAIL
+
+  [.flexbox 199]
+    expected: FAIL
+
+  [.flexbox 169]
+    expected: FAIL
+
+  [.flexbox 168]
+    expected: FAIL
+
+  [.flexbox 165]
+    expected: FAIL
+
+  [.flexbox 164]
+    expected: FAIL
+
+  [.flexbox 166]
+    expected: FAIL
+
+  [.flexbox 161]
+    expected: FAIL
+
+  [.flexbox 163]
+    expected: FAIL
+
+  [.flexbox 228]
+    expected: FAIL
+
+  [.flexbox 226]
+    expected: FAIL
+
+  [.flexbox 227]
+    expected: FAIL
+
+  [.flexbox 225]
+    expected: FAIL
+
+  [.flexbox 222]
+    expected: FAIL
+
+  [.flexbox 223]
+    expected: FAIL
+
+  [.flexbox 220]
+    expected: FAIL
+
+  [.flexbox 345]
+    expected: FAIL
+
+  [.flexbox 344]
+    expected: FAIL
+
+  [.flexbox 347]
+    expected: FAIL
+
+  [.flexbox 341]
+    expected: FAIL
+
+  [.flexbox 340]
+    expected: FAIL
+
+  [.flexbox 343]
+    expected: FAIL
+
+  [.flexbox 342]
+    expected: FAIL
+
+  [.flexbox 70]
+    expected: FAIL
+
+  [.flexbox 71]
+    expected: FAIL
+
+  [.flexbox 299]
+    expected: FAIL
+
+  [.flexbox 74]
+    expected: FAIL
+
+  [.flexbox 75]
+    expected: FAIL
+
+  [.flexbox 77]
+    expected: FAIL
+
+  [.flexbox 292]
+    expected: FAIL
+
+  [.flexbox 290]
+    expected: FAIL
+
+  [.flexbox 297]
+    expected: FAIL
+
+  [.flexbox 296]
+    expected: FAIL
+
+  [.flexbox 295]
+    expected: FAIL
+
+  [.flexbox 294]
+    expected: FAIL
+
+  [.flexbox 368]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
+  [.flexbox 154]
+    expected: FAIL
+
+  [.flexbox 156]
+    expected: FAIL
+
+  [.flexbox 157]
+    expected: FAIL
+
+  [.flexbox 150]
+    expected: FAIL
+
+  [.flexbox 151]
+    expected: FAIL
+
+  [.flexbox 152]
+    expected: FAIL
+
+  [.flexbox 153]
+    expected: FAIL
+
+  [.flexbox 158]
+    expected: FAIL
+
+  [.flexbox 159]
+    expected: FAIL
+
+  [.flexbox 408]
+    expected: FAIL
+
+  [.flexbox 409]
+    expected: FAIL
+
+  [.flexbox 121]
+    expected: FAIL
+
+  [.flexbox 120]
+    expected: FAIL
+
+  [.flexbox 123]
+    expected: FAIL
+
+  [.flexbox 122]
+    expected: FAIL
+
+  [.flexbox 124]
+    expected: FAIL
+
+  [.flexbox 127]
+    expected: FAIL
+
+  [.flexbox 126]
+    expected: FAIL
+
+  [.flexbox 129]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-015.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-015.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-015.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-containing-block-001.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-containing-block-001.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-containing-block-002.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-containing-block-002.html.ini
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
new file mode 100644
index 00000000000..79eb41e58fb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
@@ -0,0 +1,4 @@
+[hittest-before-pseudo.html]
+  [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index b3dd3442824..73c8d014ee4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,18 +309,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 25318ac5846..258fe374697 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,6 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 9383f8004c1..369bf4d4fa4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,9 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index b8a3b565771..4c5287a46be 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -1,19 +1,7 @@
 [javascript-url-return-value-handling-dynamic.html]
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 7]
-    expected: FAIL
-
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 6]
-    expected: FAIL
-
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 5]
-    expected: FAIL
-
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 4]
     expected: FAIL
 
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 9]
     expected: FAIL
 
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 8]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 9a85a905394..8e2a63e3b7f 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index ab43ed7acf4..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 25163492fa2..8997b60acc3 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,15 +2,6 @@
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -20,15 +11,6 @@
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -38,12 +20,6 @@
   [input type password: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
@@ -56,3 +32,48 @@
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
deleted file mode 100644
index ca460dc6867..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[activation-behavior.window.html]
-  [<a> that is not connected should be followed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
new file mode 100644
index 00000000000..8d1eab1b44d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
@@ -0,0 +1,13 @@
+[constructor-reftypes.tentative.any.html]
+  [initialize anyfunc table with a bad default value]
+    expected: FAIL
+
+  [initialize externref table with default value]
+    expected: FAIL
+
+  [initialize anyfunc table with default value]
+    expected: FAIL
+
+
+[constructor-reftypes.tentative.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
new file mode 100644
index 00000000000..98f99a32f81
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
@@ -0,0 +1,10 @@
+[set-reftypes.tentative.any.worker.html]
+  expected: ERROR
+
+[set-reftypes.tentative.any.html]
+  [Arguments for externref table set]
+    expected: FAIL
+
+  [Arguments for anyfunc table set]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/webapi/instantiateStreaming.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/webapi/instantiateStreaming.any.js.ini
index 578437bf046..6e7c5a8fe05 100644
--- a/tests/wpt/metadata-layout-2020/wasm/webapi/instantiateStreaming.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/wasm/webapi/instantiateStreaming.any.js.ini
@@ -60,6 +60,21 @@
   [No imports]
     expected: NOTRUN
 
+  [imports with empty names]
+    expected: NOTRUN
+
+  [exports with empty name: function]
+    expected: NOTRUN
+
+  [exports with empty name: global]
+    expected: NOTRUN
+
+  [imports with empty module names]
+    expected: NOTRUN
+
+  [exports with empty name: table]
+    expected: NOTRUN
+
 
 [instantiateStreaming.any.serviceworker.html]
   expected: ERROR
@@ -129,3 +144,18 @@
   [No imports]
     expected: NOTRUN
 
+  [imports with empty names]
+    expected: NOTRUN
+
+  [exports with empty name: function]
+    expected: NOTRUN
+
+  [exports with empty name: global]
+    expected: NOTRUN
+
+  [imports with empty module names]
+    expected: NOTRUN
+
+  [exports with empty name: table]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/wasm/webapi/invalid-code.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/webapi/invalid-code.any.js.ini
new file mode 100644
index 00000000000..774d165a769
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/webapi/invalid-code.any.js.ini
@@ -0,0 +1,35 @@
+[invalid-code.any.sharedworker.html]
+  expected: ERROR
+
+[invalid-code.any.worker.html]
+  expected: TIMEOUT
+  [Invalid code (0x0000): instantiateStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0xCAFE): compileStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0x0000): compileStreaming]
+    expected: TIMEOUT
+
+  [Invalid code (0xCAFE): instantiateStreaming]
+    expected: NOTRUN
+
+
+[invalid-code.any.serviceworker.html]
+  expected: ERROR
+
+[invalid-code.any.html]
+  expected: TIMEOUT
+  [Invalid code (0x0000): instantiateStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0xCAFE): compileStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0x0000): compileStreaming]
+    expected: TIMEOUT
+
+  [Invalid code (0xCAFE): instantiateStreaming]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 0adb1075da7..c21a8eb1879 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -533,3 +533,9 @@
   [X SNR (0.5159912257459718 dB) is not greater than or equal to 65.737. Got 0.5159912257459718.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-4.7319673136467233e-13\t9.3139332532882690e-1\t9.3139332532930008e-1\t1.0000000000005080e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532930008e-1 at index of 28696.\n\tMax RelError of 1.0000000000005080e+0 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (43.824040882292394 dB) is not greater than or equal to 65.737. Got 43.824040882292394.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/find.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..d904318539a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/find.py.ini
@@ -0,0 +1,100 @@
+[find.py]
+  [test_find_element_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_element[partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_find_element[link text-full link text\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_no_element[css selector-#wontExist\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_find_element[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_detached_shadow_root]
+    expected: FAIL
+
+  [test_found_element_equivalence]
+    expected: FAIL
+
+  [test_find_element[tag name-a\]]
+    expected: FAIL
+
+  [test_find_element[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..b470ea8a75e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini
@@ -0,0 +1,100 @@
+[find.py]
+  [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_equivalence]
+    expected: FAIL
+
+  [test_find_elements[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_find_elements[link text-full link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements[partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_no_element[css selector-#wontExist\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_detached_shadow_root]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_elements[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements[tag name-a\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/get.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/get.py.ini
new file mode 100644
index 00000000000..493f92143f2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/get.py.ini
@@ -0,0 +1,19 @@
+[get.py]
+  [test_no_shadow_root]
+    expected: FAIL
+
+  [test_element_not_found]
+    expected: FAIL
+
+  [test_element_stale]
+    expected: FAIL
+
+  [test_get_shadow_root]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/user_prompts.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/get_element_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
index 6d92f8835c6..10dda3a6659 100644
--- a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 7e74c3a53b9..d87ab19abad 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -11030,13 +11030,6 @@
        {}
       ]
      ],
-     "selection-text-shadow-006-manual.html": [
-      "57c9ad67d17bd7a3a37acd86bef43989c45d9480",
-      [
-       null,
-       {}
-      ]
-     ],
      "spelling-error-002-manual.html": [
       "88fa97038ce0a5791c733cbc50926e4447440259",
       [
@@ -138799,84 +138792,866 @@
      ]
     },
     "css-flexbox": {
-     "abspos-autopos-htb-ltr.html": [
-      "095936edf8b982bc228316d1a4f449621e94a1c3",
-      [
-       null,
+     "abspos": {
+      "abspos-autopos-htb-ltr.html": [
+       "53229296ff22f1f0943dba5d28d38ec2e22bacfd",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "abspos-autopos-htb-rtl.html": [
-      "b377e8dd6dde7c3a3cb7b6b03712d4fa87f51497",
-      [
-       null,
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "abspos-autopos-htb-rtl.html": [
+       "1788c0d3b86670681f2f466d4aba906285c3d8d7",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "abspos-autopos-vlr-ltr.html": [
-      "02c7cf3fd900d82210656d59b04c37976b751ca5",
-      [
-       null,
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "abspos-autopos-vlr-ltr.html": [
+       "c3435235aafaea7d5afaf0dcaf5a95770a95ce08",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "abspos-autopos-vlr-rtl.html": [
-      "a156a727a529f7fbb0ba92b216d47487bc1b3125",
-      [
-       null,
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "abspos-autopos-vlr-rtl.html": [
+       "0c7b701a4731d77165dfd238e3ada51aa9a470df",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "abspos-autopos-vrl-ltr.html": [
-      "99ea3c41ca9fa1060fb036942efc5b93b6e140b8",
-      [
-       null,
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "abspos-autopos-vrl-ltr.html": [
+       "618bda43879ab04fcd4728bb0e6ab273ae46f9a0",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "abspos-autopos-vrl-rtl.html": [
-      "a156a727a529f7fbb0ba92b216d47487bc1b3125",
-      [
-       null,
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "abspos-autopos-vrl-rtl.html": [
+       "0c7b701a4731d77165dfd238e3ada51aa9a470df",
        [
+        null,
         [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-001.html": [
+       "da5968a1bd9ba745e55c79f1642ddb025cdc6c96",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-002.html": [
+       "20a6d2089fa34a0bd44b5277d8154c6e0a7c6e60",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-003.html": [
+       "9503187de85b6bde62f9570d08bf4aa568420553",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-004.html": [
+       "121921c6c39602cdd847a12efb350f56b3f179e2",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-005.html": [
+       "5fe76de0aed644e5353b0c766746f840fca71a20",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-006.html": [
+       "c6ad204f0955169c57873ef8f1116afcc20511d6",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-007.html": [
+       "1af6c30d3951400853f2d39cefa26ae3a64fe9a5",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-008.html": [
+       "83381ca85f4417c8cca9d40ef92bc0e4f2431621",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-rtl-001.html": [
+       "592a62e46501e413656082f28eea80585847929d",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-rtl-002.html": [
+       "2d5ec17f605cb3a62610b1f502da94e6d370bdd9",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-vertWM-001.html": [
+       "58cc640df96e202d01fbdfa2a57f1e7f3e6860b5",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-content-vertWM-002.html": [
+       "87d44d1231e5d5e132b1fd665abeadf9da7b8af4",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-001.html": [
+       "6f0e06fbf0310a2cc466e96ad5be61c54aa3e7e0",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-002.html": [
+       "d48bd041322c3bd7b2b1c1e892f92658e4432e96",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-003.html": [
+       "3e272bf0f9e6a15a9b0b65760cc1eacce258304f",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-004.html": [
+       "82b3963aedb9fbdbc0d9ca36b7138c023a115ac1",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-005.html": [
+       "09ea4bc145a40e10104ae7bce1176b969ab7a762",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-006.html": [
+       "2e14f9f1766310e6b8f0b31dfca47756bd71d442",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-007.html": [
+       "abca9769a59ad06dd8ce50b2f643d580349b3bc4",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-008.html": [
+       "fae2b46418ab9a06bb76f2fd443b2d0f0117f579",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-rtl-001.html": [
+       "94c979033ae748d99e82ea744c81b4ebc9b970df",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-rtl-002.html": [
+       "21252e65955676ad5bee630c48e270e3d63febaa",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-rtl-003.html": [
+       "215ed719967c321974799633be520a3ebbcbc1f8",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-rtl-004.html": [
+       "bf12311c74a492fd0cefdd7f02cf1bdb4369ff01",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-safe-001.html": [
+       "b7302cb962dbff9bfc99592ac7a2d2f2aae52b21",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-001.html": [
+       "bb5bee014ae5163a826e31e7140c013fad877217",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-002.html": [
+       "5e11c5b0fcc0e4f2c09aa1672dd32e2647400b3e",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-003.html": [
+       "b285ad4ff3ad13f4dc7ccf3f44e2504e1250c9a4",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-004.html": [
+       "b7566887b4a0ecea60d79f26f524010c713574a1",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-fallback-align-content-001.html": [
+       "80dd2f68f9510ce7535b97f80655ce8b483886f4",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-fallback-justify-content-001.html": [
+       "004ce831c2933efadd3d5434ce4201b8d60c3a09",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-001.html": [
+       "0a7ee1b74dd7ac9aa9de1a98eb03239381cffe6e",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-002.html": [
+       "d3eb0865493b741f52822a6d73fc47306a9dd9b9",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-003.html": [
+       "b64026950d1310c64535ba55973f9ba918fbbfac",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-004.html": [
+       "b68d09b311e4dc7bd42b733f231144311a608787",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-005.html": [
+       "7180f4e15617fa943ad6513c0d67bbfbac026866",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-006.html": [
+       "6638a08ba848c1eadf82c70a9627094f692941a9",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-007.html": [
+       "4ebcb79635ad0bf27790f33e28ecf49f8f233dc8",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-008.html": [
+       "242a1dc5f885d993a4c36ae3c2a409ca02e969ad",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-rtl-001.html": [
+       "dd8333ab72161f7cedfcdda130bc2ee1e0e2ed76",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-rtl-002.html": [
+       "9ae681a587305eb79faff6fcfdd771394dcada25",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-vertWM-001.html": [
+       "84899d2144569b3881867c63565bfbe0fb696a8d",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-content-vertWM-002.html": [
+       "1e11ea70eacfbe8948f188c430826346b6cbad54",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-justify-self-001.html": [
+       "1f826ca38f4e8d7cfadf2fdf154a401b88e473a8",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-margin-001.html": [
+       "535fa2ecbf642f5159cf91a28f6d9cdd1ec411b8",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-margin-002.html": [
+       "624a9e8592f6c766f9ea6990855b2b35a77f526a",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flexbox-abspos-child-001a.html": [
+       "fabe204b2796257fd3a74216a87c79960c42a9f9",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flexbox-abspos-child-001b.html": [
+       "30fc58c3d12e336663d0aaadf959e23d87a525a1",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flexbox-abspos-child-002.html": [
+       "8234085681ddc0f72e8da84471363ecb08d4d460",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flexbox_absolute-atomic.html": [
+       "dae6b3e43ea71f3795508dd0ca4b243d4510c383",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flexbox_inline-abspos.html": [
+       "56077ae58566efca2ff41b73edcb7a2d899a36d5",
+       [
+        null,
+        [
+         [
+          "/css/reference/blank.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-005.html": [
+       "3199dfb9a699986ecbc7ff474628cf1cfbf0b0b6",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/position-absolute-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-006.html": [
+       "bc9bc2c0e13d45904af90ca8f1dfe2a53241c79a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-007.html": [
+       "3f7106c10260d516b6cd9148ff5e55e2777899bf",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-008.html": [
+       "7a9f8b6dfe8d202a1bf6f913edeb77f6a122b836",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-009.html": [
+       "5751bea1b94cc2fcd5a924b5c8bf81e3cbbc91ec",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-010.html": [
+       "c59cc7d67dfdfc2d48782b7790bbb4e46d97bca9",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-011.html": [
+       "142cd4b4160978e78dcdde193a9e00da8e63a6c7",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-containing-block-001.html": [
+       "1edfdb04caa0d65148a6994a8c85d8363c74850a",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-absolute-containing-block-002.html": [
+       "aecbf0b4c997ceb748496d7fa09aed6ba8c0f92a",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
-     ],
+     },
      "align-baseline.html": [
       "31bcca69771751f3277d6f078456f982a375d067",
       [
@@ -141687,45 +142462,6 @@
        {}
       ]
      ],
-     "flexbox-abspos-child-001a.html": [
-      "fabe204b2796257fd3a74216a87c79960c42a9f9",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox-abspos-child-001-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "flexbox-abspos-child-001b.html": [
-      "30fc58c3d12e336663d0aaadf959e23d87a525a1",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox-abspos-child-001-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "flexbox-abspos-child-002.html": [
-      "8234085681ddc0f72e8da84471363ecb08d4d460",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox-abspos-child-002-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flexbox-align-items-center-nested-001.html": [
       "b6e2fdff0aaffc2df8187389183cd170bf6fb301",
       [
@@ -144339,19 +145075,6 @@
        {}
       ]
      ],
-     "flexbox_absolute-atomic.html": [
-      "dae6b3e43ea71f3795508dd0ca4b243d4510c383",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/flexbox_absolute-atomic-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flexbox_align-content-center.html": [
       "37c76f4c02ce49a30ea1c293020c7e4de7dae3e3",
       [
@@ -146224,19 +146947,6 @@
        {}
       ]
      ],
-     "flexbox_inline-abspos.html": [
-      "27fdf99c58562013b7bdec40e27bc6eb18cdf775",
-      [
-       null,
-       [
-        [
-         "/css/reference/blank.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "flexbox_inline-float.html": [
       "345b3fa7c9a8793a9f4251bbd795dadb7b2b7ca2",
       [
@@ -148046,123 +148756,6 @@
        {}
       ]
      ],
-     "position-absolute-005.html": [
-      "3199dfb9a699986ecbc7ff474628cf1cfbf0b0b6",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/position-absolute-005-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-006.html": [
-      "011daa6695cd31418ac4ada1d975a65586c29523",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-007.html": [
-      "2bf8d637d2c80fd2e0208916e28bec2faa1f6e27",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-008.html": [
-      "822e8b3339784193fbb120e3b4addf0292946988",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-009.html": [
-      "c5e69e091496f2944be7e7f437cdf12b440f7af3",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-010.html": [
-      "64c228e3487a98e294e1b6de114e994ba234d2c7",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-011.html": [
-      "d4cc862c3010d66659e8727d9388ef8d641622bd",
-      [
-       null,
-       [
-        [
-         "/css/reference/ref-filled-green-100px-square.xht",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-containing-block-001.html": [
-      "1edfdb04caa0d65148a6994a8c85d8363c74850a",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/position-absolute-containing-block-001-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-absolute-containing-block-002.html": [
-      "aecbf0b4c997ceb748496d7fa09aed6ba8c0f92a",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/position-absolute-containing-block-002-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "position-absolute-scrollbar-freeze.html": [
       "ac510f11e9160b1ed646047ed5aa44d2ebaa8a6f",
       [
@@ -151017,6 +151610,331 @@
         {}
        ]
       ],
+      "grid-abspos-staticpos-align-self-001.html": [
+       "a3ee9b46a1d997a4b450c9b6e820f26a29c9c095",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-002.html": [
+       "61f84a6d73a1095d70e78981744b13280c22a6ab",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-img-001.html": [
+       "f7037210c245aa502af98184fbb729b05ddd61e2",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-img-002.html": [
+       "61cce178468b69f5a18624b622834253b848ce71",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-rtl-001.html": [
+       "1b64da39c3161c09e14f2d31fe87ec48239b5628",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-rtl-002.html": [
+       "931f7ec09ae4f78cbf5b834d3d1feacb01e1c49b",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-rtl-003.html": [
+       "b37639c99cd1da8b457ccf56600700d41994c2c8",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-rtl-004.html": [
+       "bb4335f08e7926ef5ce5446294fdff04cdbdcab6",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-safe-001.html": [
+       "58ccaaf01df32c286f2c7d20890e77182a354eff",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-001.html": [
+       "ffac903f1e8da514d170fe100f5c40cf5625c103",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-002.html": [
+       "c636a4b8b740d609d5512bbe2077b394cd9d527b",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-003.html": [
+       "d719b0e3b71f5e475c7f5ca68dd2fb4b7e9deec0",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-004.html": [
+       "2eba85740fa88e206b3651dcc6d3bf5afdf10c9f",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-001.html": [
+       "cd934bd0fbe32552609302124a3dba45437c0ce9",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-002.html": [
+       "1d72ae8e397c9a66d95754c0464ccf02f65e6c0e",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-img-001.html": [
+       "a860ae6b9ea15bace723eef779ff5c4bc51344c6",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-img-002.html": [
+       "648342168ca55696d6c8e8328cc9781a192747ac",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-001.html": [
+       "f8f35869ffd760a9beb40d8a62802382db14b214",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-002.html": [
+       "528f294783a1916b378ca722113f9fa638cb6950",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-003.html": [
+       "8343b14191f4261ba4250dc6c5639b0be1e5b50b",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-004.html": [
+       "c098cc0ba137c2282f0c02e2bedaf42236365fa6",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-001.html": [
+       "3d91ad9c470aa7bfbdb4e463072af60f48850921",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-002.html": [
+       "b983a75d0bed3fc4fb2305aa4b09b73f3daffb6f",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-003.html": [
+       "d938a1241cb07cbc36d08c841f1695f8ef625bbf",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-004.html": [
+       "a4cbea83cd2161130fc26cd4a373e21041dba5b4",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-item-absolute-positioning-dynamic-001.html": [
        "bcd5dbaab5db71463fa2ec511fcb4d21e7942b90",
        [
@@ -173087,6 +174005,19 @@
        {}
       ]
      ],
+     "highlight-painting-order.html": [
+      "5a1004e0a074bb62c614c0b9230f9771853d70f2",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/highlight-painting-order-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "highlight-z-index-001.html": [
       "f81d25ceb9d2e4199ad80f827bd27b34013701fc",
       [
@@ -173971,7 +174902,7 @@
       ]
      ],
      "selection-overlay-and-grammar-001.html": [
-      "e4fe6e682e63f9382f920fbabf2126fc80640308",
+      "cd2bb274f564171f7afa21b4a0a7e8d67ce4bd37",
       [
        null,
        [
@@ -173984,7 +174915,7 @@
       ]
      ],
      "selection-overlay-and-spelling-001.html": [
-      "64129ab5f56b85ba901645f1128e35e27a9c64c2",
+      "48d96e8828d9525ea1388f3aeb17827b1f0cc80e",
       [
        null,
        [
@@ -174009,19 +174940,6 @@
        {}
       ]
      ],
-     "selection-text-shadow-016.html": [
-      "44403c1b5f5fb2bf7245c73f5eb5c15ffd19a98a",
-      [
-       null,
-       [
-        [
-         "/css/css-pseudo/selection-text-shadow-016-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "selection-textarea-011.html": [
       "4a925bae3389b97bcc03d42c8e6f3fb4190efe5d",
       [
@@ -230814,931 +231732,6 @@
     "vendor-imports": {
      "mozilla": {
       "mozilla-central-reftests": {
-       "align3": {
-        "flex-abspos-staticpos-align-content-001.html": [
-         "62a8ecb355d2b37a6d6006d97ff206352139f5e6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-002.html": [
-         "d546bf55394d07458dbf6f4bf380be68bf151899",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-003.html": [
-         "3960f474c9b59999f849f204dc94bfc47cd7a6f4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-004.html": [
-         "a1b00544f8518a2b67aafe341ae34f88c8f20ed2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-005.html": [
-         "65b744f8b829bc585f72eb2059bcc2dea860ab10",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-006.html": [
-         "209f0410d080212cdec5d432cc6eb9da7408a209",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-007.html": [
-         "eb2365abbe462dbd13b59fd4d54f36da4dcf2881",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-008.html": [
-         "6dafc4636f4895d9f5f77b2d91b05638c31587a9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-rtl-001.html": [
-         "e0d37083668202c47963d50603054ed11cabf276",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-rtl-002.html": [
-         "9f8ae7f4ce463203fce9429f5fcedd4262a1a8da",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-vertWM-001.html": [
-         "456cc59a339da0009c961d135e68a4384495f9da",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-content-vertWM-002.html": [
-         "f1013db1db09986a4d53ff90fbca66a21923b6ef",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-001.html": [
-         "6aad51819716b774abb65973b4bd2e08e83cd7c9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-002.html": [
-         "06956ba2cb680f32af5f42802b7cb80f45b1008b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-003.html": [
-         "247f5216a8cca57ce96062e8f809ecf5411b84fd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-004.html": [
-         "e684dd6bfef15f72ef1c90e06e0192b899592548",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-005.html": [
-         "1421878e4fbbb7002209422eb2a371f2025fbaa1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-006.html": [
-         "aa093438f6bf47715f322cca649b93efed272976",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-007.html": [
-         "7721031b7ac4361ea3adbc2978d0966d7e079698",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-008.html": [
-         "6bea8aaa00e0a90a2c3acda260f6a4ca2e00980b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-rtl-001.html": [
-         "82120fb52e3c107d6247bbe8d5f77b737e764ecf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-rtl-002.html": [
-         "1b2ff2e320b8b62c440bed66080fcf1419c79758",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-rtl-003.html": [
-         "498e230f92aaadc6facb8d148322eb6b61aaffc4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-rtl-004.html": [
-         "c4cb4b5138d5b0a4161222ac6193922639325109",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-safe-001.html": [
-         "2577489655c3317781e1a91074f9e86ffa97900e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-001.html": [
-         "e2fe739a058f24849a0f8381d27502195cf8d6b5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-002.html": [
-         "03f1a12910d7360d5773ccbce6447c7454206ed0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-003.html": [
-         "c340cdc290fce5a73d89377176a1ef1d4aa4f5f3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-004.html": [
-         "5113cdd8ac2347f4876fc758f58c9ba810deb3d7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-fallback-align-content-001.html": [
-         "e1c6b79076d5403fccb9473538fb3e6458b7c624",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-fallback-justify-content-001.html": [
-         "88335dca854fcc1b2efef6b8ab35670fadfe3c4b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-001.html": [
-         "33cec45906af242cd971d7e088e8f438a59f9efe",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-002.html": [
-         "68025bf739dec8287c3ebe91d7ea92903a52608f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-003.html": [
-         "80c747700d22d6aa3b9dab5e687dc7404f63e99f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-004.html": [
-         "6c0f8e4ea685b6c0fd79d57fa2eaf32f69af01e2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-005.html": [
-         "83703c8adc5d419f53d5c84729b6079c24f89bc8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-006.html": [
-         "f30bd06737c52939788ca5988ef3c65278d50808",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-007.html": [
-         "4eef2a7bfd58a08bd92783cbfb3be9b45487f993",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-008.html": [
-         "375e9aadbe0b09b7b14e82e8f119b7dcad691005",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-rtl-001.html": [
-         "5143a56423277f7516fdbc59041dcb2f5ea389e1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-rtl-002.html": [
-         "d56a25c3c9662af6d8c6099c26d461c34b789340",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-vertWM-001.html": [
-         "8971b4b9de543a2e337190a5da05cc7e8cac4d56",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-content-vertWM-002.html": [
-         "59ea15340cbb4f3f0a45cd59730594c58cbfb640",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-justify-self-001.html": [
-         "90f328e3a8efdb4d38a56e461b1fd491b87ddec9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-margin-001.html": [
-         "7a42e0def8710bb7a614681025ba805997e80020",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flex-abspos-staticpos-margin-002.html": [
-         "51b70d69124152b668a1e335c8457cbae8e2d5c6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-001.html": [
-         "191d6b84cb6b98e0b84b6c46ccc0a6f7ce795191",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-002.html": [
-         "b9ee7277ab9554e9d515b5c6b7c8badc72260b84",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-img-001.html": [
-         "fa4a56d4088039402b4d22f9aae45da6379fde72",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-img-002.html": [
-         "5fca4c308266de9b130faaebc852774f0a8d8c8d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-rtl-001.html": [
-         "1e7a125d9fee2ed8f2ce62ce6b34be873941e715",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-rtl-002.html": [
-         "7274c116f3f8d2e3cfab8b5f93a0f9ee04a39b49",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-rtl-003.html": [
-         "f8539f8b9fa40dc83c5e169af2474ab4b920fa81",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-rtl-004.html": [
-         "b891d541596e0dd13ba41a9f19227e54e421b1c1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-safe-001.html": [
-         "f8cfa793eb7a81015e4fe6b2adb2dbcaf4d7a2fe",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-001.html": [
-         "273abb150043d061dc72a8ed3c870a18670db4a0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-002.html": [
-         "2156f4bbf5191069d9183dfd23697f855f64971f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-003.html": [
-         "b727d3b37ed6b79ec1cd28a1f362e6eb22e17d3f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-004.html": [
-         "f350ef8ce6571101ab6b158c36b9baa78fa91c87",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-001.html": [
-         "99cfcbb9b4e65447a5e950d06e7d563e70a46037",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-002.html": [
-         "b82d308af1b7e1c289680a581e706627dd461126",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-img-001.html": [
-         "fdd4f6220be512fa581152960147f01dd0ea2d25",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-img-002.html": [
-         "61c1b97b51f84040be5647d0dc9a2a2eaff96a43",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-001.html": [
-         "18e024bf2e8e49a15f2cecba34cb83ac4fa9eb11",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-002.html": [
-         "d7e510e1b5eee5987c49eeec9c11667117d64bb2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-003.html": [
-         "2224ff684aff7ef3c7a5639dd4951e9e8febc450",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-004.html": [
-         "a22fdc24fb72284ac13327d99592cac0edc8198a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-001.html": [
-         "1bc2a5c33869d95f6486561e19bb6df0f7b973df",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-002.html": [
-         "7b72c6aaeb17bf164263b2dc02cb958ab13a36b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-003.html": [
-         "582262bd3deb174ba560467c971d190d6fceb4a8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-004.html": [
-         "63c893b6c4f116a2ab39124220767a64eb424ffa",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "background": {
         "background-attachment-fixed-inside-transform-1.html": [
          "9dae31aaccd1d281d05e43c3160000a53914d279",
@@ -304820,6 +304813,216 @@
       "0bcad0b51f759e6ea9a05e2fee919677bc790dd3",
       []
      ],
+     "abspos": {
+      "flex-abspos-staticpos-align-content-001-ref.html": [
+       "98b4bd95823d4a14a52bbcf176f3dfbbbc211d54",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-002-ref.html": [
+       "b9bde37740edd87ab94a6fffbf115a9f7c74bd89",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-003-ref.html": [
+       "3d4867f617c4bdf092f4848808b53e42c0611b79",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-004-ref.html": [
+       "82399e3accfaf678467501436c265aa4375cb4d6",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-005-ref.html": [
+       "8d853a84df64f822d03ae2456a66b13b68e71064",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-006-ref.html": [
+       "f4880c4d68de1344fab11e38909eff015235aef0",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-007-ref.html": [
+       "55a390da0cdb87c04c6480bd4596f110f32bd47b",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-008-ref.html": [
+       "f8b40d27e858f2e10dc76880a79f6cc3139813c7",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-rtl-001-ref.html": [
+       "3d4867f617c4bdf092f4848808b53e42c0611b79",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-rtl-002-ref.html": [
+       "989d6ac13d5e2ec7055dd349bc086d5c09fa26f0",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-vertWM-001-ref.html": [
+       "989d6ac13d5e2ec7055dd349bc086d5c09fa26f0",
+       []
+      ],
+      "flex-abspos-staticpos-align-content-vertWM-002-ref.html": [
+       "3d4867f617c4bdf092f4848808b53e42c0611b79",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-001-ref.html": [
+       "6c0f732532d190535baa258787887c0ddd703fa2",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-002-ref.html": [
+       "c1715dcd64c36fd6d37e283cb4d0a5526f30e0c4",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-003-ref.html": [
+       "d1b2c59990618c9bc2788cb67c3394ae977b134e",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-004-ref.html": [
+       "24fb8a1e7fd4bf36073d0658680c090c8ca46400",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-005-ref.html": [
+       "9d8f4469ac36d78c566fb0a07200124e38aa10b0",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-006-ref.html": [
+       "b3df68fab3c1812ae4bf7f24caa36f066330f71c",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-007-ref.html": [
+       "a5316ce81107a5b5fa9875a120f7725955fefa35",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-008-ref.html": [
+       "c40a2d75cf31a24051ec0a6a0cd7acf53d8a4ee4",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-rtl-001-ref.html": [
+       "75a998e34121bd8067a6694f523b32c0e928689a",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-rtl-002-ref.html": [
+       "75a998e34121bd8067a6694f523b32c0e928689a",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-rtl-003-ref.html": [
+       "b48de7e5cb115ba2fd078163a852e4de62cba292",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-rtl-004-ref.html": [
+       "2ed4a2d798a77022534b133fad90b14c88db8a0c",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-safe-001-ref.html": [
+       "fb1fb93ea997b1107efa595f17ae5b9c38419a92",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-001-ref.html": [
+       "e9b697062418aa434d33e65f9295839ca9ff1175",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-002-ref.html": [
+       "4459c1a03c89349066235ead8a4e5ea24a2ac75f",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-003-ref.html": [
+       "75a998e34121bd8067a6694f523b32c0e928689a",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-vertWM-004-ref.html": [
+       "a4be517ce0669defc631689e5208c3e7fa8abc4e",
+       []
+      ],
+      "flex-abspos-staticpos-fallback-align-content-001-ref.html": [
+       "ec0d6cc41278ced0ad415544e73f1b6804e9f946",
+       []
+      ],
+      "flex-abspos-staticpos-fallback-justify-content-001-ref.html": [
+       "0abf592d6d476d0e5a9a01b163e3aebf9fffb74d",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-001-ref.html": [
+       "be61c53b491d8445aaedcc00dc42b1575994f533",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-002-ref.html": [
+       "be61c53b491d8445aaedcc00dc42b1575994f533",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-003-ref.html": [
+       "f609ed2896af4c476dd7832a3c5071da48c240f8",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-004-ref.html": [
+       "f609ed2896af4c476dd7832a3c5071da48c240f8",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-005-ref.html": [
+       "b04e8f2337660a2147f63736beb0603255768c8c",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-006-ref.html": [
+       "b04e8f2337660a2147f63736beb0603255768c8c",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-007-ref.html": [
+       "2da4bf974f674b2692520ecd40c503392c31087b",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-008-ref.html": [
+       "2da4bf974f674b2692520ecd40c503392c31087b",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-rtl-001-ref.html": [
+       "2c70fa14a6464d28dcd656f4f429beae9e892ec0",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-rtl-002-ref.html": [
+       "8901d350f84c19eacbc478d40ebcc00c210ad090",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-vertWM-001-ref.html": [
+       "64a85443a4b85aa8a7b791b96b62bc29a8f994f3",
+       []
+      ],
+      "flex-abspos-staticpos-justify-content-vertWM-002-ref.html": [
+       "3e109d01e63c4b612543d24018e98a6f9ddebc76",
+       []
+      ],
+      "flex-abspos-staticpos-justify-self-001-ref.html": [
+       "d4f75a036ad049006776fe8f5e44b165f4a2867a",
+       []
+      ],
+      "flex-abspos-staticpos-margin-001-ref.html": [
+       "428aeae649464b16992800ba324ec23bececc1f8",
+       []
+      ],
+      "flex-abspos-staticpos-margin-002-ref.html": [
+       "38cfdff074c539efa2ba41492e6327b5d775b0ea",
+       []
+      ],
+      "flexbox-abspos-child-001-ref.html": [
+       "95c1f3341d048664792cfaad92be4ae2c3971dd7",
+       []
+      ],
+      "flexbox-abspos-child-002-ref.html": [
+       "876e5d6c2cbd282bd0e35dac0433a2413180f620",
+       []
+      ],
+      "flexbox_absolute-atomic-ref.html": [
+       "310ea204b32da7b43b8fda0526ae7b037b3c53ce",
+       []
+      ],
+      "position-absolute-005-ref.html": [
+       "2f7e669c72fc263d4b39d7a198d8abafbf54b463",
+       []
+      ],
+      "position-absolute-containing-block-001-ref.html": [
+       "5f8bcaf539f7004b226ab625d4357e4c831d6ac7",
+       []
+      ],
+      "position-absolute-containing-block-002-ref.html": [
+       "90ee38856cccd568352c5b6a4f14acc2274605c6",
+       []
+      ]
+     },
      "anonymous-flex-item-split-ref.html": [
       "163efd401c4d24ce205dc9c39431b79598a7fb6f",
       []
@@ -304906,14 +305109,6 @@
       "02f0eb35752e805aa2bc0bd339f73ff2b197c99e",
       []
      ],
-     "flexbox-abspos-child-001-ref.html": [
-      "95c1f3341d048664792cfaad92be4ae2c3971dd7",
-      []
-     ],
-     "flexbox-abspos-child-002-ref.html": [
-      "876e5d6c2cbd282bd0e35dac0433a2413180f620",
-      []
-     ],
      "flexbox-align-items-center-nested-001-ref.html": [
       "2473417b82b333e93baf1889f0fb229211591e2f",
       []
@@ -305534,10 +305729,6 @@
       "c3a223389d0455b2fe71d74837e5ff6121567432",
       []
      ],
-     "flexbox_absolute-atomic-ref.html": [
-      "310ea204b32da7b43b8fda0526ae7b037b3c53ce",
-      []
-     ],
      "flexbox_align-content-center-ref.html": [
       "e0118b707fc2a6e01cab0d8e16216140b1bc869b",
       []
@@ -306300,18 +306491,6 @@
       "ca0c4d9b2a0c62244d9c1bd5bd3a9a7ed884b8f7",
       []
      ],
-     "position-absolute-005-ref.html": [
-      "2f7e669c72fc263d4b39d7a198d8abafbf54b463",
-      []
-     ],
-     "position-absolute-containing-block-001-ref.html": [
-      "5f8bcaf539f7004b226ab625d4357e4c831d6ac7",
-      []
-     ],
-     "position-absolute-containing-block-002-ref.html": [
-      "90ee38856cccd568352c5b6a4f14acc2274605c6",
-      []
-     ],
      "position-absolute-scrollbar-freeze-ref.html": [
       "d0bf617951f3a9b5e3ae8e4b77e6ff3762b3cde1",
       []
@@ -313867,6 +314046,106 @@
        "83002f09cff37c9a76f40c3ce51d7a87b33ac3ea",
        []
       ],
+      "grid-abspos-staticpos-align-self-001-ref.html": [
+       "36b570f24580adebdeee7afb9c8147e85da4fd2f",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-002-ref.html": [
+       "40dd0f2f5173b4d8e544c47fba6c2eb62dee4faf",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-img-001-ref.html": [
+       "a14d630680fb8ccf5fcadeda56e7e95954479269",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-img-002-ref.html": [
+       "ea15f8de198622cdc8472b28a3c7235b4c921205",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-rtl-001-ref.html": [
+       "671b315a147a361e87d67d8be4a210c79aa3e99b",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-rtl-002-ref.html": [
+       "671b315a147a361e87d67d8be4a210c79aa3e99b",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-rtl-003-ref.html": [
+       "cadaadd95a35752e6a93564349ddb8bafdc2aeda",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-rtl-004-ref.html": [
+       "cadaadd95a35752e6a93564349ddb8bafdc2aeda",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-safe-001-ref.html": [
+       "5e7fd9f9a9bb52235d9bca30dec9297011dfa06c",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-001-ref.html": [
+       "37575f03e53830976da0937ea08aea9c178c9ead",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-002-ref.html": [
+       "ce217e7fffbe933016bb77a0117b0d230c0f276b",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-003-ref.html": [
+       "7eca626d2df3522741a36169ae2776eb9735c633",
+       []
+      ],
+      "grid-abspos-staticpos-align-self-vertWM-004-ref.html": [
+       "66d0d29f3c3e6bc459bd37d24a0a3448d81fd472",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-001-ref.html": [
+       "6d197e490fe69c5e45f48d884fe265e5080c97e0",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-002-ref.html": [
+       "f7396eda984b03ffd8660f5287963448c9d552e2",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-img-001-ref.html": [
+       "78d621219ab0fd36fb625252a977ab1166e0c42b",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-img-002-ref.html": [
+       "e71555d429498deae363039e015ef303aa2c6f68",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-001-ref.html": [
+       "8e5db1efc59b812a5ef71b90ccd94bbc7e48f870",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-002-ref.html": [
+       "c7176a7c21025ac178194c3592ef2fe30e4a86ee",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-003-ref.html": [
+       "8c88ad97b9c456702e2c649b2fb486f06538ca85",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-rtl-004-ref.html": [
+       "3e4c10049db205a89e0f3462f96ef5386e29296f",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-001-ref.html": [
+       "9fff3eabcc0860a981714bb81895b61560861d07",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-002-ref.html": [
+       "9fff3eabcc0860a981714bb81895b61560861d07",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-003-ref.html": [
+       "c0d0b784415ad0c1b2e8af582aec8825c4860c71",
+       []
+      ],
+      "grid-abspos-staticpos-justify-self-vertWM-004-ref.html": [
+       "c0d0b784415ad0c1b2e8af582aec8825c4860c71",
+       []
+      ],
       "grid-paint-positioned-children-001-ref.html": [
        "ac2a95e7960b50123395f6bbcffcd7ada6331267",
        []
@@ -313992,6 +314271,10 @@
        []
       ],
       "support": {
+       "colors-8x16.png": [
+        "596fdb389d6cedd10f54939edd07dacb0e615ac2",
+        []
+       ],
        "positioned-grid-descendants.css": [
         "9fa29a25ae35b9b8a29d0c14032e457d513dea3a",
         []
@@ -318266,6 +318549,10 @@
       "ecdb308f2f426af4f2763fabb30f7244f42fcf62",
       []
      ],
+     "highlight-painting-order-ref.html": [
+      "827ee9433bec0246425abf9c249135355b3b2490",
+      []
+     ],
      "highlight-z-index-001-ref.html": [
       "0e9f9c252b2244f7ba0a33aaccf9cf0c12420e4c",
       []
@@ -318556,10 +318843,6 @@
       "ba1e97dffd8e3cbf1d113b8a68a099dd3fb36824",
       []
      ],
-     "selection-text-shadow-016-ref.html": [
-      "5e3eabc976e2bc75b6a290f2b740b54d8cdbf99a",
-      []
-     ],
      "spelling-error-001-ref.html": [
       "1e068262780074b3f2acb50ae8cee69b84c72af3",
       []
@@ -318580,6 +318863,10 @@
       "select-custom.png": [
        "344aacee6afe29536d1263a3a24cb47a7f7b8786",
        []
+      ],
+      "selections.js": [
+       "022528e6aaa7c0cf708b6b922e7d15b4d0cbf1a8",
+       []
       ]
      },
      "textpath-selection-011-ref.html": [
@@ -331524,302 +331811,6 @@
         "7b0be875a7d7ed9eebaf8be92db40da8139ec698",
         []
        ],
-       "align3": {
-        "flex-abspos-staticpos-align-content-001-ref.html": [
-         "98b4bd95823d4a14a52bbcf176f3dfbbbc211d54",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-002-ref.html": [
-         "b9bde37740edd87ab94a6fffbf115a9f7c74bd89",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-003-ref.html": [
-         "3d4867f617c4bdf092f4848808b53e42c0611b79",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-004-ref.html": [
-         "82399e3accfaf678467501436c265aa4375cb4d6",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-005-ref.html": [
-         "8d853a84df64f822d03ae2456a66b13b68e71064",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-006-ref.html": [
-         "f4880c4d68de1344fab11e38909eff015235aef0",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-007-ref.html": [
-         "55a390da0cdb87c04c6480bd4596f110f32bd47b",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-008-ref.html": [
-         "f8b40d27e858f2e10dc76880a79f6cc3139813c7",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-rtl-001-ref.html": [
-         "3d4867f617c4bdf092f4848808b53e42c0611b79",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-rtl-002-ref.html": [
-         "989d6ac13d5e2ec7055dd349bc086d5c09fa26f0",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-vertWM-001-ref.html": [
-         "989d6ac13d5e2ec7055dd349bc086d5c09fa26f0",
-         []
-        ],
-        "flex-abspos-staticpos-align-content-vertWM-002-ref.html": [
-         "3d4867f617c4bdf092f4848808b53e42c0611b79",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-001-ref.html": [
-         "6c0f732532d190535baa258787887c0ddd703fa2",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-002-ref.html": [
-         "c1715dcd64c36fd6d37e283cb4d0a5526f30e0c4",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-003-ref.html": [
-         "d1b2c59990618c9bc2788cb67c3394ae977b134e",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-004-ref.html": [
-         "24fb8a1e7fd4bf36073d0658680c090c8ca46400",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-005-ref.html": [
-         "9d8f4469ac36d78c566fb0a07200124e38aa10b0",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-006-ref.html": [
-         "b3df68fab3c1812ae4bf7f24caa36f066330f71c",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-007-ref.html": [
-         "a5316ce81107a5b5fa9875a120f7725955fefa35",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-008-ref.html": [
-         "c40a2d75cf31a24051ec0a6a0cd7acf53d8a4ee4",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-rtl-001-ref.html": [
-         "75a998e34121bd8067a6694f523b32c0e928689a",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-rtl-002-ref.html": [
-         "75a998e34121bd8067a6694f523b32c0e928689a",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-rtl-003-ref.html": [
-         "b48de7e5cb115ba2fd078163a852e4de62cba292",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-rtl-004-ref.html": [
-         "2ed4a2d798a77022534b133fad90b14c88db8a0c",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-safe-001-ref.html": [
-         "fb1fb93ea997b1107efa595f17ae5b9c38419a92",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-001-ref.html": [
-         "e9b697062418aa434d33e65f9295839ca9ff1175",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-002-ref.html": [
-         "4459c1a03c89349066235ead8a4e5ea24a2ac75f",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-003-ref.html": [
-         "75a998e34121bd8067a6694f523b32c0e928689a",
-         []
-        ],
-        "flex-abspos-staticpos-align-self-vertWM-004-ref.html": [
-         "a4be517ce0669defc631689e5208c3e7fa8abc4e",
-         []
-        ],
-        "flex-abspos-staticpos-fallback-align-content-001-ref.html": [
-         "ec0d6cc41278ced0ad415544e73f1b6804e9f946",
-         []
-        ],
-        "flex-abspos-staticpos-fallback-justify-content-001-ref.html": [
-         "0abf592d6d476d0e5a9a01b163e3aebf9fffb74d",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-001-ref.html": [
-         "be61c53b491d8445aaedcc00dc42b1575994f533",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-002-ref.html": [
-         "be61c53b491d8445aaedcc00dc42b1575994f533",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-003-ref.html": [
-         "f609ed2896af4c476dd7832a3c5071da48c240f8",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-004-ref.html": [
-         "f609ed2896af4c476dd7832a3c5071da48c240f8",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-005-ref.html": [
-         "b04e8f2337660a2147f63736beb0603255768c8c",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-006-ref.html": [
-         "b04e8f2337660a2147f63736beb0603255768c8c",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-007-ref.html": [
-         "2da4bf974f674b2692520ecd40c503392c31087b",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-008-ref.html": [
-         "2da4bf974f674b2692520ecd40c503392c31087b",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-rtl-001-ref.html": [
-         "2c70fa14a6464d28dcd656f4f429beae9e892ec0",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-rtl-002-ref.html": [
-         "8901d350f84c19eacbc478d40ebcc00c210ad090",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-vertWM-001-ref.html": [
-         "64a85443a4b85aa8a7b791b96b62bc29a8f994f3",
-         []
-        ],
-        "flex-abspos-staticpos-justify-content-vertWM-002-ref.html": [
-         "3e109d01e63c4b612543d24018e98a6f9ddebc76",
-         []
-        ],
-        "flex-abspos-staticpos-justify-self-001-ref.html": [
-         "d4f75a036ad049006776fe8f5e44b165f4a2867a",
-         []
-        ],
-        "flex-abspos-staticpos-margin-001-ref.html": [
-         "428aeae649464b16992800ba324ec23bececc1f8",
-         []
-        ],
-        "flex-abspos-staticpos-margin-002-ref.html": [
-         "38cfdff074c539efa2ba41492e6327b5d775b0ea",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-001-ref.html": [
-         "36b570f24580adebdeee7afb9c8147e85da4fd2f",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-002-ref.html": [
-         "40dd0f2f5173b4d8e544c47fba6c2eb62dee4faf",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-img-001-ref.html": [
-         "a14d630680fb8ccf5fcadeda56e7e95954479269",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-img-002-ref.html": [
-         "ea15f8de198622cdc8472b28a3c7235b4c921205",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-rtl-001-ref.html": [
-         "671b315a147a361e87d67d8be4a210c79aa3e99b",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-rtl-002-ref.html": [
-         "671b315a147a361e87d67d8be4a210c79aa3e99b",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-rtl-003-ref.html": [
-         "cadaadd95a35752e6a93564349ddb8bafdc2aeda",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-rtl-004-ref.html": [
-         "cadaadd95a35752e6a93564349ddb8bafdc2aeda",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-safe-001-ref.html": [
-         "5e7fd9f9a9bb52235d9bca30dec9297011dfa06c",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-001-ref.html": [
-         "37575f03e53830976da0937ea08aea9c178c9ead",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-002-ref.html": [
-         "ce217e7fffbe933016bb77a0117b0d230c0f276b",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-003-ref.html": [
-         "7eca626d2df3522741a36169ae2776eb9735c633",
-         []
-        ],
-        "grid-abspos-staticpos-align-self-vertWM-004-ref.html": [
-         "66d0d29f3c3e6bc459bd37d24a0a3448d81fd472",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-001-ref.html": [
-         "6d197e490fe69c5e45f48d884fe265e5080c97e0",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-002-ref.html": [
-         "f7396eda984b03ffd8660f5287963448c9d552e2",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-img-001-ref.html": [
-         "78d621219ab0fd36fb625252a977ab1166e0c42b",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-img-002-ref.html": [
-         "e71555d429498deae363039e015ef303aa2c6f68",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-001-ref.html": [
-         "8e5db1efc59b812a5ef71b90ccd94bbc7e48f870",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-002-ref.html": [
-         "c7176a7c21025ac178194c3592ef2fe30e4a86ee",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-003-ref.html": [
-         "8c88ad97b9c456702e2c649b2fb486f06538ca85",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-rtl-004-ref.html": [
-         "3e4c10049db205a89e0f3462f96ef5386e29296f",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-001-ref.html": [
-         "9fff3eabcc0860a981714bb81895b61560861d07",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-002-ref.html": [
-         "9fff3eabcc0860a981714bb81895b61560861d07",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-003-ref.html": [
-         "c0d0b784415ad0c1b2e8af582aec8825c4860c71",
-         []
-        ],
-        "grid-abspos-staticpos-justify-self-vertWM-004-ref.html": [
-         "c0d0b784415ad0c1b2e8af582aec8825c4860c71",
-         []
-        ],
-        "reftest.list": [
-         "69ac9afde219ab488d47afd6807e91fb7ed9fd6f",
-         []
-        ],
-        "support": {
-         "colors-8x16.png": [
-          "596fdb389d6cedd10f54939edd07dacb0e615ac2",
-          []
-         ]
-        }
-       },
        "background": {
         "background-attachment-fixed-inside-transform-1-ref.html": [
          "8d4c3f785c8e84ffa121128cda96269574e27e73",
@@ -333117,7 +333108,7 @@
         }
        },
        "reftest.list": [
-        "c3ec6c1263d0dc301e7e7442caf427b3a9e01eff",
+        "5b5efb0412becb642c9e195be0c4c40864338634",
         []
        ],
        "ruby": {
@@ -338107,7 +338098,7 @@
     ],
     "resources": {
      "test-expectations.js": [
-      "6baaeb8ea2689159f80086967b6fa547fb84b807",
+      "7e540ed18701c87adf013c5381df6252535417b3",
       []
      ],
      "window-tests-blob.js": [
@@ -338115,7 +338106,7 @@
       []
      ],
      "window-tests-enumeration.js": [
-      "6e60910251fc59012d28f3c9a42adac7b7cb6d7a",
+      "6b694044640a5ad7fedfd0f221dd6a6881e79a71",
       []
      ]
     }
@@ -352784,7 +352775,7 @@
      []
     ],
     "performance-measure-memory.idl": [
-     "b1014f679bb7bd88ed2ef5733ae52c48c4ac0e0f",
+     "5983a6ab8dccadb83dd6f1b644231a84e7bb7fc6",
      []
     ],
     "performance-timeline.idl": [
@@ -364117,7 +364108,7 @@
       []
      ],
      "manifest.py": [
-      "1b4f407b9626be61fca132cd7d0124b4b3d69d7e",
+      "123f0451874c948e3845b11f004fbea57d78899d",
       []
      ],
      "sourcefile.py": [
@@ -371324,19 +371315,19 @@
      ],
      "webdriver": {
       "__init__.py": [
-       "d860b9ea2533f032ca227ae63d8f2022b6d897c7",
+       "0e1a9de9a65efb03e400af84a96012c059d1529b",
        []
       ],
       "client.py": [
-       "fc4222a9ce959861d18e845b28f2f4fbce116a67",
+       "19fe336a6e1eb4d766fdfba90ccf7271d8e439a4",
        []
       ],
       "error.py": [
-       "8379656d73dd722717559054e7104fcfe607cb0c",
+       "642612985a84148957db9893aaf486c13e160642",
        []
       ],
       "protocol.py": [
-       "c811f6f26db7908cae528d04d25d6882784e74a1",
+       "d3faa8508b0e1c9fac450b00bc4dabbdc1a97b5b",
        []
       ],
       "transport.py": [
@@ -371513,7 +371504,7 @@
       []
      ],
      "requirements_edge_chromium.txt": [
-      "1c7736b98b1bc4c6428642c58d51635481003d6b",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_epiphany.txt": [
@@ -371737,7 +371728,7 @@
         []
        ],
        "edgechromium.py": [
-        "67105e425c794c32cd99f8216418d47e640dc7ba",
+        "1d45983a11ef0d3fdcfabd6e81fe2974ab2d68eb",
         []
        ],
        "epiphany.py": [
@@ -371825,7 +371816,7 @@
         []
        ],
        "executoredgechromium.py": [
-        "a0263af68034111fae56b6e1acb050fa95859dae",
+        "ebba06a9e1aba16373b87686f5c12a89c09e25a8",
         []
        ],
        "executorinternetexplorer.py": [
@@ -373305,7 +373296,7 @@
       }
      },
      "instanceTestFactory.js": [
-      "86f593f46f8c6c159ce2f5a6bc39b0aa5b6eb189",
+      "ac468947ec22e29310d0714cb7dfa0972893477d",
       []
      ],
      "memory": {
@@ -374358,6 +374349,12 @@
        []
       ]
      },
+     "find_element_from_shadow_root": {
+      "conftest.py": [
+       "b8fc93319f43a9f427ab9ce25fd863620559c4a6",
+       []
+      ]
+     },
      "find_elements": {
       "__init__.py": [
        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -374370,6 +374367,12 @@
        []
       ]
      },
+     "find_elements_from_shadow_root": {
+      "conftest.py": [
+       "b8fc93319f43a9f427ab9ce25fd863620559c4a6",
+       []
+      ]
+     },
      "forward": {
       "__init__.py": [
        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -374440,6 +374443,12 @@
        []
       ]
      },
+     "get_element_shadow_root": {
+      "conftest.py": [
+       "afc0c91c3d3f2fcfe237e845bd1375124f8ebc56",
+       []
+      ]
+     },
      "get_element_tag_name": {
       "__init__.py": [
        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -406785,6 +406794,13 @@
         {}
        ]
       ],
+      "content-visibility-081.html": [
+       "ddd6593dc2e23fff198e512c3e7d5d378222c20e",
+       [
+        null,
+        {}
+       ]
+      ],
       "inheritance.html": [
        "e1ae8164de00467a450511da9ca4bf7f138e9c71",
        [
@@ -407223,13 +407239,71 @@
      ]
     },
     "css-flexbox": {
-     "abspos-descendent-001.html": [
-      "1aebb0f319f566db19070e7bad66e622a4ab8d3f",
-      [
-       null,
-       {}
+     "abspos": {
+      "abspos-descendent-001.html": [
+       "ecba51e8efbc5657d0b8a222393974f34ee1010b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-001.html": [
+       "f60174084652a3373c6b1873e02da373575c53cd",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-002.html": [
+       "5c1cf084753f0900095bae060f093a4b3740b1e8",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-003.html": [
+       "a858bac9fcb0a452f2893b406808e9dca1b1751a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-004.html": [
+       "af8bc6284c076b473af509d5d8fd1e81dbea286d",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-012.html": [
+       "fb90a526251fc10dbc3272c0ac9ed244930e8b6a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-013.html": [
+       "cdbdfcfbf72b25b49093bb681067e94e7be3573d",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-014.html": [
+       "f02a26800749fd067f38127c52a592df7cef9487",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-absolute-015.html": [
+       "1c0f3bc4c2888a12d20e2ab704f835f359366b81",
+       [
+        null,
+        {}
+       ]
       ]
-     ],
+     },
      "align-content-horiz-001a.html": [
       "c0f15b989c51c8c2c85e09ce1f7da75ee924b662",
       [
@@ -408678,62 +408752,6 @@
        {}
       ]
      ],
-     "position-absolute-001.html": [
-      "f60174084652a3373c6b1873e02da373575c53cd",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-002.html": [
-      "ef16ccd6d192ccfd43a1e4992f6dd746861c5294",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-003.html": [
-      "1944c93652a7bb6ccc8a430f0610b1bb9db3356d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-004.html": [
-      "af8bc6284c076b473af509d5d8fd1e81dbea286d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-012.html": [
-      "fb90a526251fc10dbc3272c0ac9ed244930e8b6a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-013.html": [
-      "cdbdfcfbf72b25b49093bb681067e94e7be3573d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-014.html": [
-      "f02a26800749fd067f38127c52a592df7cef9487",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-absolute-015.html": [
-      "1c0f3bc4c2888a12d20e2ab704f835f359366b81",
-      [
-       null,
-       {}
-      ]
-     ],
      "position-relative-percentage-top-001.html": [
       "3ec47c1d42d69330c616a87f0b22208f8d6196a6",
       [
@@ -547146,7 +547164,7 @@
        ]
       ],
       "exports.any.js": [
-       "60b2c04f436968ac11557860275d75bc89e49e3d",
+       "40a3935a4a23ba9028a4eccd44ad3baf07c5b1da",
        [
         null,
         {
@@ -547195,7 +547213,7 @@
        ]
       ],
       "imports.any.js": [
-       "d6754c9efbdc44cd963708f5b751f1546ddfcd18",
+       "ec550ce6c41af1dd958d2a981768da215368f27e",
        [
         null,
         {
@@ -547362,6 +547380,79 @@
       ]
      ],
      "table": {
+      "constructor-reftypes.tentative.any.js": [
+       "35db2c73599b945b6b8843f3747f2d4212ced0f0",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/constructor-reftypes.tentative.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/constructor-reftypes.tentative.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "constructor-types.tentative.any.js": [
        "99ca41b55a9152be82d86b8b73cc7962f16b2862",
        [
@@ -547704,6 +547795,79 @@
         }
        ]
       ],
+      "set-reftypes.tentative.any.js": [
+       "83b36a32415cf0981514617f1e67acee625c6c4b",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/set-reftypes.tentative.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/set-reftypes.tentative.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-constants.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "toString.any.js": [
        "8a09f2832c1d64594182fae4651bc9b07a508d4e",
        [
@@ -548389,7 +548553,7 @@
       ]
      ],
      "invalid-code.any.js": [
-      "752519392a953fdc314d6421f2bcb91856434534",
+      "37373d49971a3d89b04720cc10669f4929fc9142",
       [
        "wasm/webapi/invalid-code.any.html",
        {
@@ -589718,6 +589882,24 @@
        ]
       ]
      },
+     "find_element_from_shadow_root": {
+      "find.py": [
+       "87941d495e13558b5170e82bd3b1da12b90aff88",
+       [
+        null,
+        {}
+       ]
+      ],
+      "user_prompts.py": [
+       "3813a7df5d324231e18b89ebf46d72729f220942",
+       [
+        null,
+        {
+         "timeout": "long"
+        }
+       ]
+      ]
+     },
      "find_elements": {
       "find.py": [
        "47f009739385619235d46f09f541fcc6799a1756",
@@ -589754,6 +589936,24 @@
        ]
       ]
      },
+     "find_elements_from_shadow_root": {
+      "find.py": [
+       "f70a4b45aadb056434a71d7ec721b0fdf2efa485",
+       [
+        null,
+        {}
+       ]
+      ],
+      "user_prompts.py": [
+       "c4b903c836ef8ed89cd234ebe170a66f3b24631a",
+       [
+        null,
+        {
+         "timeout": "long"
+        }
+       ]
+      ]
+     },
      "forward": {
       "forward.py": [
        "d77ad2c61b5a7df0fb4cb2e9644f5b02a62e3861",
@@ -589941,6 +590141,24 @@
        ]
       ]
      },
+     "get_element_shadow_root": {
+      "get.py": [
+       "27c1e4a44ee07a3557d8e81199c0dcc9eebdb586",
+       [
+        null,
+        {}
+       ]
+      ],
+      "user_prompts.py": [
+       "55b50f0d9c937b4366aba13dfffcb854a83dc3fa",
+       [
+        null,
+        {
+         "timeout": "long"
+        }
+       ]
+      ]
+     },
      "get_element_tag_name": {
       "get.py": [
        "cfc63bd788de2e38d7c092aeaea61a78411f1b65",
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-htb-ltr.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-htb-ltr.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-htb-rtl.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-htb-rtl.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/abspos-descendent-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-descendent-001.html.ini
new file mode 100644
index 00000000000..c7ab3aaec53
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/abspos-descendent-001.html.ini
@@ -0,0 +1,4 @@
+[abspos-descendent-001.html]
+  [.flexbox 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini
new file mode 100644
index 00000000000..686875f9895
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini
new file mode 100644
index 00000000000..db3c2ac1e0e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini
new file mode 100644
index 00000000000..b6fafbd8268
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini
new file mode 100644
index 00000000000..aad65625720
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini
new file mode 100644
index 00000000000..0639312c24c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini
new file mode 100644
index 00000000000..63a9b9fbac7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini
new file mode 100644
index 00000000000..b4424508ea3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini
new file mode 100644
index 00000000000..7fd5bfc7a49
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini
new file mode 100644
index 00000000000..05dba5a3e93
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini
new file mode 100644
index 00000000000..918d32ff059
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini
new file mode 100644
index 00000000000..c42f6fc1b83
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini
new file mode 100644
index 00000000000..7a9c07cc98a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-content-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini
new file mode 100644
index 00000000000..1c4dc9478ee
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini
new file mode 100644
index 00000000000..3a9a6b96500
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini
new file mode 100644
index 00000000000..0751f3d22e0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini
new file mode 100644
index 00000000000..b722da9d464
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini
new file mode 100644
index 00000000000..e96111069ea
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini
new file mode 100644
index 00000000000..2bc836a2e8d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini
new file mode 100644
index 00000000000..63f0f767ab8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini
new file mode 100644
index 00000000000..0b56e46fd46
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini
new file mode 100644
index 00000000000..0a40f411e72
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini
new file mode 100644
index 00000000000..f73b5021ca2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini
new file mode 100644
index 00000000000..fbce15fb822
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini
new file mode 100644
index 00000000000..4894e46177e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-rtl-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini
new file mode 100644
index 00000000000..fed7b7591b1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini
new file mode 100644
index 00000000000..bc5bd28ff2e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini
new file mode 100644
index 00000000000..a7f06ef6fdd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini
new file mode 100644
index 00000000000..4192bc4a25e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-align-self-vertWM-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini
new file mode 100644
index 00000000000..ea3d17154e5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-fallback-align-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini
new file mode 100644
index 00000000000..6b3686e412c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-fallback-justify-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini
new file mode 100644
index 00000000000..3604c4bdf55
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini
new file mode 100644
index 00000000000..972be66bd80
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini
new file mode 100644
index 00000000000..df58aa8afa3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini
new file mode 100644
index 00000000000..68e5d2d2bdc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini
new file mode 100644
index 00000000000..8962f3d4da1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini
new file mode 100644
index 00000000000..5eb8bcdfcb4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini
new file mode 100644
index 00000000000..609820f0c7c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini
new file mode 100644
index 00000000000..7bcd20d154c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini
new file mode 100644
index 00000000000..a9706038a55
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-rtl-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini
new file mode 100644
index 00000000000..ed69d89b40e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-rtl-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini
new file mode 100644
index 00000000000..1dacd25bae1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-vertWM-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini
new file mode 100644
index 00000000000..71a5bfd0c25
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-content-vertWM-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini
new file mode 100644
index 00000000000..4e27baf9a1a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-self-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini
new file mode 100644
index 00000000000..3a6ed25d92d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-margin-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini
new file mode 100644
index 00000000000..faf06cde65b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-margin-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-001.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-001.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-001.html.ini
index 88274c494fe..1c1fd4e7060 100644
--- a/tests/wpt/metadata/css/css-flexbox/position-absolute-001.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-001.html.ini
@@ -1,71 +1,8 @@
 [position-absolute-001.html]
-  [.flexbox 2]
+  [.flexbox 38]
     expected: FAIL
 
-  [.flexbox 3]
-    expected: FAIL
-
-  [.flexbox 5]
-    expected: FAIL
-
-  [.flexbox 6]
-    expected: FAIL
-
-  [.flexbox 7]
-    expected: FAIL
-
-  [.flexbox 8]
-    expected: FAIL
-
-  [.flexbox 10]
-    expected: FAIL
-
-  [.flexbox 12]
-    expected: FAIL
-
-  [.flexbox 13]
-    expected: FAIL
-
-  [.flexbox 15]
-    expected: FAIL
-
-  [.flexbox 16]
-    expected: FAIL
-
-  [.flexbox 17]
-    expected: FAIL
-
-  [.flexbox 18]
-    expected: FAIL
-
-  [.flexbox 20]
-    expected: FAIL
-
-  [.flexbox 21]
-    expected: FAIL
-
-  [.flexbox 23]
-    expected: FAIL
-
-  [.flexbox 24]
-    expected: FAIL
-
-  [.flexbox 25]
-    expected: FAIL
-
-  [.flexbox 26]
-    expected: FAIL
-
-  [.flexbox 28]
-    expected: FAIL
-
-  [.flexbox 29]
-    expected: FAIL
-
-  [.flexbox 31]
-    expected: FAIL
-
-  [.flexbox 33]
+  [.flexbox 39]
     expected: FAIL
 
   [.flexbox 34]
@@ -77,87 +14,138 @@
   [.flexbox 36]
     expected: FAIL
 
-  [.flexbox 38]
+  [.flexbox 37]
     expected: FAIL
 
-  [.flexbox 39]
+  [.flexbox 30]
     expected: FAIL
 
-  [.flexbox 41]
+  [.flexbox 31]
     expected: FAIL
 
-  [.flexbox 42]
+  [.flexbox 33]
     expected: FAIL
 
-  [.flexbox 43]
+  [.flexbox 89]
     expected: FAIL
 
-  [.flexbox 44]
+  [.flexbox 88]
     expected: FAIL
 
-  [.flexbox 45]
+  [.flexbox 80]
     expected: FAIL
 
-  [.flexbox 46]
+  [.flexbox 83]
     expected: FAIL
 
-  [.flexbox 48]
+  [.flexbox 82]
     expected: FAIL
 
-  [.flexbox 49]
+  [.flexbox 85]
     expected: FAIL
 
-  [.flexbox 51]
+  [.flexbox 87]
     expected: FAIL
 
-  [.flexbox 53]
+  [.flexbox 86]
     expected: FAIL
 
-  [.flexbox 54]
+  [.flexbox 16]
     expected: FAIL
 
-  [.flexbox 55]
+  [.flexbox 17]
     expected: FAIL
 
-  [.flexbox 56]
+  [.flexbox 15]
     expected: FAIL
 
-  [.flexbox 57]
+  [.flexbox 12]
     expected: FAIL
 
-  [.flexbox 58]
+  [.flexbox 13]
     expected: FAIL
 
-  [.flexbox 59]
+  [.flexbox 10]
     expected: FAIL
 
-  [.flexbox 60]
+  [.flexbox 109]
     expected: FAIL
 
-  [.flexbox 61]
+  [.flexbox 18]
     expected: FAIL
 
-  [.flexbox 62]
+  [.flexbox 19]
+    expected: FAIL
+
+  [.flexbox 108]
+    expected: FAIL
+
+  [.flexbox 98]
+    expected: FAIL
+
+  [.flexbox 99]
+    expected: FAIL
+
+  [.flexbox 96]
+    expected: FAIL
+
+  [.flexbox 97]
+    expected: FAIL
+
+  [.flexbox 95]
+    expected: FAIL
+
+  [.flexbox 92]
+    expected: FAIL
+
+  [.flexbox 93]
+    expected: FAIL
+
+  [.flexbox 90]
+    expected: FAIL
+
+  [.flexbox 107]
+    expected: FAIL
+
+  [.flexbox 106]
     expected: FAIL
 
   [.flexbox 63]
     expected: FAIL
 
-  [.flexbox 64]
+  [.flexbox 62]
     expected: FAIL
 
-  [.flexbox 65]
+  [.flexbox 61]
     expected: FAIL
 
-  [.flexbox 66]
+  [.flexbox 60]
     expected: FAIL
 
   [.flexbox 67]
     expected: FAIL
 
+  [.flexbox 66]
+    expected: FAIL
+
+  [.flexbox 65]
+    expected: FAIL
+
+  [.flexbox 64]
+    expected: FAIL
+
+  [.flexbox 69]
+    expected: FAIL
+
   [.flexbox 68]
     expected: FAIL
 
+  [.flexbox 118]
+    expected: FAIL
+
+  [.flexbox 119]
+    expected: FAIL
+
   [.flexbox 70]
     expected: FAIL
 
@@ -182,75 +170,6 @@
   [.flexbox 79]
     expected: FAIL
 
-  [.flexbox 80]
-    expected: FAIL
-
-  [.flexbox 82]
-    expected: FAIL
-
-  [.flexbox 83]
-    expected: FAIL
-
-  [.flexbox 85]
-    expected: FAIL
-
-  [.flexbox 86]
-    expected: FAIL
-
-  [.flexbox 87]
-    expected: FAIL
-
-  [.flexbox 88]
-    expected: FAIL
-
-  [.flexbox 90]
-    expected: FAIL
-
-  [.flexbox 92]
-    expected: FAIL
-
-  [.flexbox 93]
-    expected: FAIL
-
-  [.flexbox 95]
-    expected: FAIL
-
-  [.flexbox 96]
-    expected: FAIL
-
-  [.flexbox 97]
-    expected: FAIL
-
-  [.flexbox 98]
-    expected: FAIL
-
-  [.flexbox 100]
-    expected: FAIL
-
-  [.flexbox 101]
-    expected: FAIL
-
-  [.flexbox 103]
-    expected: FAIL
-
-  [.flexbox 104]
-    expected: FAIL
-
-  [.flexbox 105]
-    expected: FAIL
-
-  [.flexbox 106]
-    expected: FAIL
-
-  [.flexbox 108]
-    expected: FAIL
-
-  [.flexbox 109]
-    expected: FAIL
-
-  [.flexbox 111]
-    expected: FAIL
-
   [.flexbox 113]
     expected: FAIL
 
@@ -263,52 +182,133 @@
   [.flexbox 116]
     expected: FAIL
 
-  [.flexbox 118]
-    expected: FAIL
-
-  [.flexbox 119]
-    expected: FAIL
-
-  [.flexbox 9]
-    expected: FAIL
-
-  [.flexbox 19]
-    expected: FAIL
-
-  [.flexbox 27]
-    expected: FAIL
-
-  [.flexbox 30]
-    expected: FAIL
-
-  [.flexbox 37]
-    expected: FAIL
-
-  [.flexbox 40]
-    expected: FAIL
-
-  [.flexbox 47]
-    expected: FAIL
-
-  [.flexbox 50]
-    expected: FAIL
-
-  [.flexbox 69]
-    expected: FAIL
-
-  [.flexbox 89]
-    expected: FAIL
-
-  [.flexbox 99]
-    expected: FAIL
-
-  [.flexbox 107]
+  [.flexbox 117]
     expected: FAIL
 
   [.flexbox 110]
     expected: FAIL
 
-  [.flexbox 117]
+  [.flexbox 111]
+    expected: FAIL
+
+  [.flexbox 45]
+    expected: FAIL
+
+  [.flexbox 44]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 46]
+    expected: FAIL
+
+  [.flexbox 41]
+    expected: FAIL
+
+  [.flexbox 40]
+    expected: FAIL
+
+  [.flexbox 43]
+    expected: FAIL
+
+  [.flexbox 42]
+    expected: FAIL
+
+  [.flexbox 103]
+    expected: FAIL
+
+  [.flexbox 101]
+    expected: FAIL
+
+  [.flexbox 100]
+    expected: FAIL
+
+  [.flexbox 49]
+    expected: FAIL
+
+  [.flexbox 48]
+    expected: FAIL
+
+  [.flexbox 105]
+    expected: FAIL
+
+  [.flexbox 104]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
+  [.flexbox 58]
+    expected: FAIL
+
+  [.flexbox 59]
+    expected: FAIL
+
+  [.flexbox 53]
+    expected: FAIL
+
+  [.flexbox 50]
+    expected: FAIL
+
+  [.flexbox 51]
+    expected: FAIL
+
+  [.flexbox 56]
+    expected: FAIL
+
+  [.flexbox 57]
+    expected: FAIL
+
+  [.flexbox 54]
+    expected: FAIL
+
+  [.flexbox 55]
+    expected: FAIL
+
+  [.flexbox 29]
+    expected: FAIL
+
+  [.flexbox 28]
+    expected: FAIL
+
+  [.flexbox 27]
+    expected: FAIL
+
+  [.flexbox 26]
+    expected: FAIL
+
+  [.flexbox 25]
+    expected: FAIL
+
+  [.flexbox 24]
+    expected: FAIL
+
+  [.flexbox 23]
+    expected: FAIL
+
+  [.flexbox 21]
+    expected: FAIL
+
+  [.flexbox 20]
     expected: FAIL
 
   [.flexbox 120]
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-002.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-002.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-002.html.ini
index 5f64104f3aa..da49aef9536 100644
--- a/tests/wpt/metadata/css/css-flexbox/position-absolute-002.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-002.html.ini
@@ -1,22 +1,22 @@
 [position-absolute-002.html]
-  [.flexbox 2]
-    expected: FAIL
-
-  [.flexbox 3]
+  [.flexbox 5]
     expected: FAIL
 
   [.flexbox 4]
     expected: FAIL
 
-  [.flexbox 5]
-    expected: FAIL
-
   [.flexbox 6]
     expected: FAIL
 
   [.flexbox 7]
     expected: FAIL
 
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
   [.flexbox 8]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-003.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-003.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-003.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-003.html.ini
index 3ceecfe5e92..b844bccbb7a 100644
--- a/tests/wpt/metadata/css/css-flexbox/position-absolute-003.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-003.html.ini
@@ -1,49 +1,49 @@
 [position-absolute-003.html]
-  [.rect 1]
-    expected: FAIL
-
-  [.rect 2]
-    expected: FAIL
-
-  [.rect 3]
-    expected: FAIL
-
-  [.rect 4]
-    expected: FAIL
-
-  [.rect 5]
-    expected: FAIL
-
-  [.rect 6]
-    expected: FAIL
-
-  [.rect 7]
-    expected: FAIL
-
-  [.rect 8]
-    expected: FAIL
-
-  [.rect 9]
-    expected: FAIL
-
-  [.rect 10]
-    expected: FAIL
-
-  [.rect 11]
+  [.rect 13]
     expected: FAIL
 
   [.rect 12]
     expected: FAIL
 
-  [.rect 13]
+  [.rect 11]
     expected: FAIL
 
-  [.rect 14]
+  [.rect 10]
     expected: FAIL
 
   [.rect 15]
     expected: FAIL
 
+  [.rect 9]
+    expected: FAIL
+
+  [.rect 8]
+    expected: FAIL
+
+  [.rect 7]
+    expected: FAIL
+
+  [.rect 6]
+    expected: FAIL
+
+  [.rect 5]
+    expected: FAIL
+
+  [.rect 4]
+    expected: FAIL
+
+  [.rect 3]
+    expected: FAIL
+
+  [.rect 2]
+    expected: FAIL
+
+  [.rect 1]
+    expected: FAIL
+
+  [.rect 14]
+    expected: FAIL
+
   [.rect 16]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-012.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-012.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-012.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-013.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-013.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-014.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-014.html.ini
similarity index 100%
rename from tests/wpt/metadata/css/css-flexbox/position-absolute-014.html.ini
rename to tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-014.html.ini
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-015.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-015.html.ini
new file mode 100644
index 00000000000..67ea4cdfde0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-015.html.ini
@@ -0,0 +1,4 @@
+[position-absolute-015.html]
+  [#abspos 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-001.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-001.html.ini
new file mode 100644
index 00000000000..403c792b263
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-001.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-002.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-002.html.ini
new file mode 100644
index 00000000000..fa0829507e4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-containing-block-002.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 0cc1fb425d4..e3b368bd784 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,18 +309,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 25318ac5846..258fe374697 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 9383f8004c1..369bf4d4fa4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,9 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index b8a3b565771..4c5287a46be 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -1,19 +1,7 @@
 [javascript-url-return-value-handling-dynamic.html]
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 7]
-    expected: FAIL
-
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 6]
-    expected: FAIL
-
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 5]
-    expected: FAIL
-
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 4]
     expected: FAIL
 
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 9]
     expected: FAIL
 
-  [Test javascript URL string return values in direct and indirect (target) frame contexts. 8]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 442db3cb549..2532dceabac 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index b3bd9f4c289..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 25163492fa2..8997b60acc3 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,15 +2,6 @@
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -20,15 +11,6 @@
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -38,12 +20,6 @@
   [input type password: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
@@ -56,3 +32,48 @@
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
deleted file mode 100644
index ca460dc6867..00000000000
--- a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[activation-behavior.window.html]
-  [<a> that is not connected should be followed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
new file mode 100644
index 00000000000..8d1eab1b44d
--- /dev/null
+++ b/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini
@@ -0,0 +1,13 @@
+[constructor-reftypes.tentative.any.html]
+  [initialize anyfunc table with a bad default value]
+    expected: FAIL
+
+  [initialize externref table with default value]
+    expected: FAIL
+
+  [initialize anyfunc table with default value]
+    expected: FAIL
+
+
+[constructor-reftypes.tentative.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
new file mode 100644
index 00000000000..98f99a32f81
--- /dev/null
+++ b/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini
@@ -0,0 +1,10 @@
+[set-reftypes.tentative.any.worker.html]
+  expected: ERROR
+
+[set-reftypes.tentative.any.html]
+  [Arguments for externref table set]
+    expected: FAIL
+
+  [Arguments for anyfunc table set]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/wasm/webapi/instantiateStreaming.any.js.ini b/tests/wpt/metadata/wasm/webapi/instantiateStreaming.any.js.ini
index 99b02ebd181..c030af110ac 100644
--- a/tests/wpt/metadata/wasm/webapi/instantiateStreaming.any.js.ini
+++ b/tests/wpt/metadata/wasm/webapi/instantiateStreaming.any.js.ini
@@ -60,6 +60,21 @@
   [import with i32-returning function]
     expected: NOTRUN
 
+  [imports with empty names]
+    expected: NOTRUN
+
+  [exports with empty name: function]
+    expected: NOTRUN
+
+  [exports with empty name: global]
+    expected: NOTRUN
+
+  [imports with empty module names]
+    expected: NOTRUN
+
+  [exports with empty name: table]
+    expected: NOTRUN
+
 
 [instantiateStreaming.any.serviceworker.html]
   expected: ERROR
@@ -135,3 +150,18 @@
   [import with i32-returning function]
     expected: NOTRUN
 
+  [imports with empty names]
+    expected: NOTRUN
+
+  [exports with empty name: function]
+    expected: NOTRUN
+
+  [exports with empty name: global]
+    expected: NOTRUN
+
+  [imports with empty module names]
+    expected: NOTRUN
+
+  [exports with empty name: table]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/wasm/webapi/invalid-code.any.js.ini b/tests/wpt/metadata/wasm/webapi/invalid-code.any.js.ini
index 26d4b245e7a..f4a3d142af8 100644
--- a/tests/wpt/metadata/wasm/webapi/invalid-code.any.js.ini
+++ b/tests/wpt/metadata/wasm/webapi/invalid-code.any.js.ini
@@ -12,6 +12,18 @@
   [Invalid code: compileStreaming]
     expected: TIMEOUT
 
+  [Invalid code (0x0000): instantiateStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0xCAFE): compileStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0x0000): compileStreaming]
+    expected: TIMEOUT
+
+  [Invalid code (0xCAFE): instantiateStreaming]
+    expected: NOTRUN
+
 
 [invalid-code.any.serviceworker.html]
   expected: ERROR
@@ -27,3 +39,15 @@
   [Invalid code: compileStreaming]
     expected: TIMEOUT
 
+  [Invalid code (0x0000): instantiateStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0xCAFE): compileStreaming]
+    expected: NOTRUN
+
+  [Invalid code (0x0000): compileStreaming]
+    expected: TIMEOUT
+
+  [Invalid code (0xCAFE): instantiateStreaming]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index cef923e0d1d..a1c7dbfce51 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -761,3 +761,9 @@
   [X SNR (0.5159912257459718 dB) is not greater than or equal to 65.737. Got 0.5159912257459718.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-4.7319673136467233e-13\t9.3139332532882690e-1\t9.3139332532930008e-1\t1.0000000000005080e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532930008e-1 at index of 28696.\n\tMax RelError of 1.0000000000005080e+0 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (43.824040882292394 dB) is not greater than or equal to 65.737. Got 43.824040882292394.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..d904318539a
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/find.py.ini
@@ -0,0 +1,100 @@
+[find.py]
+  [test_find_element_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_element[partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_find_element[link text-full link text\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_no_element[css selector-#wontExist\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_find_element[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_detached_shadow_root]
+    expected: FAIL
+
+  [test_found_element_equivalence]
+    expected: FAIL
+
+  [test_find_element[tag name-a\]]
+    expected: FAIL
+
+  [test_find_element[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/find_element_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..b470ea8a75e
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini
@@ -0,0 +1,100 @@
+[find.py]
+  [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_equivalence]
+    expected: FAIL
+
+  [test_find_elements[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_find_elements[link text-full link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements[partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_no_element[css selector-#wontExist\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_detached_shadow_root]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_elements[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements[tag name-a\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/get.py.ini
new file mode 100644
index 00000000000..493f92143f2
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/get.py.ini
@@ -0,0 +1,19 @@
+[get.py]
+  [test_no_shadow_root]
+    expected: FAIL
+
+  [test_element_not_found]
+    expected: FAIL
+
+  [test_element_stale]
+    expected: FAIL
+
+  [test_get_shadow_root]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_no_browsing_context]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/user_prompts.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..1af95add6bf
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/get_element_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index 6d92f8835c6..10dda3a6659 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-081.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-081.html
new file mode 100644
index 00000000000..ddd6593dc2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-081.html
@@ -0,0 +1,54 @@
+<!doctype HTML>
+<html id=html>
+<meta charset="utf8">
+<title>Content Visibility: scroll position restoration</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="if an scroller is hidden via content-visibility and then shown again, its scroll offset should be restored">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.js"></script>
+
+<style>
+.scroller {
+  width: 100px;
+  height: 500px;
+  overflow-y: scroll;
+}
+.spacer { height: 3000px; }
+.hidden { content-visibility: hidden; }
+</style>
+
+<div id=target class=scroller>
+  <div class=spacer></div>
+</div>
+</style>
+
+<script>
+function removeHiddenAndScheduleTest(t) {
+  target.classList.remove("hidden");
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      testScrollTop(t);
+    });
+  });
+}
+
+function testScrollTop(t) {
+  t.step(() => assert_equals(target.scrollTop, 2000));
+  t.done();
+}
+
+async_test((t) => {
+  target.scrollTop = 2000;
+  target.classList.add("hidden");
+
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      removeHiddenAndScheduleTest(t);
+    });
+  });
+}, "Scroll offset is restored when content-visibility hidden is removed");
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-ltr.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-ltr.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html
index 095936edf8b..53229296ff2 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-ltr.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-rtl.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-rtl.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html
index b377e8dd6dd..1788c0d3b86 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-htb-rtl.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-ltr.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-ltr.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html
index 02c7cf3fd90..c3435235aaf 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-ltr.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-rtl.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-rtl.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html
index a156a727a52..0c7b701a473 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vlr-rtl.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-ltr.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-ltr.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html
index 99ea3c41ca9..618bda43879 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-ltr.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-rtl.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-rtl.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html
index a156a727a52..0c7b701a473 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-autopos-vrl-rtl.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html
@@ -3,7 +3,7 @@
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements">
 <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#abspos-items" title="4.1. Absolutely-Positioned Flex Children">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <style>
   .flex {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-descendent-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-descendent-001.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos-descendent-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-descendent-001.html
index 1aebb0f319f..ecba51e8efb 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/abspos-descendent-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-descendent-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
 <link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=167566">
 <meta name="assert" content="This test ensures that flex item's padding doesn't disappear when an abspos descendent is removed.">
-<link href="support/flexbox.css" rel="stylesheet">
+<link href="../support/flexbox.css" rel="stylesheet">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html
index 62a8ecb355d..da5968a1bd9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html
index d546bf55394..20a6d2089fa 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row wrap-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html
index 3960f474c9b..9503187de85 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-003.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-003-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html
index a1b00544f85..121921c6c39 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse wrap-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-004-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html
index 65b744f8b82..5fe76de0aed 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-005.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-005.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-005-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html
index 209f0410d08..c6ad204f095 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-006.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column wrap-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-006-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html
index eb2365abbe4..1af6c30d395 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-007.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-007.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-007-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html
index 6dafc4636f4..83381ca85f4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-008.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-008.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse wrap-reverse flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-008-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html
index e0d37083668..592a62e4650 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL row flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-rtl-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html
index 9f8ae7f4ce4..2d5ec17f605 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-rtl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-rtl-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL column flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-rtl-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html
index 456cc59a339..58cc640df96 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl row flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-vertWM-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html
index f1013db1db0..87d44d1231e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-content-vertWM-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-vertWM-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl column flex container, with various "align-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-content-vertWM-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html
index 6aad5181971..6f0e06fbf03 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html
index 06956ba2cb6..d48bd041322 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row wrap-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html
index 247f5216a8c..3e272bf0f9e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-003-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html
index e684dd6bfef..82b3963aedb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse wrap-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-004-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html
index 1421878e4fb..09ea4bc145a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-005.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-005-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html
index aa093438f6b..2e14f9f1766 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-006.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column wrap-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-006-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html
index 7721031b7ac..abca9769a59 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-007.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-007-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html
index 6bea8aaa00e..fae2b46418a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-008.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse wrap-reverse flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-008-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html
index 82120fb52e3..94c979033ae 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL row flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-rtl-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html
index 1b2ff2e320b..21252e65955 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos LTR children in a RTL row flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-rtl-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html
index 498e230f92a..215ed719967 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL column flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-rtl-003-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html
index c4cb4b5138d..bf12311c74a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-rtl-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos LTR children in a RTL column flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-rtl-004-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html
index 2577489655c..b7302cb962d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-safe-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Testing safe overflow-position for align-self in absolutely positioned boxes in flex containers</title>
   <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#overflow-values">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-safe-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html
index e2fe739a058..bb5bee014ae 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl row flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-vertWM-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html
index 03f1a12910d..5e11c5b0fcc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos horizontal-tb children in a vertical-rl row flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-vertWM-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html
index c340cdc290f..b285ad4ff3a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl column flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-vertWM-003-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html
index 5113cdd8ac2..b7566887b4a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-align-self-vertWM-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos vertical-lr + RTL children in a vertical-rl column flex container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-align-self-vertWM-004-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html
index e1c6b79076d..80dd2f68f95 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-align-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-align-content-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "align-content" values with explicit fallback values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-fallback-align-content-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html
index 88335dca854..004ce831c29 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-fallback-justify-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "justify-content" values with explicit fallback values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-fallback-justify-content-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html
index 33cec45906a..0a7ee1b74dd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html
index 68025bf739d..d3eb0865493 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row wrap-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html
index 80c747700d2..b64026950d1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-003-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html
index 6c0f8e4ea68..b68d09b311e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row-reverse wrap-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-004-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html
index 83703c8adc5..7180f4e1561 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-005.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-005-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html
index f30bd06737c..6638a08ba84 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-006.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column wrap-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-006-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html
index 4eef2a7bfd5..4ebcb79635a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-007.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-007-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html
index 375e9aadbe0..242a1dc5f88 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-008.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a column-reverse wrap-reverse flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-008-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html
index 5143a564232..dd8333ab721 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL row flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-rtl-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html
index d56a25c3c96..9ae681a5873 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-rtl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a RTL column flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-rtl-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html
index 8971b4b9de5..84899d21445 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl row flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-vertWM-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html
index 59ea15340cb..1e11ea70eac 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a vertical-rl column flex container, with various "justify-content" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-content-vertWM-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html
index 90f328e3a8e..1f826ca38f4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-justify-self-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various "justify-self" values (which shouldn't have any effect) </title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#justify-flex">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-justify-self-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html
index 7a42e0def87..535fa2ecbf6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various margins applied</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-margin-001-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html
index 51b70d69124..624a9e8592f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/flex-abspos-staticpos-margin-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html
@@ -7,7 +7,7 @@
 <head>
   <title>CSS Test: Static position of abspos children in a row flex container, with various margins applied, and "justify-content: flex-end"</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="flex-abspos-staticpos-margin-002-ref.html">
   <meta charset="utf-8">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_absolute-atomic-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_absolute-atomic-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_absolute-atomic.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_absolute-atomic.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-abspos.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_inline-abspos.html
similarity index 86%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-abspos.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_inline-abspos.html
index 27fdf99c585..56077ae5856 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-abspos.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_inline-abspos.html
@@ -2,7 +2,7 @@
 <title>flexbox | absolutely positioned inline</title>
 <link rel="author" href="http://opera.com" title="Opera Software">
 <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#abspos-items">
-<link rel="match" href="../reference/blank.html">
+<link rel="match" href="/css/reference/blank.html">
 <style>
 div {
 	background: red;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-002.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-002.html
index ef16ccd6d19..5c1cf084753 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-002.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <title>CSS Test: Absolutely positioned children of flexboxes</title>
-<link href="support/flexbox.css" rel="stylesheet">
+<link href="../support/flexbox.css" rel="stylesheet">
 <link rel="author" title="Google Inc." href="http://www.google.com/">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
 <meta name="flags" content="dom">
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-003.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-003.html
index 1944c93652a..a858bac9fcb 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-003.html
@@ -21,7 +21,7 @@ padding in combination with abspos items">
 }
 </style>
 
-<link rel="stylesheet" href="support/flexbox.css">
+<link rel="stylesheet" href="../support/flexbox.css">
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-004.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-006.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-006.html
index 011daa6695c..bc9bc2c0e13 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-006.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-006.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid." />
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-007.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-007.html
index 2bf8d637d2c..3f7106c1026 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-007.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-007.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for abspos item when containing block is root element." />
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-008.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-008.html
index 822e8b33397..7a9f8b6dfe8 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-008.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-008.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and alignment is flex-end." />
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-009.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-009.html
index c5e69e09149..5751bea1b94 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-009.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-009.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and abspos item is also grid." />
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-010.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-010.html
index 64c228e3487..c59cc7d67df 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-010.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-010.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for grid abspos item when containg block is regular block flow." />
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-011.html
similarity index 91%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-011.html
index d4cc862c301..142cd4b4160 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-011.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-011.html
@@ -2,7 +2,7 @@
 <title>abspos items</title>
 <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
 <link rel="bookmark" href="https://crbug.com/1066859">
 <meta name="assert" content="Flex sets correct static position for abspos item when containing block is grid and weird abspos edge is due to justify-content, not alignment." />
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-012.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-012.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-012.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-013.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-013.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-013.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-013.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-014.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-014.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-014.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-014.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-015.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-015.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-015.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-015.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html
index 191d6b84cb6..a3ee9b46a1d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html
index b9ee7277ab9..61f84a6d73a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a static-pos grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html
index fa4a56d4088..f7037210c24 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos replaced children in a grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-img-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html
index 5fca4c30826..61cce178468 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-img-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos replaced children in a static-pos grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-img-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html
index 1e7a125d9fe..1b64da39c31 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a RTL grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-rtl-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html
index 7274c116f3f..931f7ec09ae 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos LTR children in a RTL grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-rtl-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html
index f8539f8b9fa..b37639c99cd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a RTL static-pos grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-rtl-003-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html
index b891d541596..bb4335f08e7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-rtl-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos LTR children in a RTL static-pos grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-rtl-004-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html
index f8cfa793eb7..58ccaaf01df 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-safe-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Testing safe overflow-position for align-self and justify-self in absolutely positioned boxes in grid containers in both horizontal and vertical writing modes</title>
   <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#overflow-values">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-safe-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html
index 273abb15004..ffac903f1e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a vertical-rl grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-vertWM-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html
index 2156f4bbf51..c636a4b8b74 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos horizontal-tb children in a vertical-rl grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-vertWM-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html
index b727d3b37ed..d719b0e3b71 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a vertical-rl static-pos grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-vertWM-003-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html
index f350ef8ce65..2eba85740fa 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-align-self-vertWM-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos horizontal-tb children in a static-pos vertical-rl grid container, with various "align-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-align-self-vertWM-004-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html
index 99cfcbb9b4e..cd934bd0fbe 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html
index b82d308af1b..1d72ae8e397 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html
index fdd4f6220be..a860ae6b9ea 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos replaced children in a grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-img-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html
index 61c1b97b51f..648342168ca 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-img-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos replaced children in a static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-img-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html
index 18e024bf2e8..f8f35869ffd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a RTL grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-rtl-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html
index d7e510e1b5e..528f294783a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos LTR children in a RTL grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-rtl-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html
index 2224ff684af..8343b14191f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a RTL static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-rtl-003-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html
index a22fdc24fb7..c098cc0ba13 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-rtl-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos LTR children in a RTL static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-rtl-004-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html
index 1bc2a5c3386..3d91ad9c470 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a vertical-rl grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-vertWM-001-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html
index 7b72c6aaeb1..b983a75d0be 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos horizontal-tb children in a vertical-rl grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-vertWM-002-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html
index 582262bd3de..d938a1241cb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos children in a vertical-rl static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-vertWM-003-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004.html
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html
index 63c893b6c4f..a4cbea83cd2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/grid-abspos-staticpos-justify-self-vertWM-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <title>CSS Test: Static position of abspos horizontal-tb children in a vertical-rl static-pos grid container, with various "justify-self" values</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos-static">
+  <link rel="help" href="https://drafts.csswg.org/css-grid/#abspos-items">
   <link rel="match" href="grid-abspos-staticpos-justify-self-vertWM-004-ref.html">
   <style>
     .container {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/support/colors-8x16.png b/tests/wpt/web-platform-tests/css/css-grid/abspos/support/colors-8x16.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/support/colors-8x16.png
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/support/colors-8x16.png
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html
new file mode 100644
index 00000000000..827ee9433be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order-ref.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset="utf-8">
+<style>
+    p {
+        font-size: 7em;
+        text-shadow: 0.2500em 0.2500em #C0C000;
+        position: relative;
+        color: transparent;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p > span {
+        position: absolute;
+        color: initial;
+        text-shadow: none;
+    }
+    p > span > span {
+        background: #C0C0C0;
+        text-shadow: 0.5000em 0.5000em #3838E0;
+    }
+</style>
+<p><span>q<span>uic</span>k</span>quick
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html
new file mode 100644
index 00000000000..5a1004e0a07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-order.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: highlight painting order</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-painting">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#painting">
+<link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html#painting-order">
+<link rel="match" href="highlight-painting-order-ref.html">
+<meta name="assert" value="highlight overlays are painted in the correct order, including both the element’s shadows and the highlight’s shadows">
+<style>
+    p {
+        font-size: 7em;
+        text-shadow: 0.2500em 0.2500em #C0C000;
+
+        /*
+            https://drafts.csswg.org/css-pseudo-4/#highlight-bounds
+            For text, the corresponding overlay must cover at least
+            the entire em box and may extend further above/below the
+            em box to the line box edges.
+        */
+        line-height: 1;
+    }
+    p::selection {
+        background: #C0C0C0;
+        text-shadow: 0.5000em 0.5000em #3838E0;
+    }
+</style>
+<p>quick
+<script>
+    const target = document.querySelector("p");
+    const range = document.createRange();
+    range.selectNodeContents(target);
+    range.setStart(target.childNodes[0], 1);
+    range.setEnd(target.childNodes[0], 4);
+    const selection = getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
index e4fe6e682e6..cd2bb274f56 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 
- <html lang="en">
+ <html>
 
   <meta charset="UTF-8">
 
@@ -53,28 +53,7 @@
     }
   </style>
 
-  <script>
-  function startTest()
-  {
-  var targetRange = document.createRange();
-  /* We first create an empty range */
-  targetRange.selectNodeContents(document.getElementById("test"));
-  /* Then we set the range boundaries to the children of div#test */
-  window.getSelection().addRange(targetRange);
-  /* Finally, we now select such range of content */
-  document.getElementById("test").blur();
-  /*
-  Some browsers, like Chromium 80+, will
-  transfer focus to a selected element
-  like a contenteditable div and
-  therefore style the border of
-  such element. We remove such
-  focus with the blur() method.
-  */
-  }
-  </script>
-
-  <body onload="startTest();">
+  <script src="support/selections.js"></script>
 
   <p>PREREQUISITE: User agent needs to have an enabled and capable grammar error module. If it does not, then this test does not apply to such user agent.
 
@@ -87,4 +66,18 @@
     <li>if there is no red.
   </ul>
 
-  <div contenteditable="true" id="test">Many thing can happen.</div>
+  <!--
+    The grammar mistakes in the text below are intentional and part of this test.
+
+    https://html.spec.whatwg.org/multipage/interaction.html#spelling-and-grammar-checking
+    • contenteditable makes the text “checkable for the purposes of [spelling and grammar checking]”
+    • spellcheck tries to enable spelling and grammar checking (subject to user preferences)
+    • lang tries to guide the UA towards checking the text in English (but the UA may ignore this)
+  -->
+  <div id="test" contenteditable="true" spellcheck="true" lang="en">The fox jumps over the dog.the fox jumps over the dog.</div>
+
+  <script>
+  const test = document.querySelector("#test");
+  selectNodeContents(test);
+  trySpellcheck(test);
+  </script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
index 64129ab5f56..48d96e8828d 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 
- <html lang="en">
+ <html>
 
   <meta charset="UTF-8">
 
@@ -70,19 +70,7 @@
     }
   </style>
 
-  <script>
-  function startTest()
-  {
-  var targetRange = document.createRange();
-  /* We first create an empty range */
-  targetRange.selectNodeContents(document.getElementById("test"));
-  /* Then we set the range boundaries to the children of div#test */
-  window.getSelection().addRange(targetRange);
-  /* Finally, we now select such range of content */
-  }
-  </script>
-
-  <body onload="startTest();">
+  <script src="support/selections.js"></script>
 
   <p>PREREQUISITE: User agent needs to have an enabled and capable spelling error module. If it does not, then this test does not apply to such user agent.
 
@@ -96,7 +84,17 @@
   </ul>
 
   <!--
-  The bad spelling of Txet is intentional and part of this test
-  -->
+    The bad spelling of Txet is intentional and part of this test.
 
-  <div id="test">Txet sample</div>
+    https://html.spec.whatwg.org/multipage/interaction.html#spelling-and-grammar-checking
+    • contenteditable makes the text “checkable for the purposes of [spelling and grammar checking]”
+    • spellcheck tries to enable spelling and grammar checking (subject to user preferences)
+    • lang tries to guide the UA towards checking the text in English (but the UA may ignore this)
+  -->
+  <div id="test" contenteditable="true" spellcheck="true" lang="en">Txet sample</div>
+
+  <script>
+  const test = document.querySelector("#test");
+  selectNodeContents(test);
+  trySpellcheck(test);
+  </script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-006-manual.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-006-manual.html
deleted file mode 100644
index 57c9ad67d17..00000000000
--- a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-006-manual.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Pseudo-Elements Test: partial selection done manually and multiple text-shadow (complex)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-styling">
-
-  <meta content="interact" name="flags">
-  <meta content="This test checks that text selectedness done manually must affect multiple text shadows." name="assert">
-
-  <style>
-  div
-    {
-      color: blue;
-      font-size: 300%;
-      margin-left: 7.16667em;
-      margin-top: 1.5em;
-      text-shadow: red 0em -1.2em 0em, red -7em 0em 0em, red 7em 0em 0em, red 0em 1.2em 0em;
-    }
-
-  div::selection
-    {
-      background-color: yellow;
-      color: green;
-      text-shadow: none;
-    }
-  </style>
-
-  <p>Instructions: select a few characters from the blue words "Text sample". Select them with mouse dragging (leftwardedly or rightwardedly) or text-highlighting them with <kbd>Shift</kbd> and keyboard arrows when keyboard navigation (also called caret browsing) is enabled.
-
-  <p>Test passes if each of the 4 correspondent red glyph counterparts disappear.
-
-  <div>Text sample</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016-ref.html
deleted file mode 100644
index 5e3eabc976e..00000000000
--- a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016-ref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-
-  <style>
-  div
-    {
-      color: green;
-      font-size: 300%;
-      margin-left: 0.66667em;
-      margin-top: 1.5em;
-    }
-  </style>
-
-  <p>Test passes if each glyph of "Selected Text" is green and not red.
-
-  <div>Selected Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016.html
deleted file mode 100644
index 44403c1b5f5..00000000000
--- a/tests/wpt/web-platform-tests/css/css-pseudo/selection-text-shadow-016.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Pseudo-Elements Test: selection and text-shadow in 4 directions (static variation)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-styling">
-  <link rel="match" href="selection-text-shadow-016-ref.html">
-
-  <meta content="" name="flags">
-  <meta content="This test checks that text selectedness must affect multiple text shadows." name="assert">
-
-  <style>
-  div
-    {
-      color: blue;
-      font-size: 300%;
-      margin-left: 0.66667em;
-      margin-top: 1.5em;
-      text-shadow: red 0em -0.5em 0em, red -0.5em 0em 0em, red 0.5em 0em 0em, red 0em 0.5em 0em;
-    }
-
-  div::selection
-    {
-      color: green;
-      text-shadow: none;
-    }
-  </style>
-
-  <script>
-  function startTest()
-  {
-  var targetRange = document.createRange();
-  /* We first create an empty range */
-  targetRange.selectNodeContents(document.getElementById("test"));
-  /* Then we set the range boundaries to the children of div#test */
-  window.getSelection().addRange(targetRange);
-  /* Finally, we now select such range of content */
-  }
-  </script>
-
-  <body onload="startTest();">
-
-  <p>Test passes if each glyph of "Selected Text" is green and not red.
-
-  <div id="test">Selected Text</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/selections.js b/tests/wpt/web-platform-tests/css/css-pseudo/support/selections.js
new file mode 100644
index 00000000000..022528e6aaa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/support/selections.js
@@ -0,0 +1,60 @@
+/**
+ * Replaces the current selection (if any) with a new range, after
+ * it’s configured by the given function.
+ */
+function selectRangeWith(fun) {
+    const selection = getSelection();
+
+    // Deselect any ranges that happen to be selected, to prevent the
+    // Selection#addRange call from ignoring our new range (see
+    // <https://www.chromestatus.com/feature/6680566019653632> for
+    // more details).
+    selection.removeAllRanges();
+
+    // Create and configure a range.
+    const range = document.createRange();
+    fun(range);
+
+    // Select our new range.
+    selection.addRange(range);
+}
+
+/**
+ * Replaces the current selection (if any) with a new range, spanning
+ * the contents of the given node.
+ */
+function selectNodeContents(node) {
+    const previousActive = document.activeElement;
+
+    selectRangeWith(range => range.selectNodeContents(node));
+
+    // If the selection update causes the node or an ancestor to be
+    // focused (Chromium 80+), unfocus it, to avoid any focus-related
+    // styling such as outlines.
+    if (document.activeElement != previousActive) {
+        document.activeElement.blur();
+    }
+}
+
+/**
+ * Tries to convince a UA with lazy spellcheck to check and mark the
+ * contents of the given nodes (form fields or @contenteditables).
+ *
+ * Both focus and selection can be used for this purpose, but only
+ * focus works for @contenteditables.
+ */
+function trySpellcheck(...nodes) {
+    // This is inherently a flaky test risk, but Chromium (as of 87)
+    // seems to cancel spellcheck on a node if it wasn’t the last one
+    // focused for “long enough” (though immediate unfocus is ok).
+    // setInterval(0) is usually not long enough.
+    const interval = setInterval(() => {
+        if (nodes.length > 0) {
+            const node = nodes.shift();
+            node.focus();
+            node.blur();
+        } else {
+            clearInterval(interval);
+        }
+    }, 250);
+}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/reftest.list
deleted file mode 100644
index 69ac9afde21..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/align3/reftest.list
+++ /dev/null
@@ -1,79 +0,0 @@
-# Tests for static position of absolutely positioned flex children.
-== flex-abspos-staticpos-align-content-001.html flex-abspos-staticpos-align-content-001-ref.html
-== flex-abspos-staticpos-align-content-002.html flex-abspos-staticpos-align-content-002-ref.html
-== flex-abspos-staticpos-align-content-003.html flex-abspos-staticpos-align-content-003-ref.html
-== flex-abspos-staticpos-align-content-004.html flex-abspos-staticpos-align-content-004-ref.html
-== flex-abspos-staticpos-align-content-005.html flex-abspos-staticpos-align-content-005-ref.html
-== flex-abspos-staticpos-align-content-006.html flex-abspos-staticpos-align-content-006-ref.html
-== flex-abspos-staticpos-align-content-007.html flex-abspos-staticpos-align-content-007-ref.html
-== flex-abspos-staticpos-align-content-008.html flex-abspos-staticpos-align-content-008-ref.html
-== flex-abspos-staticpos-align-content-rtl-001.html flex-abspos-staticpos-align-content-rtl-001-ref.html
-== flex-abspos-staticpos-align-content-rtl-002.html flex-abspos-staticpos-align-content-rtl-002-ref.html
-== flex-abspos-staticpos-align-content-vertWM-001.html flex-abspos-staticpos-align-content-vertWM-001-ref.html
-== flex-abspos-staticpos-align-content-vertWM-002.html flex-abspos-staticpos-align-content-vertWM-002-ref.html
-
-== flex-abspos-staticpos-align-self-001.html flex-abspos-staticpos-align-self-001-ref.html
-== flex-abspos-staticpos-align-self-002.html flex-abspos-staticpos-align-self-002-ref.html
-== flex-abspos-staticpos-align-self-003.html flex-abspos-staticpos-align-self-003-ref.html
-== flex-abspos-staticpos-align-self-004.html flex-abspos-staticpos-align-self-004-ref.html
-== flex-abspos-staticpos-align-self-005.html flex-abspos-staticpos-align-self-005-ref.html
-== flex-abspos-staticpos-align-self-006.html flex-abspos-staticpos-align-self-006-ref.html
-== flex-abspos-staticpos-align-self-007.html flex-abspos-staticpos-align-self-007-ref.html
-== flex-abspos-staticpos-align-self-008.html flex-abspos-staticpos-align-self-008-ref.html
-== flex-abspos-staticpos-align-self-rtl-001.html flex-abspos-staticpos-align-self-rtl-001-ref.html
-== flex-abspos-staticpos-align-self-rtl-002.html flex-abspos-staticpos-align-self-rtl-002-ref.html
-== flex-abspos-staticpos-align-self-rtl-003.html flex-abspos-staticpos-align-self-rtl-003-ref.html
-== flex-abspos-staticpos-align-self-rtl-004.html flex-abspos-staticpos-align-self-rtl-004-ref.html
-== flex-abspos-staticpos-align-self-safe-001.html flex-abspos-staticpos-align-self-safe-001-ref.html
-== flex-abspos-staticpos-align-self-vertWM-001.html flex-abspos-staticpos-align-self-vertWM-001-ref.html
-== flex-abspos-staticpos-align-self-vertWM-002.html flex-abspos-staticpos-align-self-vertWM-002-ref.html
-== flex-abspos-staticpos-align-self-vertWM-003.html flex-abspos-staticpos-align-self-vertWM-003-ref.html
-== flex-abspos-staticpos-align-self-vertWM-004.html flex-abspos-staticpos-align-self-vertWM-004-ref.html
-
-== flex-abspos-staticpos-fallback-align-content-001.html flex-abspos-staticpos-fallback-align-content-001-ref.html
-== flex-abspos-staticpos-fallback-justify-content-001.html flex-abspos-staticpos-fallback-justify-content-001-ref.html
-
-== flex-abspos-staticpos-justify-content-001.html flex-abspos-staticpos-justify-content-001-ref.html
-== flex-abspos-staticpos-justify-content-002.html flex-abspos-staticpos-justify-content-002-ref.html
-== flex-abspos-staticpos-justify-content-003.html flex-abspos-staticpos-justify-content-003-ref.html
-== flex-abspos-staticpos-justify-content-004.html flex-abspos-staticpos-justify-content-004-ref.html
-== flex-abspos-staticpos-justify-content-005.html flex-abspos-staticpos-justify-content-005-ref.html
-== flex-abspos-staticpos-justify-content-006.html flex-abspos-staticpos-justify-content-006-ref.html
-== flex-abspos-staticpos-justify-content-007.html flex-abspos-staticpos-justify-content-007-ref.html
-== flex-abspos-staticpos-justify-content-008.html flex-abspos-staticpos-justify-content-008-ref.html
-== flex-abspos-staticpos-justify-content-rtl-001.html flex-abspos-staticpos-justify-content-rtl-001-ref.html
-== flex-abspos-staticpos-justify-content-rtl-002.html flex-abspos-staticpos-justify-content-rtl-002-ref.html
-== flex-abspos-staticpos-justify-content-vertWM-001.html flex-abspos-staticpos-justify-content-vertWM-001-ref.html
-== flex-abspos-staticpos-justify-content-vertWM-002.html flex-abspos-staticpos-justify-content-vertWM-002-ref.html
-
-== flex-abspos-staticpos-justify-self-001.html flex-abspos-staticpos-justify-self-001-ref.html
-
-== flex-abspos-staticpos-margin-001.html flex-abspos-staticpos-margin-001-ref.html
-== flex-abspos-staticpos-margin-002.html flex-abspos-staticpos-margin-002-ref.html
-
-== grid-abspos-staticpos-align-self-001.html grid-abspos-staticpos-align-self-001-ref.html
-== grid-abspos-staticpos-align-self-002.html grid-abspos-staticpos-align-self-002-ref.html
-== grid-abspos-staticpos-align-self-img-001.html grid-abspos-staticpos-align-self-img-001-ref.html
-== grid-abspos-staticpos-align-self-img-002.html grid-abspos-staticpos-align-self-img-002-ref.html
-== grid-abspos-staticpos-align-self-rtl-001.html grid-abspos-staticpos-align-self-rtl-001-ref.html
-== grid-abspos-staticpos-align-self-rtl-002.html grid-abspos-staticpos-align-self-rtl-002-ref.html
-== grid-abspos-staticpos-align-self-rtl-003.html grid-abspos-staticpos-align-self-rtl-003-ref.html
-== grid-abspos-staticpos-align-self-rtl-004.html grid-abspos-staticpos-align-self-rtl-004-ref.html
-== grid-abspos-staticpos-align-self-safe-001.html grid-abspos-staticpos-align-self-safe-001-ref.html
-== grid-abspos-staticpos-align-self-vertWM-001.html grid-abspos-staticpos-align-self-vertWM-001-ref.html
-== grid-abspos-staticpos-align-self-vertWM-002.html grid-abspos-staticpos-align-self-vertWM-002-ref.html
-== grid-abspos-staticpos-align-self-vertWM-003.html grid-abspos-staticpos-align-self-vertWM-003-ref.html
-== grid-abspos-staticpos-align-self-vertWM-004.html grid-abspos-staticpos-align-self-vertWM-004-ref.html
-
-== grid-abspos-staticpos-justify-self-001.html grid-abspos-staticpos-justify-self-001-ref.html
-== grid-abspos-staticpos-justify-self-002.html grid-abspos-staticpos-justify-self-002-ref.html
-== grid-abspos-staticpos-justify-self-img-001.html grid-abspos-staticpos-justify-self-img-001-ref.html
-== grid-abspos-staticpos-justify-self-img-002.html grid-abspos-staticpos-justify-self-img-002-ref.html
-== grid-abspos-staticpos-justify-self-rtl-001.html grid-abspos-staticpos-justify-self-rtl-001-ref.html
-== grid-abspos-staticpos-justify-self-rtl-002.html grid-abspos-staticpos-justify-self-rtl-002-ref.html
-== grid-abspos-staticpos-justify-self-rtl-003.html grid-abspos-staticpos-justify-self-rtl-003-ref.html
-== grid-abspos-staticpos-justify-self-rtl-004.html grid-abspos-staticpos-justify-self-rtl-004-ref.html
-== grid-abspos-staticpos-justify-self-vertWM-001.html grid-abspos-staticpos-justify-self-vertWM-001-ref.html
-== grid-abspos-staticpos-justify-self-vertWM-002.html grid-abspos-staticpos-justify-self-vertWM-002-ref.html
-== grid-abspos-staticpos-justify-self-vertWM-003.html grid-abspos-staticpos-justify-self-vertWM-003-ref.html
-== grid-abspos-staticpos-justify-self-vertWM-004.html grid-abspos-staticpos-justify-self-vertWM-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
index c3ec6c1263d..5b5efb0412b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
@@ -7,9 +7,6 @@
 
 ## CSS Snapshot 2007
 
-# CSS Box Alignment Level 3
-include align3/reftest.list
-
 # CSS2.1
 include css21/reftest.list
 
diff --git a/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
index 6baaeb8ea26..7e540ed1870 100644
--- a/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
+++ b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
@@ -351,6 +351,24 @@ function assert_fonts_exist(availableFonts, expectedFonts) {
               `Missing Families: ${setToString(familySet)}.`);
 }
 
+function assert_postscript_name_exists(
+    availableFonts, postscriptNameSelection) {
+  const postscriptNameSet = new Set(postscriptNameSelection);
+
+  const foundFonts = [];
+  for (const f of availableFonts) {
+    if (postscriptNameSet.has(f.postscriptName)) {
+      foundFonts.push(f.postscriptName);
+    }
+  }
+
+  assert_equals(
+      foundFonts.length, postscriptNameSelection.length,
+      `Expected to only find selected fonts ${
+          JSON.stringify(postscriptNameSelection)}. Instead found: ${
+          JSON.stringify(foundFonts)}`);
+}
+
 function assert_font_has_tables(name, tables, expectedTables) {
   for (const t of expectedTables) {
     assert_equals(t.length, 4,
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
index 6e60910251f..6b694044640 100644
--- a/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
@@ -1,27 +1,40 @@
 'use strict';
 
-font_access_test(async t => {
-  const iterator = navigator.fonts.query();
+const standard_fonts_tests = [
+  null,
+  undefined,
+  {},
+  {select: []},
+];
 
-  if (!isPlatformSupported()) {
-    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
-      for await (const f of iterator) {
-      }
-    })());
-    return;
-  }
+for (const test of standard_fonts_tests) {
+  const inputAsString = JSON.stringify(test) ? JSON.stringify(test) : test;
 
-  assert_equals(typeof iterator, 'object', 'query() should return an Object');
-  assert_true(!!iterator[Symbol.asyncIterator],
-              'query() has an asyncIterator method');
+  font_access_test(async t => {
+    if (!isPlatformSupported()) {
+      await promise_rejects_dom(
+          t, 'NotSupportedError', (async () => {
+            for await (const f of navigator.fonts.query()) {
+            }
+          })());
+      return;
+    }
 
-  const availableFonts = [];
-  for await (const f of iterator) {
-    availableFonts.push(f);
-  }
+    const iterator = navigator.fonts.query();
 
-  assert_fonts_exist(availableFonts, getEnumerationTestSet());
-}, 'query(): standard fonts returned');
+    assert_equals(typeof iterator, 'object', 'query() should return an Object');
+    assert_true(
+        !!iterator[Symbol.asyncIterator],
+        'query() has an asyncIterator method');
+
+    const availableFonts = [];
+    for await (const f of iterator) {
+      availableFonts.push(f);
+    }
+
+    assert_fonts_exist(availableFonts, getEnumerationTestSet());
+  }, `query(): standard fonts returned for input: ${inputAsString}`);
+}
 
 font_access_test(async t => {
   const iterator = navigator.fonts.query();
@@ -51,3 +64,65 @@ font_access_test(async t => {
     previousFont = font;
   }
 }, 'query(): fonts are sorted');
+
+font_access_test(async t => {
+  if (!isPlatformSupported()) {
+    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
+                                for await (const f of navigator.fonts.query()) {
+                                }
+                              })());
+    return;
+  }
+
+  const test = {select: [getEnumerationTestSet()[0].postscriptName]};
+  const iterator = navigator.fonts.query(test);
+
+  const fonts = [];
+  for await (const f of iterator) {
+    fonts.push(f);
+  }
+  assert_postscript_name_exists(fonts, test.select);
+  assert_equals(
+      fonts.length, test.select.length,
+      'The result length should match the test length.');
+}, 'query(): fonts are selected for input');
+
+const non_ascii_input = [
+  {select: ['¥']},
+  {select: ['ß']},
+  {select: ['🎵']},
+  // UTF-16LE, encodes to the same first four bytes as "Ahem" in ASCII.
+  {select: ['\u6841\u6d65']},
+  // U+6C34 CJK UNIFIED IDEOGRAPH (water)
+  {select: ['\u6C34']},
+  // U+1D11E MUSICAL SYMBOL G-CLEF (UTF-16 surrogate pair)
+  {select: ['\uD834\uDD1E']},
+  // U+FFFD REPLACEMENT CHARACTER
+  {select: ['\uFFFD']},
+  // UTF-16 surrogate lead
+  {select: ['\uD800']},
+  // UTF-16 surrogate trail
+  {select: ['\uDC00']},
+];
+
+for (const test of non_ascii_input) {
+  font_access_test(async t => {
+    if (!isPlatformSupported()) {
+      await promise_rejects_dom(
+          t, 'NotSupportedError', (async () => {
+            for await (const f of navigator.fonts.query()) {
+            }
+          })());
+      return;
+    }
+
+    const fonts = [];
+    const iterator = navigator.fonts.query(test);
+    for await (const f of iterator) {
+      fonts.push(f);
+    }
+    assert_equals(
+      fonts.length, 0,
+      `There should be no results. Instead got: ${JSON.stringify(fonts)}`);
+  }, `query(): No match for input: ${JSON.stringify(test)}`);
+}
diff --git a/tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl b/tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl
index b1014f679bb..5983a6ab8dc 100644
--- a/tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl
+++ b/tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl
@@ -11,7 +11,7 @@ dictionary MemoryMeasurement {
 dictionary MemoryBreakdownEntry {
   unsigned long long bytes;
   sequence<MemoryAttribution> attribution;
-  sequence<DOMString> userAgentSpecificTypes;
+  sequence<DOMString> types;
 };
 
 dictionary MemoryAttribution {
@@ -26,5 +26,5 @@ dictionary MemoryAttributionContainer {
 };
 
 partial interface Performance {
-  [CrossOriginIsolated] Promise<MemoryMeasurement> measureMemory();
+  [CrossOriginIsolated] Promise<MemoryMeasurement> measureUserAgentSpecificMemory();
 };
diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
index 1b4f407b962..123f0451874 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
@@ -230,6 +230,7 @@ class Manifest(object):
 
         # 25 items was derived experimentally (2020-01) to be approximately the
         # point at which it is quicker to create a Pool and parallelize update.
+        pool = None
         if parallel and len(to_update) > 25 and cpu_count() > 1:
             # On Python 3 on Windows, using >= MAXIMUM_WAIT_OBJECTS processes
             # causes a crash in the multiprocessing module. Whilst this enum
@@ -262,6 +263,11 @@ class Manifest(object):
             data[new_type][rel_path_parts] = manifest_items
             data[new_type].hashes[rel_path_parts] = file_hash
 
+        # Make sure to terminate the Pool, to avoid hangs on Python 3.
+        # https://docs.python.org/3/library/multiprocessing.html#multiprocessing.pool.Pool
+        if pool is not None:
+            pool.terminate()
+
         if remaining_manifest_paths:
             changed = True
             for rel_path_parts in remaining_manifest_paths:
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
index d860b9ea253..0e1a9de9a65 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
@@ -6,6 +6,7 @@ from .client import (
     Find,
     Frame,
     Session,
+    ShadowRoot,
     Timeouts,
     Window)
 from .error import (
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index fc4222a9ce9..19fe336a6e1 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -372,6 +372,42 @@ class Frame(object):
         return cls(uuid, session)
 
 
+class ShadowRoot(object):
+    identifier = "shadow-075b-4da1-b6ba-e579c2d3230a"
+
+    def __init__(self, session, id):
+        """
+        Construct a new shadow root representation.
+
+        :param id: Shadow root UUID which must be unique across
+            all browsing contexts.
+        :param session: Current ``webdriver.Session``.
+        """
+        self.id = id
+        self.session = session
+
+    @classmethod
+    def from_json(cls, json, session):
+        uuid = json[ShadowRoot.identifier]
+        return cls(uuid, session)
+
+    def send_shadow_command(self, method, uri, body=None):
+        url = "shadow/{}/{}".format(self.id, uri)
+        return self.session.send_session_command(method, url, body)
+
+    @command
+    def find_element(self, strategy, selector):
+        body = {"using": strategy,
+                "value": selector}
+        return self.send_shadow_command("POST", "element", body)
+
+    @command
+    def find_elements(self, strategy, selector):
+        body = {"using": strategy,
+                "value": selector}
+        return self.send_shadow_command("POST", "elements", body)
+
+
 class Find(object):
     def __init__(self, session):
         self.session = session
@@ -804,6 +840,11 @@ class Element(object):
     def screenshot(self):
         return self.send_element_command("GET", "screenshot")
 
+    @property
+    @command
+    def shadow_root(self):
+        return self.send_element_command("GET", "shadow")
+
     @command
     def attribute(self, name):
         return self.send_element_command("GET", "attribute/%s" % name)
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
index 8379656d73d..642612985a8 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
@@ -34,6 +34,11 @@ class WebDriverException(Exception):
         return message
 
 
+class DetachedShadowRootException(WebDriverException):
+    http_status = 404
+    status_code = "detached shadow root"
+
+
 class ElementClickInterceptedException(WebDriverException):
     http_status = 400
     status_code = "element click intercepted"
@@ -114,6 +119,11 @@ class NoSuchFrameException(WebDriverException):
     status_code = "no such frame"
 
 
+class NoSuchShadowRootException(WebDriverException):
+    http_status = 404
+    status_code = "no such shadow root"
+
+
 class NoSuchWindowException(WebDriverException):
     http_status = 404
     status_code = "no such window"
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py
index c811f6f26db..d3faa8508b0 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py
@@ -22,6 +22,8 @@ class Encoder(json.JSONEncoder):
             return {webdriver.Frame.identifier: obj.id}
         elif isinstance(obj, webdriver.Window):
             return {webdriver.Frame.identifier: obj.id}
+        elif isinstance(obj, webdriver.ShadowRoot):
+            return {webdriver.ShadowRoot.identifier: obj.id}
         return super(Encoder, self).default(obj)
 
 
@@ -40,6 +42,8 @@ class Decoder(json.JSONDecoder):
             return webdriver.Frame.from_json(payload, self.session)
         elif isinstance(payload, dict) and webdriver.Window.identifier in payload:
             return webdriver.Window.from_json(payload, self.session)
+        elif isinstance(payload, dict) and webdriver.ShadowRoot.identifier in payload:
+            return webdriver.ShadowRoot.from_json(payload, self.session)
         elif isinstance(payload, dict):
             return {k: self.object_hook(v) for k, v in iteritems(payload)}
         return payload
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
index 1c7736b98b1..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
@@ -1 +1 @@
-mozprocess==1.2.1
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
index 67105e425c7..1d45983a11e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
@@ -1,116 +1,116 @@
-from .base import Browser, ExecutorBrowser, require_arg
-from .base import get_timeout_multiplier   # noqa: F401
-from ..webdriver_server import EdgeChromiumDriverServer
-from ..executors import executor_kwargs as base_executor_kwargs
-from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
-                                           WebDriverRefTestExecutor)  # noqa: F401
-from ..executors.executoredgechromium import EdgeChromiumDriverWdspecExecutor  # noqa: F401
-
-
-__wptrunner__ = {"product": "edgechromium",
-                 "check_args": "check_args",
-                 "browser": "EdgeChromiumBrowser",
-                 "executor": {"testharness": "WebDriverTestharnessExecutor",
-                              "reftest": "WebDriverRefTestExecutor",
-                              "wdspec": "EdgeChromiumDriverWdspecExecutor"},
-                 "browser_kwargs": "browser_kwargs",
-                 "executor_kwargs": "executor_kwargs",
-                 "env_extras": "env_extras",
-                 "env_options": "env_options",
-                 "timeout_multiplier": "get_timeout_multiplier",}
-
-
-def check_args(**kwargs):
-    require_arg(kwargs, "webdriver_binary")
-
-
-def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
-    return {"binary": kwargs["binary"],
-            "webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs.get("webdriver_args")}
-
-
-def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
-                    **kwargs):
-    executor_kwargs = base_executor_kwargs(test_type, server_config,
-                                           cache_manager, run_info_data,
-                                           **kwargs)
-    executor_kwargs["close_after_done"] = True
-    executor_kwargs["supports_eager_pageload"] = False
-
-    capabilities = {
-        "ms:edgeOptions": {
-            "prefs": {
-                "profile": {
-                    "default_content_setting_values": {
-                        "popups": 1
-                    }
-                }
-            },
-            "useAutomationExtension": False,
-            "excludeSwitches": ["enable-automation"],
-            "w3c": True
-        }
-    }
-
-    if test_type == "testharness":
-        capabilities["pageLoadStrategy"] = "none"
-
-    for (kwarg, capability) in [("binary", "binary"), ("binary_args", "args")]:
-        if kwargs[kwarg] is not None:
-            capabilities["ms:edgeOptions"][capability] = kwargs[kwarg]
-
-    if kwargs["headless"]:
-        if "args" not in capabilities["ms:edgeOptions"]:
-            capabilities["ms:edgeOptions"]["args"] = []
-        if "--headless" not in capabilities["ms:edgeOptions"]["args"]:
-            capabilities["ms:edgeOptions"]["args"].append("--headless")
-
-    executor_kwargs["capabilities"] = capabilities
-
-    return executor_kwargs
-
-
-def env_extras(**kwargs):
-    return []
-
-
-def env_options():
-    return {}
-
-
-class EdgeChromiumBrowser(Browser):
-    """MicrosoftEdge is backed by MSEdgeDriver, which is supplied through
-    ``wptrunner.webdriver.EdgeChromiumDriverServer``.
-    """
-
-    def __init__(self, logger, binary, webdriver_binary="msedgedriver",
-                 webdriver_args=None):
-        """Creates a new representation of MicrosoftEdge.  The `binary` argument gives
-        the browser binary to use for testing."""
-        Browser.__init__(self, logger)
-        self.binary = binary
-        self.server = EdgeChromiumDriverServer(self.logger,
-                                         binary=webdriver_binary,
-                                         args=webdriver_args)
-
-    def start(self, **kwargs):
-        self.server.start(block=False)
-
-    def stop(self, force=False):
-        self.server.stop(force=force)
-
-    def pid(self):
-        return self.server.pid
-
-    def is_alive(self):
-        # TODO(ato): This only indicates the driver is alive,
-        # and doesn't say anything about whether a browser session
-        # is active.
-        return self.server.is_alive()
-
-    def cleanup(self):
-        self.stop()
-
-    def executor_browser(self):
-        return ExecutorBrowser, {"webdriver_url": self.server.url}
+from .base import Browser, ExecutorBrowser, require_arg
+from .base import get_timeout_multiplier   # noqa: F401
+from ..webdriver_server import EdgeChromiumDriverServer
+from ..executors import executor_kwargs as base_executor_kwargs
+from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
+                                           WebDriverRefTestExecutor)  # noqa: F401
+from ..executors.executoredgechromium import EdgeChromiumDriverWdspecExecutor  # noqa: F401
+
+
+__wptrunner__ = {"product": "edgechromium",
+                 "check_args": "check_args",
+                 "browser": "EdgeChromiumBrowser",
+                 "executor": {"testharness": "WebDriverTestharnessExecutor",
+                              "reftest": "WebDriverRefTestExecutor",
+                              "wdspec": "EdgeChromiumDriverWdspecExecutor"},
+                 "browser_kwargs": "browser_kwargs",
+                 "executor_kwargs": "executor_kwargs",
+                 "env_extras": "env_extras",
+                 "env_options": "env_options",
+                 "timeout_multiplier": "get_timeout_multiplier",}
+
+
+def check_args(**kwargs):
+    require_arg(kwargs, "webdriver_binary")
+
+
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
+    return {"binary": kwargs["binary"],
+            "webdriver_binary": kwargs["webdriver_binary"],
+            "webdriver_args": kwargs.get("webdriver_args")}
+
+
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
+                    **kwargs):
+    executor_kwargs = base_executor_kwargs(test_type, server_config,
+                                           cache_manager, run_info_data,
+                                           **kwargs)
+    executor_kwargs["close_after_done"] = True
+    executor_kwargs["supports_eager_pageload"] = False
+
+    capabilities = {
+        "ms:edgeOptions": {
+            "prefs": {
+                "profile": {
+                    "default_content_setting_values": {
+                        "popups": 1
+                    }
+                }
+            },
+            "useAutomationExtension": False,
+            "excludeSwitches": ["enable-automation"],
+            "w3c": True
+        }
+    }
+
+    if test_type == "testharness":
+        capabilities["pageLoadStrategy"] = "none"
+
+    for (kwarg, capability) in [("binary", "binary"), ("binary_args", "args")]:
+        if kwargs[kwarg] is not None:
+            capabilities["ms:edgeOptions"][capability] = kwargs[kwarg]
+
+    if kwargs["headless"]:
+        if "args" not in capabilities["ms:edgeOptions"]:
+            capabilities["ms:edgeOptions"]["args"] = []
+        if "--headless" not in capabilities["ms:edgeOptions"]["args"]:
+            capabilities["ms:edgeOptions"]["args"].append("--headless")
+
+    executor_kwargs["capabilities"] = capabilities
+
+    return executor_kwargs
+
+
+def env_extras(**kwargs):
+    return []
+
+
+def env_options():
+    return {}
+
+
+class EdgeChromiumBrowser(Browser):
+    """MicrosoftEdge is backed by MSEdgeDriver, which is supplied through
+    ``wptrunner.webdriver.EdgeChromiumDriverServer``.
+    """
+
+    def __init__(self, logger, binary, webdriver_binary="msedgedriver",
+                 webdriver_args=None):
+        """Creates a new representation of MicrosoftEdge.  The `binary` argument gives
+        the browser binary to use for testing."""
+        Browser.__init__(self, logger)
+        self.binary = binary
+        self.server = EdgeChromiumDriverServer(self.logger,
+                                         binary=webdriver_binary,
+                                         args=webdriver_args)
+
+    def start(self, **kwargs):
+        self.server.start(block=False)
+
+    def stop(self, force=False):
+        self.server.stop(force=force)
+
+    def pid(self):
+        return self.server.pid
+
+    def is_alive(self):
+        # TODO(ato): This only indicates the driver is alive,
+        # and doesn't say anything about whether a browser session
+        # is active.
+        return self.server.is_alive()
+
+    def cleanup(self):
+        self.stop()
+
+    def executor_browser(self):
+        return ExecutorBrowser, {"webdriver_url": self.server.url}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executoredgechromium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executoredgechromium.py
index a0263af6803..ebba06a9e1a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executoredgechromium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executoredgechromium.py
@@ -1,10 +1,10 @@
-from ..webdriver_server import EdgeChromiumDriverServer
-from .base import WdspecExecutor, WdspecProtocol
-
-
-class EdgeChromiumDriverProtocol(WdspecProtocol):
-    server_cls = EdgeChromiumDriverServer
-
-
-class EdgeChromiumDriverWdspecExecutor(WdspecExecutor):
-    protocol_cls = EdgeChromiumDriverProtocol
+from ..webdriver_server import EdgeChromiumDriverServer
+from .base import WdspecExecutor, WdspecProtocol
+
+
+class EdgeChromiumDriverProtocol(WdspecProtocol):
+    server_cls = EdgeChromiumDriverServer
+
+
+class EdgeChromiumDriverWdspecExecutor(WdspecExecutor):
+    protocol_cls = EdgeChromiumDriverProtocol
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js b/tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js
index 86f593f46f8..ac468947ec2 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js
@@ -126,6 +126,134 @@ const instanceTestFactory = [
     }
   ],
 
+  [
+    "imports with empty module names",
+    function() {
+      const builder = new WasmModuleBuilder();
+
+      builder.addImport("", "fn", kSig_v_v);
+      builder.addImportedGlobal("", "global", kWasmI32);
+      builder.addImportedMemory("", "memory", 0, 128);
+      builder.addImportedTable("", "table", 0, 128);
+
+      const buffer = builder.toBuffer();
+      const imports = {
+        "": {
+          "fn": function() {},
+          "global": 0,
+          "memory": new WebAssembly.Memory({ "initial": 64, maximum: 128 }),
+          "table": new WebAssembly.Table({ "element": "anyfunc", "initial": 64, maximum: 128 }),
+        },
+      };
+
+      return {
+        buffer,
+        args: [imports],
+        exports: {},
+        verify: () => {},
+      };
+    }
+  ],
+
+  [
+    "imports with empty names",
+    function() {
+      const builder = new WasmModuleBuilder();
+
+      builder.addImport("a", "", kSig_v_v);
+      builder.addImportedGlobal("b", "", kWasmI32);
+      builder.addImportedMemory("c", "", 0, 128);
+      builder.addImportedTable("d", "", 0, 128);
+
+      const buffer = builder.toBuffer();
+      const imports = {
+        "a": { "": function() {} },
+        "b": { "": 0 },
+        "c": { "": new WebAssembly.Memory({ "initial": 64, maximum: 128 }) },
+        "d": { "": new WebAssembly.Table({ "element": "anyfunc", "initial": 64, maximum: 128 }) },
+      };
+
+      return {
+        buffer,
+        args: [imports],
+        exports: {},
+        verify: () => {},
+      };
+    }
+  ],
+
+  [
+    "exports with empty name: function",
+    function() {
+      const builder = new WasmModuleBuilder();
+
+      builder
+        .addFunction("", kSig_v_d)
+        .addBody([])
+        .exportFunc();
+
+      const buffer = builder.toBuffer();
+
+      const exports = {
+        "": { "kind": "function", "name": "0", "length": 1 },
+      };
+
+      return {
+        buffer,
+        args: [],
+        exports,
+        verify: () => {},
+      };
+    }
+  ],
+
+  [
+    "exports with empty name: table",
+    function() {
+      const builder = new WasmModuleBuilder();
+
+      builder.setTableBounds(1);
+      builder.addExportOfKind("", kExternalTable, 0);
+
+      const buffer = builder.toBuffer();
+
+      const exports = {
+        "": { "kind": "table", "length": 1 },
+      };
+
+      return {
+        buffer,
+        args: [],
+        exports,
+        verify: () => {},
+      };
+    }
+  ],
+
+  [
+    "exports with empty name: global",
+    function() {
+      const builder = new WasmModuleBuilder();
+
+      builder.addGlobal(kWasmI32, true)
+        .exportAs("")
+        .init = 7;
+
+      const buffer = builder.toBuffer();
+
+      const exports = {
+        "": { "kind": "global", "value": 7 },
+      };
+
+      return {
+        buffer,
+        args: [],
+        exports,
+        verify: () => {},
+      };
+    }
+  ],
+
   [
     "No imports",
     function() {
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js
index 60b2c04f436..40a3935a4a2 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js
@@ -75,6 +75,12 @@ test(() => {
   }
 }, "Branding");
 
+test(() => {
+  const module = new WebAssembly.Module(emptyModuleBinary);
+  const exports = WebAssembly.Module.exports(module);
+  assert_true(Array.isArray(exports));
+}, "Return type");
+
 test(() => {
   const module = new WebAssembly.Module(emptyModuleBinary);
   const exports = WebAssembly.Module.exports(module);
@@ -124,6 +130,54 @@ test(() => {
   assert_exports(exports, expected);
 }, "exports");
 
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder
+    .addFunction("", kSig_v_v)
+    .addBody([])
+    .exportFunc();
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const exports = WebAssembly.Module.exports(module);
+  const expected = [
+    { "kind": "function", "name": "" },
+  ];
+  assert_exports(exports, expected);
+}, "exports with empty name: function");
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder.setTableBounds(1);
+  builder.addExportOfKind("", kExternalTable, 0);
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const exports = WebAssembly.Module.exports(module);
+  const expected = [
+    { "kind": "table", "name": "" },
+  ];
+  assert_exports(exports, expected);
+}, "exports with empty name: table");
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder.addGlobal(kWasmI32, true)
+    .exportAs("")
+    .init = 7;
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const exports = WebAssembly.Module.exports(module);
+  const expected = [
+    { "kind": "global", "name": "" },
+  ];
+  assert_exports(exports, expected);
+}, "exports with empty name: global");
+
 test(() => {
   const module = new WebAssembly.Module(emptyModuleBinary);
   const exports = WebAssembly.Module.exports(module, {});
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js
index d6754c9efbd..ec550ce6c41 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js
@@ -118,6 +118,66 @@ test(() => {
   assert_imports(imports, expected);
 }, "imports");
 
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder.addImport("", "fn", kSig_v_v);
+  builder.addImportedGlobal("", "global", kWasmI32);
+  builder.addImportedMemory("", "memory", 0, 128);
+  builder.addImportedTable("", "table", 0, 128);
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const imports = WebAssembly.Module.imports(module);
+  const expected = [
+    { "module": "", "kind": "function", "name": "fn" },
+    { "module": "", "kind": "global", "name": "global" },
+    { "module": "", "kind": "memory", "name": "memory" },
+    { "module": "", "kind": "table", "name": "table" },
+  ];
+  assert_imports(imports, expected);
+}, "imports with empty module name");
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder.addImport("a", "", kSig_v_v);
+  builder.addImportedGlobal("b", "", kWasmI32);
+  builder.addImportedMemory("c", "", 0, 128);
+  builder.addImportedTable("d", "", 0, 128);
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const imports = WebAssembly.Module.imports(module);
+  const expected = [
+    { "module": "a", "kind": "function", "name": "" },
+    { "module": "b", "kind": "global", "name": "" },
+    { "module": "c", "kind": "memory", "name": "" },
+    { "module": "d", "kind": "table", "name": "" },
+  ];
+  assert_imports(imports, expected);
+}, "imports with empty names");
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+
+  builder.addImport("", "", kSig_v_v);
+  builder.addImportedGlobal("", "", kWasmI32);
+  builder.addImportedMemory("", "", 0, 128);
+  builder.addImportedTable("", "", 0, 128);
+
+  const buffer = builder.toBuffer()
+  const module = new WebAssembly.Module(buffer);
+  const imports = WebAssembly.Module.imports(module);
+  const expected = [
+    { "module": "", "kind": "function", "name": "" },
+    { "module": "", "kind": "global", "name": "" },
+    { "module": "", "kind": "memory", "name": "" },
+    { "module": "", "kind": "table", "name": "" },
+  ];
+  assert_imports(imports, expected);
+}, "imports with empty module names and names");
+
 test(() => {
   const module = new WebAssembly.Module(emptyModuleBinary);
   const imports = WebAssembly.Module.imports(module, {});
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js
new file mode 100644
index 00000000000..35db2c73599
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-reftypes.tentative.any.js
@@ -0,0 +1,49 @@
+// META: global=window,dedicatedworker,jsshell
+// META: script=assertions.js
+// META: script=/wasm/jsapi/wasm-constants.js
+// META: script=/wasm/jsapi/wasm-module-builder.js
+
+// Test cases for changes to the WebAssembly.Table constructor API that
+// come in with the reftypes proposal: the API takes a default argument, which
+// is used as an initializing value for the WebAssembly.Table.
+//
+// See:
+//   https://webassembly.github.io/reference-types/js-api/index.html#tables
+
+test(() => {
+  const testObject = {};
+  const argument = { "element": "externref", "initial": 3 };
+  const table = new WebAssembly.Table(argument, testObject);
+  assert_equals(table.length, 3);
+  assert_equals(table.get(0), testObject);
+  assert_equals(table.get(1), testObject);
+  assert_equals(table.get(2), testObject);
+}, "initialize externref table with default value");
+
+test(() => {
+  const argument = { "element": "i32", "initial": 3 };
+  assert_throws_js(TypeError, () => new WebAssembly.Table(argument));
+}, "initialize table with a wrong element value");
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+  builder
+    .addFunction("fn", kSig_v_v)
+    .addBody([])
+    .exportFunc();
+  const bin = builder.toBuffer();
+  const fn = new WebAssembly.Instance(new WebAssembly.Module(bin)).exports.fn;
+  const argument = { "element": "anyfunc", "initial": 3 };
+  const table = new WebAssembly.Table(argument, fn);
+  assert_equals(table.length, 3);
+  assert_equals(table.get(0), fn);
+  assert_equals(table.get(1), fn);
+  assert_equals(table.get(2), fn);
+}, "initialize anyfunc table with default value");
+
+test(() => {
+  const argument = { "element": "anyfunc", "initial": 3 };
+  assert_throws_js(TypeError, () => new WebAssembly.Table(argument, {}));
+  assert_throws_js(TypeError, () => new WebAssembly.Table(argument, "cannot be used as a wasm function"));
+  assert_throws_js(TypeError, () => new WebAssembly.Table(argument, 37));
+}, "initialize anyfunc table with a bad default value");
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js
new file mode 100644
index 00000000000..83b36a32415
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/set-reftypes.tentative.any.js
@@ -0,0 +1,50 @@
+// META: global=window,dedicatedworker,jsshell
+// META: script=assertions.js
+// META: script=/wasm/jsapi/wasm-constants.js
+// META: script=/wasm/jsapi/wasm-module-builder.js
+
+// Test cases for changes to the WebAssembly.Table.prototype.set() API that
+// come in with the reftypes proposal: the API makes the second argument optional and
+// if it is missing we should use DefaultValue of the table's element type.
+//
+// See:
+//   https://webassembly.github.io/reference-types/js-api/index.html#tables
+
+test(() => {
+  const builder = new WasmModuleBuilder();
+  builder
+    .addFunction("fn", kSig_v_v)
+    .addBody([])
+    .exportFunc();
+  const bin = builder.toBuffer();
+  const fn = new WebAssembly.Instance(new WebAssembly.Module(bin)).exports.fn;
+
+  const argument = { "element": "anyfunc", "initial": 1 };
+  const table = new WebAssembly.Table(argument, fn);
+
+  assert_equals(table.get(0), fn);
+  table.set(0);
+  assert_equals(table.get(0), null);
+
+  table.set(0, fn);
+  assert_equals(table.get(0), fn);
+
+  assert_throws_js(TypeError, () => table.set(0, {}));
+  assert_throws_js(TypeError, () => table.set(0, 37));
+}, "Arguments for anyfunc table set");
+
+test(() => {
+  const testObject = {};
+  const argument = { "element": "externref", "initial": 1 };
+  const table = new WebAssembly.Table(argument, testObject);
+
+  assert_equals(table.get(0), testObject);
+  table.set(0);
+  assert_equals(table.get(0), undefined);
+
+  table.set(0, testObject);
+  assert_equals(table.get(0), testObject);
+
+  table.set(0, 37);
+  assert_equals(table.get(0), 37);
+}, "Arguments for externref table set");
diff --git a/tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js b/tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js
index 752519392a9..37373d49971 100644
--- a/tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js
+++ b/tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js
@@ -7,9 +7,15 @@ setup(() => {
 });
 
 for (const method of ["compileStreaming", "instantiateStreaming"]) {
+  promise_test(t => {
+    const buffer = new Uint8Array(Array.from(emptyModuleBinary).concat([0, 0]));
+    const response = new Response(buffer, { headers: { "Content-Type": "application/wasm" } });
+    return promise_rejects_js(t, WebAssembly.CompileError, WebAssembly[method](response));
+  }, `Invalid code (0x0000): ${method}`);
+
   promise_test(t => {
     const buffer = new Uint8Array(Array.from(emptyModuleBinary).concat([0xCA, 0xFE]));
     const response = new Response(buffer, { headers: { "Content-Type": "application/wasm" } });
     return promise_rejects_js(t, WebAssembly.CompileError, WebAssembly[method](response));
-  }, `Invalid code: ${method}`);
+  }, `Invalid code (0xCAFE): ${method}`);
 }
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/conftest.py
new file mode 100644
index 00000000000..b8fc93319f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/conftest.py
@@ -0,0 +1,19 @@
+import pytest
+
+@pytest.fixture
+def get_shadow_page(inline):
+    def get_shadow_page(shadow_content):
+        return inline("""
+            <custom-shadow-element></custom-shadow-element>
+            <script>
+                customElements.define('custom-shadow-element',
+                    class extends HTMLElement {{
+                        constructor() {{
+                                super();
+                                this.attachShadow({{mode: 'open'}}).innerHTML = `
+                                    {{ {0} }}
+                                `;
+                            }}
+                    }});
+            </script>""".format(shadow_content))
+    return get_shadow_page
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/find.py
new file mode 100644
index 00000000000..87941d495e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/find.py
@@ -0,0 +1,141 @@
+import pytest
+
+from webdriver.transport import Response
+
+from tests.support.asserts import assert_error, assert_same_element, assert_success
+
+
+def find_element(session, shadow_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/shadow/{shadow_id}/element".format(
+            session_id=session.session_id,
+            shadow_id=shadow_id),
+        {"using": using, "value": value})
+
+
+def test_null_parameter_value(session, http, get_shadow_page):
+    session.url = get_shadow_page("<div><a href=# id=linkText>full link text</a></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+
+    path = "/session/{session_id}/shadow/{shadow_id}/element".format(
+        session_id=session.session_id, shadow_id=shadow_root.id)
+    with http.post(path, None) as response:
+        assert_error(Response.from_http(response), "invalid argument")
+
+
+def test_no_top_browsing_context(session, closed_window):
+    response = find_element(session, "notReal", "css selector", "foo")
+    assert_error(response, "no such window")
+
+
+def test_no_browsing_context(session, closed_frame):
+    response = find_element(session, "notReal", "css selector", "foo")
+    assert_error(response, "no such window")
+
+
+@pytest.mark.parametrize("using", ["a", True, None, 1, [], {}])
+def test_invalid_using_argument(session, using):
+    # Step 1 - 2
+    response = find_element(session, "notReal", using, "value")
+    assert_error(response, "invalid argument")
+
+
+@pytest.mark.parametrize("value", [None, [], {}])
+def test_invalid_selector_argument(session, value):
+    # Step 3 - 4
+    response = find_element(session, "notReal", "css selector", value)
+    assert_error(response, "invalid argument")
+
+
+def test_detached_shadow_root(session, get_shadow_page):
+    session.url = get_shadow_page("<div><input type='checkbox'/></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    session.refresh()
+
+    response = find_element(session, shadow_root.id, "css", "input")
+    assert_error(response, "detached shadow root")
+
+
+def test_found_element_equivalence(session, get_shadow_page):
+    session.url = get_shadow_page("<div><input type='checkbox'/></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelector('input')",
+                                      args=(custom_element,))
+    shadow_root = custom_element.shadow_root
+    response = find_element(session, shadow_root.id, "css", "input")
+    value = assert_success(response)
+    assert_same_element(session, value, expected)
+
+
+@pytest.mark.parametrize("using,value",
+                         [("css selector", "#linkText"),
+                          ("link text", "full link text"),
+                          ("partial link text", "link text"),
+                          ("tag name", "a"),
+                          ("xpath", "//a")])
+def test_find_element(session, get_shadow_page, using, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div><a href=# id=linkText>full link text</a></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelector('#linkText')",
+                                      args=(custom_element,))
+    shadow_root = custom_element.shadow_root
+    response = find_element(session, shadow_root.id, using, value)
+    assert_success(response)
+    assert_same_element(session, value, expected)
+
+
+@pytest.mark.parametrize("document,value", [
+    ("<a href=#>link text</a>", "link text"),
+    ("<a href=#>&nbsp;link text&nbsp;</a>", "link text"),
+    ("<a href=#>link<br>text</a>", "link\ntext"),
+    ("<a href=#>link&amp;text</a>", "link&text"),
+    ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
+    ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
+])
+def test_find_element_link_text(session, get_shadow_page, document, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div>{0}</div>".format(document))
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelectorAll('a')[0]",
+                                      args=(custom_element,))
+    shadow_root = custom_element.shadow_root
+
+    response = find_element(session, shadow_root.id, "link text", value)
+    assert_success(response)
+    assert_same_element(session, value, expected)
+
+
+@pytest.mark.parametrize("document,value", [
+    ("<a href=#>partial link text</a>", "link"),
+    ("<a href=#>&nbsp;partial link text&nbsp;</a>", "link"),
+    ("<a href=#>partial link text</a>", "k t"),
+    ("<a href=#>partial link<br>text</a>", "k\nt"),
+    ("<a href=#>partial link&amp;text</a>", "k&t"),
+    ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
+    ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
+])
+def test_find_element_partial_link_text(session, get_shadow_page, document, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div>{0}</div>".format(document))
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelectorAll('a')[0]",
+                                      args=(custom_element,))
+    shadow_root = custom_element.shadow_root
+
+    response = find_element(session, shadow_root.id, "partial link text", value)
+    assert_success(response)
+    assert_same_element(session, value, expected)
+
+
+@pytest.mark.parametrize("using,value", [("css selector", "#wontExist")])
+def test_no_element(session, get_shadow_page, using, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+
+    response = find_element(session, shadow_root.id, using, value)
+    assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/user_prompts.py
new file mode 100644
index 00000000000..3813a7df5d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_shadow_root/user_prompts.py
@@ -0,0 +1,129 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+
+
+def find_element(session, shadow_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/shadow/{shadow_id}/element".format(
+            session_id=session.session_id,
+            element_id=shadow_id),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+        inner_element = session.execute_script("return arguments[0].shadowRoot.querySelector('p')",
+                                               args=(outer_element,))
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, shadow_root.id, "css selector", "p")
+        value = assert_success(response)
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value, inner_element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, shadow_root.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, shadow_root.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/conftest.py
new file mode 100644
index 00000000000..b8fc93319f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/conftest.py
@@ -0,0 +1,19 @@
+import pytest
+
+@pytest.fixture
+def get_shadow_page(inline):
+    def get_shadow_page(shadow_content):
+        return inline("""
+            <custom-shadow-element></custom-shadow-element>
+            <script>
+                customElements.define('custom-shadow-element',
+                    class extends HTMLElement {{
+                        constructor() {{
+                                super();
+                                this.attachShadow({{mode: 'open'}}).innerHTML = `
+                                    {{ {0} }}
+                                `;
+                            }}
+                    }});
+            </script>""".format(shadow_content))
+    return get_shadow_page
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/find.py
new file mode 100644
index 00000000000..f70a4b45aad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/find.py
@@ -0,0 +1,144 @@
+import pytest
+
+from webdriver.transport import Response
+
+from tests.support.asserts import assert_error, assert_same_element, assert_success
+
+
+def find_elements(session, shadow_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/shadow/{shadow_id}/elements".format(
+            session_id=session.session_id,
+            shadow_id=shadow_id),
+        {"using": using, "value": value})
+
+
+def test_null_parameter_value(session, http, inline):
+    session.url = inline("<div><a href=# id=linkText>full link text</a></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+
+    path = "/session/{session_id}/shadow/{shadow_id}/elements".format(
+        session_id=session.session_id, shadow_id=shadow_root.id)
+    with http.post(path, None) as response:
+        assert_error(Response.from_http(response), "invalid argument")
+
+
+def test_no_top_browsing_context(session, closed_window):
+    response = find_elements(session, "notReal", "css selector", "foo")
+    assert_error(response, "no such window")
+
+
+def test_no_browsing_context(session, closed_frame):
+    response = find_elements(session, "notReal", "css selector", "foo")
+    assert_error(response, "no such window")
+
+
+@pytest.mark.parametrize("using", [("a"), (True), (None), (1), ([]), ({})])
+def test_invalid_using_argument(session, using):
+    # Step 1 - 2
+    response = find_elements(session, "notReal", using, "value")
+    assert_error(response, "invalid argument")
+
+
+@pytest.mark.parametrize("value", [None, [], {}])
+def test_invalid_selector_argument(session, value):
+    # Step 3 - 4
+    response = find_elements(session, "notReal", "css selector", value)
+    assert_error(response, "invalid argument")
+
+
+def test_detached_shadow_root(session, get_shadow_page):
+    session.url = get_shadow_page("<div><input type='checkbox'/></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    session.refresh()
+
+    response = find_elements(session, shadow_root.id, "css", "input")
+    assert_error(response, "detached shadow root")
+
+
+def test_find_elements_equivalence(session, get_shadow_page):
+    session.url = get_shadow_page("<div><input id='check' type='checkbox'/><input id='text'/></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    response = find_elements(session, shadow_root.id, "css", "input")
+    assert_success(response)
+
+
+@pytest.mark.parametrize("using,value",
+                         [("css selector", "#linkText"),
+                          ("link text", "full link text"),
+                          ("partial link text", "link text"),
+                          ("tag name", "a"),
+                          ("xpath", "//a")])
+def test_find_elements(session, get_shadow_page, using, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div><a href=# id=linkText>full link text</a></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    response = find_elements(session, shadow_root.id, using, value)
+    assert_success(response)
+
+
+@pytest.mark.parametrize("document,value", [
+    ("<a href=#>link text</a>", "link text"),
+    ("<a href=#>&nbsp;link text&nbsp;</a>", "link text"),
+    ("<a href=#>link<br>text</a>", "link\ntext"),
+    ("<a href=#>link&amp;text</a>", "link&text"),
+    ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
+    ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
+])
+def test_find_elements_link_text(session, get_shadow_page, document, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div><a href=#>not wanted</a><br/>{0}</div>".format(document))
+    element = session.find.css("div", all=False)
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelectorAll('a')[1]",
+                                      args=(custom_element,))
+
+    response = find_elements(session, shadow_root.id, "link text", value)
+    value = assert_success(response)
+    assert isinstance(value, list)
+    assert len(value) == 1
+
+    found_element = value[0]
+    assert_same_element(session, found_element, expected)
+
+
+@pytest.mark.parametrize("document,value", [
+    ("<a href=#>partial link text</a>", "link"),
+    ("<a href=#>&nbsp;partial link text&nbsp;</a>", "link"),
+    ("<a href=#>partial link text</a>", "k t"),
+    ("<a href=#>partial link<br>text</a>", "k\nt"),
+    ("<a href=#>partial link&amp;text</a>", "k&t"),
+    ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
+    ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
+])
+def test_find_elements_partial_link_text(session, get_shadow_page, document, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div><a href=#>not wanted</a><br/>{0}</div>".format(document))
+    element = session.find.css("div", all=False)
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    expected = session.execute_script("return arguments[0].shadowRoot.querySelectorAll('a')[1]",
+                                      args=(custom_element,))
+
+    response = find_elements(session, shadow_root.id, "partial link text", value)
+    value = assert_success(response)
+    assert isinstance(value, list)
+    assert len(value) == 1
+
+    found_element = value[0]
+    assert_same_element(session, found_element, expected)
+
+
+@pytest.mark.parametrize("using,value", [("css selector", "#wontExist")])
+def test_no_element(session, get_shadow_page, using, value):
+    # Step 8 - 9
+    session.url = get_shadow_page("<div></div>")
+    custom_element = session.find.css("custom-shadow-element", all=False)
+    shadow_root = custom_element.shadow_root
+    response = find_elements(session, shadow_root.id, using, value)
+    assert response.body["value"] == []
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/user_prompts.py
new file mode 100644
index 00000000000..c4b903c836e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_shadow_root/user_prompts.py
@@ -0,0 +1,131 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+
+
+def find_elements(session, shadow_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/shadow/{shadow_id}/elements".format(
+            session_id=session.session_id,
+            element_id=shadow_id),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+        inner_element = session.execute_script("return arguments[0].shadowRoot.querySelector('p')",
+                                               args=(outer_element,))
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, shadow_root.id, "css selector", "p")
+        value = assert_success(response)
+        assert isinstance(value, list)
+        assert len(value) == 1
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value[0], inner_element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, shadow_root.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog, get_shadow_page):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = get_shadow_page("<div><p>bar</p><div>")
+        outer_element = session.find.css("custom-shadow-element", all=False)
+        shadow_root = outer_element.shadow_root
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, shadow_root.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/conftest.py
new file mode 100644
index 00000000000..afc0c91c3d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/conftest.py
@@ -0,0 +1,22 @@
+import pytest
+
+@pytest.fixture
+def checkbox_dom(inline):
+    return inline("""
+        <style>
+            custom-checkbox-element {
+                display:block; width:20px; height:20px;
+            }
+        </style>
+        <custom-checkbox-element></custom-checkbox-element>
+        <script>
+            customElements.define('custom-checkbox-element',
+                class extends HTMLElement {
+                    constructor() {
+                            super();
+                            this.attachShadow({mode: 'open'}).innerHTML = `
+                                <div><input type="checkbox"/></div>
+                            `;
+                        }
+                });
+        </script>""")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py
new file mode 100644
index 00000000000..27c1e4a44ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py
@@ -0,0 +1,58 @@
+import pytest
+
+from tests.support.asserts import assert_error, assert_same_element, assert_success
+
+
+def get_shadow_root(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/shadow".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+def test_no_top_browsing_context(session, closed_window):
+    original_handle, element = closed_window
+    response = get_shadow_root(session, element.id)
+    assert_error(response, "no such window")
+    response = get_shadow_root(session, "foo")
+    assert_error(response, "no such window")
+
+    session.window_handle = original_handle
+    response = get_shadow_root(session, element.id)
+    assert_error(response, "no such element")
+
+
+def test_no_browsing_context(session, closed_frame):
+    response = get_shadow_root(session, "foo")
+    assert_error(response, "no such window")
+
+
+def test_element_not_found(session):
+    result = get_shadow_root(session, "foo")
+    assert_error(result, "no such element")
+
+
+def test_element_stale(session, checkbox_dom):
+    session.url = checkbox_dom
+    element = session.find.css("custom-checkbox-element", all=False)
+    session.refresh()
+
+    result = get_shadow_root(session, element.id)
+    assert_error(result, "stale element reference")
+
+
+def test_get_shadow_root(session, checkbox_dom):
+    session.url = checkbox_dom
+    expected = session.execute_script(
+        "return document.querySelector('custom-checkbox-element').shadowRoot.host")
+    custom_element = session.find.css("custom-checkbox-element", all=False)
+    response = get_shadow_root(session, custom_element.id)
+    assert_success(response)
+    assert_same_element(session, custom_element, expected)
+
+
+def test_no_shadow_root(session, inline):
+    session.url = inline("<div><p>no shadow root</p></div>")
+    element = session.find.css("div", all=False)
+    response = get_shadow_root(session, element.id)
+    assert_error(response, "no such shadow root")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/user_prompts.py
new file mode 100644
index 00000000000..55b50f0d9c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/user_prompts.py
@@ -0,0 +1,118 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
+
+
+def get_shadow_root(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/shadow".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog, checkbox_dom):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = checkbox_dom
+        element = session.find.css("custom-checkbox-element", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = get_shadow_root(session, element.id)
+        value = assert_success(response)
+        assert isinstance(value, dict)
+        assert "shadow-075b-4da1-b6ba-e579c2d3230a" in dict
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog, checkbox_dom):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = checkbox_dom
+        element = session.find.css("custom-checkbox-element", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = get_shadow_root(session, element.id)
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog, checkbox_dom):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = checkbox_dom
+        element = session.find.css("custom-checkbox-element", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = get_shadow_root(session, element.id)
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/handshake_no_extensions_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/handshake_no_extensions_wsh.py
old mode 100644
new mode 100755
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/referrer_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/referrer_wsh.py
old mode 100644
new mode 100755
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py
old mode 100644
new mode 100755
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/blitframebuffer-multisampled-readbuffer.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/blitframebuffer-multisampled-readbuffer.html.ini
index e953831a6f1..f9999f62488 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/blitframebuffer-multisampled-readbuffer.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/blitframebuffer-multisampled-readbuffer.html.ini
@@ -1,7 +1,5 @@
 [blitframebuffer-multisampled-readbuffer.html]
-  expected:
-    if os =="mac": ERROR
-
+  expected: ERROR
   [WebGL test #1: Framebuffer incomplete.]
     expected:
       if os == "linux": FAIL
@@ -15,6 +13,5 @@
       if os == "mac": FAIL
 
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected:
-      if os == "mac": FAIL
+    expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 880676c6f4d..a83e0a1c842 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -275,3 +275,12 @@
   [WebGL test #48: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,42,0,0]
     expected: FAIL
 
+  [WebGL test #38: attachment 1 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,255,255]
+    expected: FAIL
+
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 0,0,0,0]
+    expected: FAIL
+
+  [WebGL test #46: attachment 1 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+