diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..665ec4646cb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    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
new file mode 100644
index 00000000000..13bd6abf376
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index 147f062e548..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
new file mode 100644
index 00000000000..3e5096beef3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-float-002.html]
+  [block-in-inline-hittest-float-002]
+    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
index f3d5a1904d9..d4f9786638e 100644
--- 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
@@ -1,5 +1,4 @@
 [position-absolute-013.html]
-  expected: TIMEOUT
   [.flexbox 309]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-anonymous-box.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-anonymous-box.html.ini
deleted file mode 100644
index b8f8d45a31f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-anonymous-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hittest-anonymous-box.html]
-  [Hit-testing within an anonymous flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 57187369806..dbe71f47afd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -176,9 +176,6 @@
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -20deg -15deg' over 'oblique -60deg -30deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'oblique 0deg 10deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
@@ -212,9 +209,6 @@
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '503 520' over '500']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
     expected: FAIL
 
@@ -319,3 +313,9 @@
 
   [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
+
+  [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index dffa7ab597c..c4daffd168f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -52,276 +52,3 @@
 
   [background-position length(px) / events]
     expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
-  [background-color color(rgba) / values]
-    expected: FAIL
-
-  [border-top-width length(pt) / values]
-    expected: FAIL
-
-  [border-top-width length(pc) / values]
-    expected: FAIL
-
-  [border-top-width length(px) / values]
-    expected: FAIL
-
-  [border-top-width length(em) / values]
-    expected: FAIL
-
-  [border-top-width length(ex) / values]
-    expected: FAIL
-
-  [border-top-width length(mm) / values]
-    expected: FAIL
-
-  [border-top-width length(cm) / values]
-    expected: FAIL
-
-  [border-top-width length(in) / values]
-    expected: FAIL
-
-  [border-right-width length(pt) / values]
-    expected: FAIL
-
-  [border-right-width length(pc) / values]
-    expected: FAIL
-
-  [border-right-width length(px) / values]
-    expected: FAIL
-
-  [border-right-width length(em) / values]
-    expected: FAIL
-
-  [border-right-width length(ex) / values]
-    expected: FAIL
-
-  [border-right-width length(mm) / values]
-    expected: FAIL
-
-  [border-right-width length(cm) / values]
-    expected: FAIL
-
-  [border-right-width length(in) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / values]
-    expected: FAIL
-
-  [border-bottom-width length(px) / values]
-    expected: FAIL
-
-  [border-bottom-width length(em) / values]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / values]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(in) / values]
-    expected: FAIL
-
-  [border-left-width length(pt) / values]
-    expected: FAIL
-
-  [border-left-width length(pc) / values]
-    expected: FAIL
-
-  [border-left-width length(px) / values]
-    expected: FAIL
-
-  [border-left-width length(em) / values]
-    expected: FAIL
-
-  [border-left-width length(ex) / values]
-    expected: FAIL
-
-  [border-left-width length(mm) / values]
-    expected: FAIL
-
-  [border-left-width length(cm) / values]
-    expected: FAIL
-
-  [border-left-width length(in) / values]
-    expected: FAIL
-
-  [border-top-color color(rgba) / values]
-    expected: FAIL
-
-  [border-right-color color(rgba) / values]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / values]
-    expected: FAIL
-
-  [border-left-color color(rgba) / values]
-    expected: FAIL
-
-  [padding-bottom length(pt) / values]
-    expected: FAIL
-
-  [padding-bottom length(pc) / values]
-    expected: FAIL
-
-  [padding-bottom length(px) / values]
-    expected: FAIL
-
-  [padding-bottom length(em) / values]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
index 270150fa9f4..03f4e0ef301 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,129 +56,6 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / events]
-    expected: FAIL
-
-  [border-top-width length(pt) / events]
-    expected: FAIL
-
-  [border-top-width length(pc) / events]
-    expected: FAIL
-
-  [border-top-width length(px) / events]
-    expected: FAIL
-
-  [border-top-width length(em) / events]
-    expected: FAIL
-
-  [border-top-width length(ex) / events]
-    expected: FAIL
-
-  [border-top-width length(mm) / events]
-    expected: FAIL
-
-  [border-top-width length(cm) / events]
-    expected: FAIL
-
-  [border-top-width length(in) / events]
-    expected: FAIL
-
-  [border-right-width length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(pc) / events]
-    expected: FAIL
-
-  [border-right-width length(px) / events]
-    expected: FAIL
-
-  [border-right-width length(em) / events]
-    expected: FAIL
-
-  [border-right-width length(ex) / events]
-    expected: FAIL
-
-  [border-right-width length(mm) / events]
-    expected: FAIL
-
-  [border-right-width length(cm) / events]
-    expected: FAIL
-
-  [border-right-width length(in) / events]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / events]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / events]
-    expected: FAIL
-
-  [border-bottom-width length(px) / events]
-    expected: FAIL
-
-  [border-bottom-width length(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / events]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(in) / events]
-    expected: FAIL
-
-  [border-left-width length(pt) / events]
-    expected: FAIL
-
-  [border-left-width length(pc) / events]
-    expected: FAIL
-
-  [border-left-width length(px) / events]
-    expected: FAIL
-
-  [border-left-width length(em) / events]
-    expected: FAIL
-
-  [border-left-width length(ex) / events]
-    expected: FAIL
-
-  [border-left-width length(mm) / events]
-    expected: FAIL
-
-  [border-left-width length(cm) / events]
-    expected: FAIL
-
-  [border-left-width length(in) / events]
-    expected: FAIL
-
-  [border-top-color color(rgba) / events]
-    expected: FAIL
-
-  [border-right-color color(rgba) / events]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / events]
-    expected: FAIL
-
-  [border-left-color color(rgba) / events]
-    expected: FAIL
-
-  [padding-bottom length(pt) / events]
-    expected: FAIL
-
-  [padding-bottom length(pc) / events]
-    expected: FAIL
-
-  [padding-bottom length(px) / events]
-    expected: FAIL
-
-  [padding-bottom length(em) / events]
-    expected: FAIL
-
   [padding-bottom length(ex) / events]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
index 2b8affa2206..0734ab0db2c 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
@@ -4,90 +4,3 @@
 
   [background-position length-em(em) / values]
     expected: FAIL
-
-  [border-top-width length-em(em) / events]
-    expected: FAIL
-
-  [border-right-width length-em(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length-em(em) / events]
-    expected: FAIL
-
-  [border-left-width length-em(em) / events]
-    expected: FAIL
-
-  [padding-bottom length-em(em) / events]
-    expected: FAIL
-
-  [padding-left length-em(em) / events]
-    expected: FAIL
-
-  [padding-right length-em(em) / events]
-    expected: FAIL
-
-  [padding-top length-em(em) / events]
-    expected: FAIL
-
-  [margin-bottom length-em(em) / events]
-    expected: FAIL
-
-  [margin-left length-em(em) / events]
-    expected: FAIL
-
-  [margin-right length-em(em) / events]
-    expected: FAIL
-
-  [margin-top length-em(em) / events]
-    expected: FAIL
-
-  [height length-em(em) / events]
-    expected: FAIL
-
-  [width length-em(em) / events]
-    expected: FAIL
-
-  [min-height length-em(em) / events]
-    expected: FAIL
-
-  [min-width length-em(em) / events]
-    expected: FAIL
-
-  [max-height length-em(em) / events]
-    expected: FAIL
-
-  [max-width length-em(em) / events]
-    expected: FAIL
-
-  [top length-em(em) / events]
-    expected: FAIL
-
-  [right length-em(em) / events]
-    expected: FAIL
-
-  [bottom length-em(em) / events]
-    expected: FAIL
-
-  [left length-em(em) / events]
-    expected: FAIL
-
-  [line-height length-em(em) / events]
-    expected: FAIL
-
-  [letter-spacing length-em(em) / events]
-    expected: FAIL
-
-  [word-spacing length-em(em) / events]
-    expected: FAIL
-
-  [text-indent length-em(em) / events]
-    expected: FAIL
-
-  [outline-offset length-em(em) / events]
-    expected: FAIL
-
-  [outline-width length-em(em) / events]
-    expected: FAIL
-
-  [vertical-align length-em(em) / events]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/pseudo-elements-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/pseudo-elements-001.html.ini
index 27fb29a8075..f7867715155 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/pseudo-elements-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/pseudo-elements-001.html.ini
@@ -4,3 +4,9 @@
 
   [transition padding-left on :after / values]
     expected: FAIL
+
+  [transition padding-left on :before, changing content / values]
+    expected: FAIL
+
+  [transition padding-left on :after, changing content / values]
+    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
deleted file mode 100644
index f18b8d2fcf9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
deleted file mode 100644
index b905fe70fcb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-ellipsis-in-inline-box.html]
-  [elementFromPoint-ellipsis-in-inline-box]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
deleted file mode 100644
index 8f6f663ba61..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-subpixel.html]
-  [Hit test top left corner of box]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
index e0663d34a38..3285a4f15ac 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
@@ -76,6 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 36a410bfecb..f9de5391ad6 100644
--- a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,6 +146,3 @@
 
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
-
-  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    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 9d4eb6f8399..638a958a465 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
@@ -8,5 +8,11 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
index 1f528be38ef..a3f473a9557 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -1,4 +1,4 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
-  expected: ERROR
+  expected: TIMEOUT
   [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
index 33efcdbcf48..f7ee5361549 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
@@ -1,3 +1,4 @@
 [005.html]
+  expected: TIMEOUT
   [Link with onclick navigation and href navigation ]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
deleted file mode 100644
index 3e07e6b7d1f..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[empty-iframe-load-event.html]
-  [Check execution order from nested timeout]
-    expected: FAIL
-
-  [Check execution order on load handler]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index ab9ac6e835e..1d68034a37d 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,13 +1,12 @@
 [failure-check-sequence.https.html]
-  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [COEP check precedes X-Frame-Options check]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes COEP check - COEP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes X-Frame-Options check]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 5f9a07f92f0..dc1144214ef 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -4,3 +4,6 @@
 
   [Navigating to a different document with form submission]
     expected: FAIL
+
+  [Navigating to a different document with link click]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index b6aa0bab7b8..149bcb4ff8c 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -8,5 +8,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index abd95eec1fd..4b25ec32301 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -3,8 +3,5 @@
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: string completion]
     expected: NOTRUN
 
-  [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: FAIL
-
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
deleted file mode 100644
index 7dc346632a4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-same-origin.window.html]
-  [Same-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index d6188c03424..a03a8322165 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,3 +1,3 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
index 0cfee719c4e..9e6f4115b8c 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
@@ -1,7 +1,6 @@
 [document-with-fragment-empty.html]
-  expected: TIMEOUT
   [Autofocus elements in iframed documents with empty fragments should work.]
     expected: FAIL
 
   [Autofocus elements in top-level browsing context's documents with empty fragments should work.]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 24903b5f66f..7d28d586f51 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
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 c6f1e5d7d84..4034793cc72 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,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index d5fd800f09d..ff6467094b8 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/historical.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/historical.html.ini
deleted file mode 100644
index 5d8289307cc..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/historical.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[historical.html]
-  [<input name=isindex> should not be supported]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/the-input-element/email.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/the-input-element/email.html.ini
new file mode 100644
index 00000000000..0cf6de3cbb5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/the-input-element/email.html.ini
@@ -0,0 +1,3 @@
+[email.html]
+  [When the multiple attribute is set, the user agent must run the value sanitization algorithm]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 7f099cec1b0..dcd52d2fee8 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -7,3 +7,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
index e3d3c3916cf..9f35c09a4a7 100644
--- a/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
@@ -10,22 +10,22 @@
     expected: FAIL
 
   [content-type 3 : text/plain;charset=gbk,text/html]
-    expected: TIMEOUT
+    expected: FAIL
 
   [content-type 4 : text/plain;charset=gbk,text/html;charset=windows-1254]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 5 : text/plain;charset=gbk,text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 6 : text/plain;charset=gbk,text/plain;charset=windows-1252]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 7 : text/html;charset=gbk,text/html;x=",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 8 : text/plain;charset=gbk;x=foo,text/plain]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [content-type 9 : text/html;charset=gbk,text/plain,text/html]
     expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/resource-timing/cors-preflight.any.js.ini b/tests/wpt/metadata-layout-2020/resource-timing/cors-preflight.any.js.ini
index 69f259ca0f2..86d4d9daf1b 100644
--- a/tests/wpt/metadata-layout-2020/resource-timing/cors-preflight.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/resource-timing/cors-preflight.any.js.ini
@@ -1,7 +1,6 @@
 [cors-preflight.any.html]
-  expected: ERROR
   [PerformanceResourceTiming sizes fetch with preflight test]
-    expected: TIMEOUT
+    expected: FAIL
 
 
 [cors-preflight.any.worker.html]
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 221686e063d..ff2be2dcc3c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -28999,7 +28999,7 @@
       ]
      ],
      "scroll-timeline-specified-scroller-print.html": [
-      "0d262c2ed2e7f74bd1734d14fe806bb38f1a5332",
+      "ba97bd80c329fae385c090fa69335f6c1cae562a",
       [
        null,
        [
@@ -267556,6 +267556,19 @@
        {}
       ]
      ],
+     "outline-style-inherit.html": [
+      "7a82bc790f5c35fb74d45ec1b84901a195943bd9",
+      [
+       null,
+       [
+        [
+         "/css/css-ui/outline-style-inherit-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "outline-with-padding-001.html": [
       "716491ca25eae11238b7240a3635bdb8a88187cf",
       [
@@ -295734,7 +295747,22 @@
       ],
       {}
      ]
-    ]
+    ],
+    "xslt": {
+     "sort.html": [
+      "631c3edd6aee36e66f7aa10aef7cdc5c2f520e43",
+      [
+       null,
+       [
+        [
+         "/dom/xslt/sort-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    }
    },
    "encoding": {
     "eof-shift_jis.html": [
@@ -301681,6 +301709,19 @@
         {}
        ]
       ],
+      "details-revert.html": [
+       "760cc8281e820d2ef256eb22d88d7aa8f090b821",
+       [
+        null,
+        [
+         [
+          "/html/rendering/the-details-element/details-revert-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "summary-display-flex.html": [
        "c495516cf3dabd27952f44293c5b39629bd56c64",
        [
@@ -389086,7 +389127,7 @@
       "properties": {
        "resources": {
         "testsuite.js": [
-         "1f4195353d1d5dc0e2fe3c75ac7701032930d095",
+         "a365f001316e66c0a3102b784a3f8ffe522fe404",
          []
         ]
        }
@@ -389242,6 +389283,10 @@
       "aafa2b053cb30d77997743a226901d6dd4472724",
       []
      ],
+     "outline-style-inherit-ref.html": [
+      "e66e037ed020c5164a8f6adfe41e4e3ffcc3841b",
+      []
+     ],
      "reference": {
       "box-sizing-001-ref.html": [
        "0207bc06beb00b241d59773f41ed0a8f1ee4f107",
@@ -396936,7 +396981,7 @@
      },
      "scrolling": {
       "scroll_support.js": [
-       "d3be27408072cba64e06343293880c7115502beb",
+       "169393e4c3e4194548d8989bb3855d32e023ce24",
        []
       ]
      }
@@ -397375,6 +397420,10 @@
      "externalScript.js": [
       "7a2bf3622554937bf483a3b3afa9f16187fdabf6",
       []
+     ],
+     "sort-ref.html": [
+      "163002d0d09b1f629611562d1bc79863013e4ae6",
+      []
      ]
     }
    },
@@ -397493,7 +397542,7 @@
       []
      ],
      "bold.js": [
-      "14147e4266c5747efbd7e715015982b75ff7d865",
+      "0d7587de313b3f7f1481b13c1e162d1fe3d100d1",
       []
      ],
      "createlink.js": [
@@ -397529,7 +397578,7 @@
       []
      ],
      "hilitecolor.js": [
-      "25706196321864de392d24a10a26dc173886ddbc",
+      "7f9f4949dc1ebd7899a8d08c9ba83a7b70ba9937",
       []
      ],
      "indent.js": [
@@ -397565,7 +397614,7 @@
       []
      ],
      "inserttext.js": [
-      "ca90b9ae9cadcb46a41c5546ca31a30a832f4918",
+      "b6b08d5cbc19d2ceaa1c7e32723be0b227b13420",
       []
      ],
      "insertunorderedlist.js": [
@@ -397609,7 +397658,7 @@
       []
      ],
      "strikethrough.js": [
-      "83cc7edf7ac71f932f2e4f14d7f21b2c9d068761",
+      "86d2668447f98bd9f82bf70563d05f11e919e43f",
       []
      ],
      "subscript.js": [
@@ -397621,7 +397670,7 @@
       []
      ],
      "underline.js": [
-      "4092e5a808f6d939d58664c208d574dcb6fcb2f6",
+      "812798a8e7f2da51386abd5a2cdcd6681e8a1f82",
       []
      ],
      "unlink.js": [
@@ -411593,6 +411642,10 @@
        "6ebed6075de1e8cf62db7bee756b05d3e425e0ab",
        []
       ],
+      "details-revert-ref.html": [
+       "dc46b159012fd80c39b66e94935c210a11826487",
+       []
+      ],
       "details-two-pages-print-ref.html": [
        "309a138696e27f97f8ffe25ac15b79e33b468192",
        []
@@ -426562,7 +426615,7 @@
      ],
      "support": {
       "testcommon.js": [
-       "9f71af1bf1109b384d83cc6d5f0a3da54478d4f5",
+       "66bc27bb104ebead9b7466c4ead9076f589ac5e0",
        []
       ]
      }
@@ -429941,6 +429994,22 @@
        "7be73c8c6f2e856b49b9127e959e3e23796e749a",
        []
       ],
+      "csp-script-src-inline-speculation-rules.html": [
+       "febfbd01ba125c1deef934b1ff4d78e3f2b0e164",
+       []
+      ],
+      "csp-script-src-self.html": [
+       "8dc382068a347990c91aeaafc8b509553cac8767",
+       []
+      ],
+      "csp-script-src-unsafe-inline.html": [
+       "d2f010dc569d0908818a8d00d7020220c897b11a",
+       []
+      ],
+      "csp-script-src.js": [
+       "52419f9b4c24240fe1f7f4594fc660e634cf34af",
+       []
+      ],
       "dedicated-worker.https.html": [
        "570d4b33a147e02ba8fbdbc874a8a1d652359497",
        []
@@ -483103,7 +483172,7 @@
     },
     "css-animations": {
      "AnimationEffect-getComputedTiming.tentative.html": [
-      "fd2197fcace453760d8ef7613139a978ab8ba0e6",
+      "46c26fcb99be0f1ad99464c4b18cada09ae63a21",
       [
        null,
        {}
@@ -505270,7 +505339,7 @@
     },
     "css-transitions": {
      "AnimationEffect-getComputedTiming.tentative.html": [
-      "32c15f07a96a2a1cf99068e303f17296aa71e96e",
+      "3be69e8ee1206f6ce0f01eb74e43df7e69f24c5d",
       [
        null,
        {}
@@ -517775,7 +517844,7 @@
        ]
       ],
       "scrollend-event-for-user-scroll.html": [
-       "e203482d57907f65c7a3f8484dd8ad0717b74094",
+       "5146c5f719a1e4728a2c9aa0bdd54516ac1fe5c1",
        [
         null,
         {
@@ -593729,7 +593798,7 @@
         ]
        ],
        "email.html": [
-        "fc92529efafb65166f86014b123b87285603f437",
+        "c187d89badffc44935b5d4fce97cbffb39f45528",
         [
          null,
          {}
@@ -595620,6 +595689,15 @@
       }
      },
      "popovers": {
+      "light-dismiss-event-ordering.tentative.html": [
+       "4bfcecc4b059315c9fd79269f1ce73b3bdb0f2ae",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "popover-anchor-display-none.tentative.html": [
        "a4285607fd30360545e1364b450443af1cca1fbe",
        [
@@ -595667,11 +595745,12 @@
        ]
       ],
       "popover-attribute-basic.tentative.html": [
-       "2250d6fabd84bc5e22baae6b5d5533b555f42513",
+       "1bc32dbace31840ddb7d9f7bf3aedc9169067df2",
        [
         null,
         {
-         "testdriver": true
+         "testdriver": true,
+         "timeout": "long"
         }
        ]
       ],
@@ -610604,7 +610683,7 @@
        ]
       ],
       "mrow-fallback.html": [
-       "6fad205a9e03fcd5bf9630a62befe7f843e5952d",
+       "3f9d466148c66877e9fe4104f00d2963cbec0380",
        [
         null,
         {}
@@ -624681,6 +624760,27 @@
     ]
    },
    "pointerevents": {
+    "capturing_boundary_event_handler_at_ua_shadowdom.html": [
+     "7500277f2251fa300f9af99d52e1f73a943f237c",
+     [
+      "pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html?touch",
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "compat": {
      "pointerevent_compat-mouse-events-when-removing-nodes.html": [
       "6d13b0de354a140e472d42bd8b81b408fad52495",
@@ -642608,7 +642708,7 @@
       ]
      ],
      "animation-shorthand.html": [
-      "efb7d2c112c6d5e972e5d1a4f8744c275cab45da",
+      "832b3e0cb9be89d4a5f04c5f05fe4cf76e860fa1",
       [
        null,
        {}
@@ -642643,7 +642743,7 @@
       ]
      ],
      "animation-timeline-named-scroll-progress-timeline.tentative.html": [
-      "6b7bab9b6501af86be088d3a6f4a6e1cd4127dd9",
+      "9f55e2d2c91ff0045ab452cd5e30a3e54d34fe2a",
       [
        null,
        {}
@@ -642664,21 +642764,21 @@
       ]
      ],
      "animation-timeline-scroll-functional-notation.tentative.html": [
-      "a721c66e53f0c2d3c13e4d7bc7e33500f9c71c99",
+      "e28e85245e1f65f3f2a92e57cf85770c57f38542",
       [
        null,
        {}
       ]
      ],
      "get-animations-inactive-timeline.html": [
-      "71a66cae2cdfd4912bee6188f86a0e8fb179f692",
+      "10bf00fbbc06a18b47deab2eaad69ba516b9ff42",
       [
        null,
        {}
       ]
      ],
      "progress-based-animation-animation-longhand-properties.tentative.html": [
-      "f91be8d75346d5436198f59508766d0668209115",
+      "f4f9a669f3dcc05fe9eeef6df175df576ff49056",
       [
        null,
        {}
@@ -642713,7 +642813,7 @@
       ]
      ],
      "scroll-timeline-document-scroller-quirks.html": [
-      "1a9e6a2b3aa5b72eae8ad740a4c15a5f66c6fbd8",
+      "809a658a15e630234e22f6852ffe2aaae8f89469",
       [
        null,
        {}
@@ -642727,7 +642827,7 @@
       ]
      ],
      "scroll-timeline-in-container-query.html": [
-      "59e85bf56089191b3591c684a615517642f35ce4",
+      "d6a8ba8e605f9cac94c1e6112a22992e14bb1631",
       [
        null,
        {}
@@ -642741,7 +642841,7 @@
       ]
      ],
      "scroll-timeline-multi-pass.tentative.html": [
-      "01223910e8c2231774f1d5a0244f90aacb649ed0",
+      "91668ada5bed8528d1ee61ba15d5e52d20e1e5aa",
       [
        null,
        {}
@@ -642769,28 +642869,28 @@
       ]
      ],
      "scroll-timeline-nearest-dirty.html": [
-      "6914fc616a485f5b604123e374f917f8d1e1a026",
+      "1a79c9bb2225e994811283ab9fe21d14fd1e9ea8",
       [
        null,
        {}
       ]
      ],
      "scroll-timeline-paused-animations.html": [
-      "3ae2e75ecd74b296df9ee4b0c0884066c71f0e17",
+      "54518a5e871e59a8839bba708872c70dccb3f276",
       [
        null,
        {}
       ]
      ],
      "scroll-timeline-responsiveness-from-endpoint.html": [
-      "ed6e2915dac4415b4b11fbedce7e0de32b717fdd",
+      "71d3699077e02fafa02e3fecc37edbd1f4060a98",
       [
        null,
        {}
       ]
      ],
      "scroll-timeline-root-dirty.html": [
-      "873f18cbe3cac634909e0bd94935183db8e6b61a",
+      "1c0b73ab45fd5e1618167a91b2bbdaf8a63f7458",
       [
        null,
        {}
@@ -642811,14 +642911,21 @@
       ]
      ],
      "scroll-timeline-sibling-gcs.html": [
-      "a1ba3b704b7894679a53f685948710562800aa58",
+      "6062e795f43e3057f8fd580e9b949c91bee567fa",
+      [
+       null,
+       {}
+      ]
+     ],
+     "timeline-range-name-offset-in-keyframes.tentative.html": [
+      "993046c5f2b8d3eb62dcda1adb33ad7a82137524",
       [
        null,
        {}
       ]
      ],
      "view-timeline-animation.html": [
-      "3ba474a7797edf5a2c88c7cebfd09e8072809498",
+      "b816bb689732b3be59df48c0653ed892dc70cdd4",
       [
        null,
        {}
@@ -642839,21 +642946,21 @@
       ]
      ],
      "view-timeline-delay-animation.html": [
-      "9124df6bce5eab003a89b8d6a37a4c03e7fd7415",
+      "dfb0e59f5d7798ab4958373fd5f3ff8208e13b96",
       [
        null,
        {}
       ]
      ],
      "view-timeline-dynamic.html": [
-      "b9908b10ea4690aace8aa89d34e2cc290e590a2a",
+      "74da8850d467e74c83401abcc459ddbce2b2720f",
       [
        null,
        {}
       ]
      ],
      "view-timeline-inset-animation.html": [
-      "1f33c6642fa0eb830cfe76ac5d642bb0a042b38a",
+      "a95086b62bf338ea338345990a11735f7f594e23",
       [
        null,
        {}
@@ -642874,7 +642981,7 @@
       ]
      ],
      "view-timeline-lookup.html": [
-      "2dd8cf9a6fd1fc4e3533091d674dbad66f7f342e",
+      "c1797c7ba1c37177f413ed1396ddb3e8b61660dc",
       [
        null,
        {}
@@ -642909,7 +643016,7 @@
       ]
      ],
      "view-timeline-used-values.html": [
-      "cf327772d50644bf5e44ffa6d6d900e183de5e88",
+      "6627eeb9988096f136a85408093e1b76fc4a06f2",
       [
        null,
        {}
@@ -643139,13 +643246,6 @@
        {}
       ]
      ],
-     "timeline-range-name-offset-in-keyframes.tentative.html": [
-      "38eecd9829c5efa885c10375728855544605fd4c",
-      [
-       null,
-       {}
-      ]
-     ],
      "view-timeline-delay-large-subject.html": [
       "edb37c1379cc32f081dea6a06e88a07f2f2b2e74",
       [
@@ -650581,6 +650681,13 @@
       }
      ]
     ],
+    "supported-entry-types.tentative.html": [
+     "4ab408e10b1e504961715779d3f08e70f37dc665",
+     [
+      null,
+      {}
+     ]
+    ],
     "text-lcp-followed-by-image-softnav-lcp.tentative.html": [
      "3a8398347ce0ecb31aae24b4e8c8403aa2c9ef79",
      [
@@ -651133,6 +651240,33 @@
        }
       ]
      ],
+     "csp-script-src-inline-speculation-rules.tentative.html": [
+      "923598bd2735623782905e8f9484e357cf16524c",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "csp-script-src-self.html": [
+      "f0f9784666b40db1948165a64bcebdfb14b4d672",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "csp-script-src-unsafe-inline.html": [
+      "f6925f59f455df85434de4e582fab4c1c59552fa",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "fetch-blob.html": [
       "7f8d55704934ba8ebd0a8fafab16934c815ad05d",
       [
@@ -678742,7 +678876,7 @@
      ]
     ],
     "RTCRtpTransceiver.https.html": [
-     "b02ce60b7c23ff5b63fbcd256b9525bdc6405823",
+     "9a8fbedc231c3273aa83662148dbc7226612c3c4",
      [
       null,
       {
@@ -678989,7 +679123,7 @@
       ]
      ],
      "msid-parse.html": [
-      "9630919b80861b6559bbf90339788c826f581465",
+      "5596446e0013b8c6e243484b04f7aef341c60b15",
       [
        null,
        {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..665ec4646cb
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    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
new file mode 100644
index 00000000000..13bd6abf376
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index 147f062e548..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
new file mode 100644
index 00000000000..3e5096beef3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-float-002.html]
+  [block-in-inline-hittest-float-002]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
index 2b2e0fce8eb..80111fb0236 100644
--- a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,5 +1,4 @@
 [position-absolute-013.html]
-  expected: TIMEOUT
   [.flexbox 309]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini b/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
deleted file mode 100644
index b8f8d45a31f..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hittest-anonymous-box.html]
-  [Hit-testing within an anonymous flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 23364d3522d..a345330f229 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -191,9 +191,6 @@
   [Matching font-weight: '501' should prefer '501' over '502 510']
     expected: FAIL
 
-  [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
-    expected: FAIL
-
   [Matching font-weight: '430' should prefer '501 550' over '502 560']
     expected: FAIL
 
@@ -221,9 +218,6 @@
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '503 520' over '500']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
     expected: FAIL
 
@@ -328,3 +322,9 @@
 
   [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
+
+  [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index dffa7ab597c..c4daffd168f 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -52,276 +52,3 @@
 
   [background-position length(px) / events]
     expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
-  [background-color color(rgba) / values]
-    expected: FAIL
-
-  [border-top-width length(pt) / values]
-    expected: FAIL
-
-  [border-top-width length(pc) / values]
-    expected: FAIL
-
-  [border-top-width length(px) / values]
-    expected: FAIL
-
-  [border-top-width length(em) / values]
-    expected: FAIL
-
-  [border-top-width length(ex) / values]
-    expected: FAIL
-
-  [border-top-width length(mm) / values]
-    expected: FAIL
-
-  [border-top-width length(cm) / values]
-    expected: FAIL
-
-  [border-top-width length(in) / values]
-    expected: FAIL
-
-  [border-right-width length(pt) / values]
-    expected: FAIL
-
-  [border-right-width length(pc) / values]
-    expected: FAIL
-
-  [border-right-width length(px) / values]
-    expected: FAIL
-
-  [border-right-width length(em) / values]
-    expected: FAIL
-
-  [border-right-width length(ex) / values]
-    expected: FAIL
-
-  [border-right-width length(mm) / values]
-    expected: FAIL
-
-  [border-right-width length(cm) / values]
-    expected: FAIL
-
-  [border-right-width length(in) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / values]
-    expected: FAIL
-
-  [border-bottom-width length(px) / values]
-    expected: FAIL
-
-  [border-bottom-width length(em) / values]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / values]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(in) / values]
-    expected: FAIL
-
-  [border-left-width length(pt) / values]
-    expected: FAIL
-
-  [border-left-width length(pc) / values]
-    expected: FAIL
-
-  [border-left-width length(px) / values]
-    expected: FAIL
-
-  [border-left-width length(em) / values]
-    expected: FAIL
-
-  [border-left-width length(ex) / values]
-    expected: FAIL
-
-  [border-left-width length(mm) / values]
-    expected: FAIL
-
-  [border-left-width length(cm) / values]
-    expected: FAIL
-
-  [border-left-width length(in) / values]
-    expected: FAIL
-
-  [border-top-color color(rgba) / values]
-    expected: FAIL
-
-  [border-right-color color(rgba) / values]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / values]
-    expected: FAIL
-
-  [border-left-color color(rgba) / values]
-    expected: FAIL
-
-  [padding-bottom length(pt) / values]
-    expected: FAIL
-
-  [padding-bottom length(pc) / values]
-    expected: FAIL
-
-  [padding-bottom length(px) / values]
-    expected: FAIL
-
-  [padding-bottom length(em) / values]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
index 270150fa9f4..03f4e0ef301 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,129 +56,6 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / events]
-    expected: FAIL
-
-  [border-top-width length(pt) / events]
-    expected: FAIL
-
-  [border-top-width length(pc) / events]
-    expected: FAIL
-
-  [border-top-width length(px) / events]
-    expected: FAIL
-
-  [border-top-width length(em) / events]
-    expected: FAIL
-
-  [border-top-width length(ex) / events]
-    expected: FAIL
-
-  [border-top-width length(mm) / events]
-    expected: FAIL
-
-  [border-top-width length(cm) / events]
-    expected: FAIL
-
-  [border-top-width length(in) / events]
-    expected: FAIL
-
-  [border-right-width length(pt) / events]
-    expected: FAIL
-
-  [border-right-width length(pc) / events]
-    expected: FAIL
-
-  [border-right-width length(px) / events]
-    expected: FAIL
-
-  [border-right-width length(em) / events]
-    expected: FAIL
-
-  [border-right-width length(ex) / events]
-    expected: FAIL
-
-  [border-right-width length(mm) / events]
-    expected: FAIL
-
-  [border-right-width length(cm) / events]
-    expected: FAIL
-
-  [border-right-width length(in) / events]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / events]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / events]
-    expected: FAIL
-
-  [border-bottom-width length(px) / events]
-    expected: FAIL
-
-  [border-bottom-width length(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / events]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / events]
-    expected: FAIL
-
-  [border-bottom-width length(in) / events]
-    expected: FAIL
-
-  [border-left-width length(pt) / events]
-    expected: FAIL
-
-  [border-left-width length(pc) / events]
-    expected: FAIL
-
-  [border-left-width length(px) / events]
-    expected: FAIL
-
-  [border-left-width length(em) / events]
-    expected: FAIL
-
-  [border-left-width length(ex) / events]
-    expected: FAIL
-
-  [border-left-width length(mm) / events]
-    expected: FAIL
-
-  [border-left-width length(cm) / events]
-    expected: FAIL
-
-  [border-left-width length(in) / events]
-    expected: FAIL
-
-  [border-top-color color(rgba) / events]
-    expected: FAIL
-
-  [border-right-color color(rgba) / events]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / events]
-    expected: FAIL
-
-  [border-left-color color(rgba) / events]
-    expected: FAIL
-
-  [padding-bottom length(pt) / events]
-    expected: FAIL
-
-  [padding-bottom length(pc) / events]
-    expected: FAIL
-
-  [padding-bottom length(px) / events]
-    expected: FAIL
-
-  [padding-bottom length(em) / events]
-    expected: FAIL
-
   [padding-bottom length(ex) / events]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
index 2b8affa2206..0734ab0db2c 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
@@ -4,90 +4,3 @@
 
   [background-position length-em(em) / values]
     expected: FAIL
-
-  [border-top-width length-em(em) / events]
-    expected: FAIL
-
-  [border-right-width length-em(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length-em(em) / events]
-    expected: FAIL
-
-  [border-left-width length-em(em) / events]
-    expected: FAIL
-
-  [padding-bottom length-em(em) / events]
-    expected: FAIL
-
-  [padding-left length-em(em) / events]
-    expected: FAIL
-
-  [padding-right length-em(em) / events]
-    expected: FAIL
-
-  [padding-top length-em(em) / events]
-    expected: FAIL
-
-  [margin-bottom length-em(em) / events]
-    expected: FAIL
-
-  [margin-left length-em(em) / events]
-    expected: FAIL
-
-  [margin-right length-em(em) / events]
-    expected: FAIL
-
-  [margin-top length-em(em) / events]
-    expected: FAIL
-
-  [height length-em(em) / events]
-    expected: FAIL
-
-  [width length-em(em) / events]
-    expected: FAIL
-
-  [min-height length-em(em) / events]
-    expected: FAIL
-
-  [min-width length-em(em) / events]
-    expected: FAIL
-
-  [max-height length-em(em) / events]
-    expected: FAIL
-
-  [max-width length-em(em) / events]
-    expected: FAIL
-
-  [top length-em(em) / events]
-    expected: FAIL
-
-  [right length-em(em) / events]
-    expected: FAIL
-
-  [bottom length-em(em) / events]
-    expected: FAIL
-
-  [left length-em(em) / events]
-    expected: FAIL
-
-  [line-height length-em(em) / events]
-    expected: FAIL
-
-  [letter-spacing length-em(em) / events]
-    expected: FAIL
-
-  [word-spacing length-em(em) / events]
-    expected: FAIL
-
-  [text-indent length-em(em) / events]
-    expected: FAIL
-
-  [outline-offset length-em(em) / events]
-    expected: FAIL
-
-  [outline-width length-em(em) / events]
-    expected: FAIL
-
-  [vertical-align length-em(em) / events]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/pseudo-elements-001.html.ini b/tests/wpt/metadata/css/css-transitions/pseudo-elements-001.html.ini
index 27fb29a8075..f7867715155 100644
--- a/tests/wpt/metadata/css/css-transitions/pseudo-elements-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/pseudo-elements-001.html.ini
@@ -4,3 +4,9 @@
 
   [transition padding-left on :after / values]
     expected: FAIL
+
+  [transition padding-left on :before, changing content / values]
+    expected: FAIL
+
+  [transition padding-left on :after, changing content / values]
+    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
deleted file mode 100644
index f18b8d2fcf9..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
deleted file mode 100644
index b905fe70fcb..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-ellipsis-in-inline-box.html]
-  [elementFromPoint-ellipsis-in-inline-box]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
deleted file mode 100644
index 8f6f663ba61..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-subpixel.html]
-  [Hit test top left corner of box]
-    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
index e0663d34a38..3285a4f15ac 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -76,6 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
-    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 36a410bfecb..f9de5391ad6 100644
--- a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,6 +146,3 @@
 
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
-
-  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    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 9d4eb6f8399..638a958a465 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -8,5 +8,11 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
index c8a3c8f9e68..6e9f7acf151 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -1,6 +1,6 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
   type: testharness
-  expected: ERROR
+  expected: TIMEOUT
   [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
index 33efcdbcf48..f7ee5361549 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
@@ -1,3 +1,4 @@
 [005.html]
+  expected: TIMEOUT
   [Link with onclick navigation and href navigation ]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
deleted file mode 100644
index 3e07e6b7d1f..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[empty-iframe-load-event.html]
-  [Check execution order from nested timeout]
-    expected: FAIL
-
-  [Check execution order on load handler]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index ab9ac6e835e..1d68034a37d 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,13 +1,12 @@
 [failure-check-sequence.https.html]
-  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [COEP check precedes X-Frame-Options check]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes COEP check - COEP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes X-Frame-Options check]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 5f9a07f92f0..dc1144214ef 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -4,3 +4,6 @@
 
   [Navigating to a different document with form submission]
     expected: FAIL
+
+  [Navigating to a different document with link click]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index b6aa0bab7b8..149bcb4ff8c 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -8,5 +8,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index abd95eec1fd..4b25ec32301 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -3,8 +3,5 @@
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: string completion]
     expected: NOTRUN
 
-  [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: FAIL
-
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
deleted file mode 100644
index 7dc346632a4..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-same-origin.window.html]
-  [Same-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index d6188c03424..a03a8322165 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,3 +1,3 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
index 0cfee719c4e..9e6f4115b8c 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html.ini
@@ -1,7 +1,6 @@
 [document-with-fragment-empty.html]
-  expected: TIMEOUT
   [Autofocus elements in iframed documents with empty fragments should work.]
     expected: FAIL
 
   [Autofocus elements in top-level browsing context's documents with empty fragments should work.]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2d3fbf0f308..25d9964f057 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
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 76e34322dca..6bec7a732b8 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,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index d5fd800f09d..ff6467094b8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/historical.html.ini b/tests/wpt/metadata/html/semantics/forms/historical.html.ini
deleted file mode 100644
index 5d8289307cc..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/historical.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[historical.html]
-  [<input name=isindex> should not be supported]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/the-input-element/email.html.ini b/tests/wpt/metadata/html/semantics/forms/the-input-element/email.html.ini
new file mode 100644
index 00000000000..0cf6de3cbb5
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/the-input-element/email.html.ini
@@ -0,0 +1,3 @@
+[email.html]
+  [When the multiple attribute is set, the user agent must run the value sanitization algorithm]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 071b4378add..cc18f512574 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -11,3 +11,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
index e3d3c3916cf..9f35c09a4a7 100644
--- a/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
@@ -10,22 +10,22 @@
     expected: FAIL
 
   [content-type 3 : text/plain;charset=gbk,text/html]
-    expected: TIMEOUT
+    expected: FAIL
 
   [content-type 4 : text/plain;charset=gbk,text/html;charset=windows-1254]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 5 : text/plain;charset=gbk,text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 6 : text/plain;charset=gbk,text/plain;charset=windows-1252]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 7 : text/html;charset=gbk,text/html;x=",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 8 : text/plain;charset=gbk;x=foo,text/plain]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [content-type 9 : text/html;charset=gbk,text/plain,text/html]
     expected: NOTRUN
diff --git a/tests/wpt/metadata/resource-timing/cors-preflight.any.js.ini b/tests/wpt/metadata/resource-timing/cors-preflight.any.js.ini
index 69f259ca0f2..86d4d9daf1b 100644
--- a/tests/wpt/metadata/resource-timing/cors-preflight.any.js.ini
+++ b/tests/wpt/metadata/resource-timing/cors-preflight.any.js.ini
@@ -1,7 +1,6 @@
 [cors-preflight.any.html]
-  expected: ERROR
   [PerformanceResourceTiming sizes fetch with preflight test]
-    expected: TIMEOUT
+    expected: FAIL
 
 
 [cors-preflight.any.worker.html]
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html b/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html
index fd2197fcace..46c26fcb99b 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html
@@ -271,8 +271,9 @@ test(t => {
   const div = addDiv(t, { style: 'animation: moveAnimation 100s' });
   const anim = div.getAnimations()[0];
   anim.currentTime = 5 * MS_PER_SEC;
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'current localTime after setting currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'current localTime after setting currentTime');
 }, 'localTime of an animation is always equal to currentTime');
 
 promise_test(async t => {
@@ -283,13 +284,15 @@ promise_test(async t => {
 
   await anim.ready;
 
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'localTime is equal to currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'localTime is equal to currentTime');
 
   await waitForFrame();
 
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'localTime is equal to currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'localTime is equal to currentTime');
 }, 'localTime reflects playbackRate immediately');
 
 test(t => {
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html b/tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html
index 32c15f07a96..3be69e8ee12 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html
@@ -6,6 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/helper.js"></script>
+<script src="/web-animations/testcommon.js"></script>
 <style>
 
 .animated-div {
@@ -236,8 +237,9 @@ test(t => {
 
   const anim = div.getAnimations()[0];
   anim.currentTime = 5000;
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'current localTime after setting currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'current localTime after setting currentTime');
 }, 'localTime is always equal to currentTime');
 
 promise_test(async t => {
@@ -251,12 +253,14 @@ promise_test(async t => {
 
   await anim.ready;
 
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'localTime is equal to currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'localTime is equal to currentTime');
   await waitForFrame();
 
-  assert_equals(anim.effect.getComputedTiming().localTime, anim.currentTime,
-                'localTime is equal to currentTime');
+  assert_times_equal(anim.effect.getComputedTiming().localTime,
+                     anim.currentTime,
+                     'localTime is equal to currentTime');
 }, 'localTime reflects playbackRate immediately');
 
 
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js
index 1f4195353d1..a365f001316 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js
@@ -27,11 +27,11 @@ const gCssWideKeywordsExamples = [
   },
   {
     description: 'inherit keyword',
-    input: new CSSKeywordValue('initial')
+    input: new CSSKeywordValue('inherit')
   },
   {
     description: 'unset keyword',
-    input: new CSSKeywordValue('initial')
+    input: new CSSKeywordValue('unset')
   },
   {
     description: 'revert keyword',
@@ -191,7 +191,7 @@ const gTestSyntaxExamples = {
       },
       {
         description: "one fraction",
-        input: new CSSUnitValue(0, 'fr')
+        input: new CSSUnitValue(1, 'fr')
       },
       {
         description: "negative fraction",
@@ -292,10 +292,10 @@ const gTestSyntaxExamples = {
 // Test setting a value in a style map and then getting it from the inline and
 // computed styles.
 function testPropertyValid(propertyName, examples, specified, computed, description) {
-  test(t => {
-    let element = createDivWithStyle(t);
+  for (const example of examples) {
+    test(t => {
+      let element = createDivWithStyle(t);
 
-    for (const example of examples) {
       element.attributeStyleMap.set(propertyName, example.input);
 
       // specified style
@@ -325,8 +325,8 @@ function testPropertyValid(propertyName, examples, specified, computed, descript
         assert_style_value_equals(computedResult, example.input,
           `Setting ${example.description} and getting its computed value`);
       }
-    }
-  }, `Can set '${propertyName}' to ${description}`);
+    }, `Can set '${propertyName}' to ${description}: ${example.input}`);
+  }
 }
 
 // We have to special case CSSImageValue as they cannot be created with a
diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit-ref.html b/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit-ref.html
new file mode 100644
index 00000000000..e66e037ed02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit-ref.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+  div { width: 100px; height: 100px }
+</style>
+<div style="outline-style: solid; outline-color: green"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit.html b/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit.html
new file mode 100644
index 00000000000..7a82bc790f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Inheriting outline-style should compute the right outline-width</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#outline-width">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#outline-style">
+<link rel="match" href="outline-style-inherit-ref.html">
+<style>
+  div { width: 100px; height: 100px }
+</style>
+<div style="outline-style: solid; outline-color: transparent">
+  <div style="outline-style: inherit; outline-color: green"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js b/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js
index d3be2740807..169393e4c3e 100644
--- a/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js
@@ -1,8 +1,22 @@
+async function waitForScrollendEvent(test, target, timeoutMs = 500) {
+  return new Promise((resolve, reject) => {
+    const timeoutCallback = test.step_timeout(() => {
+      reject(`No Scrollend event received for target ${target}`);
+    }, timeoutMs);
+    target.addEventListener('scrollend', (evt) => {
+      clearTimeout(timeoutCallback);
+      resolve(evt);
+    }, { once: true });
+  });
+}
+
 const MAX_FRAME = 700;
 const MAX_UNCHANGED_FRAMES = 20;
 
 // Returns a promise that resolves when the given condition is met or rejects
 // after MAX_FRAME animation frames.
+// TODO(crbug.com/1400399): deprecate. We should not use frame based waits in
+// WPT as frame rates may vary greatly in different testing environments.
 function waitFor(condition, error_message = 'Reaches the maximum frames.') {
   return new Promise((resolve, reject) => {
     function tick(frames) {
@@ -19,6 +33,9 @@ function waitFor(condition, error_message = 'Reaches the maximum frames.') {
   });
 }
 
+// TODO(crbug.com/1400446): Test driver should defer sending events until the
+// browser is ready. Also the term compositor-commit is misleading as not all
+// user-agents use a compositor process.
 function waitForCompositorCommit() {
   return new Promise((resolve) => {
     // rAF twice.
@@ -28,6 +45,8 @@ function waitForCompositorCommit() {
   });
 }
 
+// TODO(crbug.com/1400399): Deprecate as frame rates may vary greatly in
+// different test environments.
 function waitForAnimationEnd(getValue) {
   var last_changed_frame = 0;
   var last_position = getValue();
@@ -124,6 +143,8 @@ function mouseActionsInTarget(target, origin, delta, pause_time_in_ms = 100) {
 // Returns a promise that resolves when the given condition holds for 10
 // animation frames or rejects if the condition changes to false within 10
 // animation frames.
+// TODO(crbug.com/1400399): Deprecate as frame rates may very greatly in
+// different test environments.
 function conditionHolds(condition, error_message = 'Condition is not true anymore.') {
   const MAX_FRAME = 10;
   return new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html
index e203482d579..5146c5f719a 100644
--- a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html
@@ -30,110 +30,170 @@
 
 <script>
 var target_div = document.getElementById('targetDiv');
-var scrollend_arrived = false;
 
-function onScrollEnd(event) {
-    assert_false(event.cancelable);
-    assert_false(event.bubbles);
-    scrollend_arrived = true;
-}
-
-function resetTargetScrollState() {
+async function resetTargetScrollState(test) {
+  if (target_div.scrollTop != 0 || target_div.scrollLeft != 0) {
     target_div.scrollTop = 0;
     target_div.scrollLeft = 0;
+    return waitForScrollendEvent(test, target_div);
+  }
 }
 
-function checkFinalPosition(target, position, pause_time_in_ms) {
-    return new Promise((resolve, reject) => {
-        step_timeout(() => {
-            resolve();
-            assert_equals(position.x, target.scrollLeft);
-            assert_equals(position.y, target.scrollTop);
-        }, pause_time_in_ms);
-    });
+async function verifyScrollStopped(test) {
+  const unscaled_pause_time_in_ms = 100;
+  const x = target_div.scrollLeft;
+  const y = target_div.scrollTop;
+  return new Promise(resolve => {
+    test.step_timeout(() => {
+      assert_equals(x, target_div.scrollLeft);
+      assert_equals(y, target_div.scrollTop);
+      resolve();
+    }, unscaled_pause_time_in_ms);
+  });
 }
 
-target_div.addEventListener("scrollend", onScrollEnd);
+async function verifyNoScrollendOnDocument(test) {
+  const callback =
+      test.unreached_func("window got unexpected scrollend event.");
+  window.addEventListener('scrollend', callback);
+}
+
+async function createScrollendPromise(test) {
+  return waitForScrollendEvent(test, target_div).then(evt => {
+      assert_false(evt.cancelable, 'Event is not cancelable');
+      assert_false(evt.bubbles, 'Event targeting element does not bubble');
+  });
+}
 
 function runTest() {
-    promise_test(async (t) => {
-        // Make sure that no scrollend event is sent to window.
-        window.addEventListener("scrollend",
-            t.unreached_func("window got unexpected scrollend event."));
-        await waitForCompositorCommit();
-        scrollend_arrived = false;
+  promise_test(async (t) => {
+    // Skip the test on a Mac as they do not support touch screens.
+    const isMac = navigator.platform.toUpperCase().indexOf('MAC')>=0;
+    if (isMac)
+      return;
 
-        // Perform drag action on target div and wait for target_div to get scrollend event.
-        var origin = { x: target_div.offsetWidth / 2, y: target_div.offsetHeight - 50 };
-        var delta = { x: 0, y: 40 };
-        await mouseActionsInTarget(target_div, origin, delta, 300);
-        await waitFor(() => { return scrollend_arrived; },
-            'target_div did not receive scrollend event after dragging scroll on target.');
-        assert_true(target_div.scrollTop > 0);
-        await checkFinalPosition(target_div, {x: target_div.scrollLeft, y: target_div.scrollTop}, 300);
-    }, 'Tests that the target_div gets scrollend event when dragging scroll on target.');
+    await resetTargetScrollState(t);
+    await waitForCompositorCommit();
 
-    promise_test(async (t) => {
-        resetTargetScrollState();
-        // Make sure that no scrollend event is sent to window.
-        window.addEventListener("scrollend",
-            t.unreached_func("window got unexpected scrollend event."));
-        await waitForCompositorCommit();
-        scrollend_arrived = false;
+    const targetScrollendPromise = createScrollendPromise(t);
+    verifyNoScrollendOnDocument(t);
 
-        // Hit the scrollbar of target div and wait for target_div to get scrollend event.
-        var scrollbar_width = target_div.offsetWidth - target_div.clientWidth;
-        assert_true(scrollbar_width > 0, "This test requires scrollbar.");
-        var origin = {x: target_div.offsetWidth - scrollbar_width / 2, y: target_div.offsetHeight - 50};
-        var delta = {x: 0, y: 0};
-        await mouseActionsInTarget(target_div, origin, delta, 100);
-        await waitFor(() => { return scrollend_arrived; },
-            'target_div did not receive scrollend event after clicking scrollbar on target.');
-        assert_true(target_div.scrollTop > 0);
-        await checkFinalPosition(target_div, { x: target_div.scrollLeft, y: target_div.scrollTop }, 300);
-    }, 'Tests that the target_div gets scrollend event when click scrollbar on target.');
+    // Perform a touch drag on target div and wait for target_div to get
+    // a scrollend event.
+    await new test_driver.Actions()
+        .addPointer('TestPointer', 'touch')
+        .pointerMove(0, 0, {origin: target_div}) // 0, 0 is center of element.
+        .pointerDown()
+        .addTick()
+        .pointerMove(0, -40, {origin: target_div}) //  Drag up to move down.
+        .addTick()
+        .pause(200) //  Prevent inertial scroll.
+        .pointerUp()
+        .send();
 
-    promise_test(async (t) => {
-        resetTargetScrollState();
-        // Make sure that no scrollend event is sent to window.
-        window.addEventListener("scrollend",
-            t.unreached_func("window got unexpected scrollend event."));
-        await waitForCompositorCommit();
-        scrollend_arrived = false;
+    await targetScrollendPromise;
 
+    assert_true(target_div.scrollTop > 0);
+    await verifyScrollStopped(t);
+  }, 'Tests that the target_div gets scrollend event when touch dragging.');
 
-        // Drag the thumb of target div.
-        var scrollbar_width = target_div.offsetWidth - target_div.clientWidth;
-        assert_true(scrollbar_width > 0, "This test requires scrollbar.");
-        var origin = { x: target_div.offsetWidth - scrollbar_width / 2, y: 50 };
-        var delta = { x: 0, y: 20 };
-        await mouseActionsInTarget(target_div, origin, delta, 100);
-        await waitFor(() => { return scrollend_arrived; },
-            'target_div did not receive scrollend event after dragging the thumb of target.');
-        assert_true(target_div.scrollTop > 0);
-        await checkFinalPosition(target_div, { x: target_div.scrollLeft, y: target_div.scrollTop }, 300);
-    }, 'Tests that the target_div gets scrollend event when drag the thumb of target.');
+  promise_test(async (t) => {
+    // Skip test on platforms that do not have a visible scrollbar (e.g.
+    // overlay scrollbar).
+    const scrollbar_width = target_div.offsetWidth - target_div.clientWidth;
+    if (scrollbar_width == 0)
+      return;
 
-    promise_test(async (t) => {
-        resetTargetScrollState();
-        // Make sure that no scrollend event is sent to window.
-        window.addEventListener("scrollend",
-            t.unreached_func("window got unexpected scrollend event."));
-        await waitForCompositorCommit();
-        scrollend_arrived = false;
+    await resetTargetScrollState(t);
+    await waitForCompositorCommit();
 
-        // Hit and active the target div.
-        var origin = { x: target_div.offsetWidth / 2, y: target_div.offsetHeight / 2};
-        var delta = { x: 0, y: 0 };
-        await mouseActionsInTarget(target_div, origin, delta, 100);
-        // Send DOWN key to the target div.
-        window.test_driver.send_keys(target_div, '\ue015');
+    const targetScrollendPromise = createScrollendPromise(t);
+    verifyNoScrollendOnDocument(t);
 
-        await waitFor(() => { return scrollend_arrived; },
-            'target_div did not receive scrollend event after sending DOWN key to target.');
-        assert_true(target_div.scrollTop > 0);
-        await checkFinalPosition(target_div, { x: target_div.scrollLeft, y: target_div.scrollTop }, 300);
-    }, 'Tests that the target_div gets scrollend event when send DOWN key to target.');
+    const bounds = target_div.getBoundingClientRect();
+    const x = bounds.right - scrollbar_width / 2;
+    const y = bounds.bottom - 20;
+    await new test_driver.Actions()
+        .addPointer('TestPointer', 'mouse')
+        .pointerMove(x, y, {origin: 'viewport'})
+        .pointerDown()
+        .addTick()
+        .pointerUp()
+        .send();
+
+    await targetScrollendPromise;
+    assert_true(target_div.scrollTop > 0);
+    await verifyScrollStopped(t);
+  }, 'Tests that the target_div gets scrollend event when clicking ' +
+     'scrollbar.');
+
+  // Same issue as previous test.
+  promise_test(async (t) => {
+    // Skip test on platforms that do not have a visible scrollbar (e.g.
+    // overlay scrollbar).
+    const scrollbar_width = target_div.offsetWidth - target_div.clientWidth;
+    if (scrollbar_width == 0)
+      return;
+
+    resetTargetScrollState(t);
+    const targetScrollendPromise = createScrollendPromise(t);
+    verifyNoScrollendOnDocument(t);
+
+    const bounds = target_div.getBoundingClientRect();
+    const x = bounds.right - scrollbar_width / 2;
+    const y = bounds.top + 30;
+    const dy = 30;
+    await new test_driver.Actions()
+        .addPointer('TestPointer', 'mouse')
+        .pointerMove(x, y, { origin: 'viewport' })
+        .pointerDown()
+        .pointerMove(x, y + dy, { origin: 'viewport' })
+        .addTick()
+        .pointerUp()
+        .send();
+
+    await targetScrollendPromise;
+    assert_true(target_div.scrollTop > 0);
+    await verifyScrollStopped(t);
+  }, 'Tests that the target_div gets scrollend event when dragging the ' +
+      'scrollbar thumb.');
+
+  promise_test(async (t) => {
+    resetTargetScrollState(t);
+    const targetScrollendPromise = createScrollendPromise(t);
+    verifyNoScrollendOnDocument(t);
+
+    const x = 0;
+    const y = 0;
+    const dx = 0;
+    const dy = 40;
+    const duration_ms = 10;
+    await new test_driver.Actions()
+        .scroll(x, y, dx, dy, { origin: target_div }, duration_ms)
+        .send();
+
+    await targetScrollendPromise;
+    assert_true(target_div.scrollTop > 0);
+    await verifyScrollStopped(t);
+  }, 'Tests that the target_div gets scrollend event when mouse wheel ' +
+     'scrolling.');
+
+  promise_test(async (t) => {
+    await resetTargetScrollState(t);
+    await waitForCompositorCommit();
+
+    verifyNoScrollendOnDocument(t);
+    const targetScrollendPromise = createScrollendPromise(t);
+
+    target_div.focus();
+    window.test_driver.send_keys(target_div, '\ue015');
+
+    await targetScrollendPromise;
+    assert_true(target_div.scrollTop > 0);
+    await verifyScrollStopped(t);
+  }, 'Tests that the target_div gets scrollend event when sending DOWN key ' +
+     'to the target.');
 }
+
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/dom/xslt/sort-ref.html b/tests/wpt/web-platform-tests/dom/xslt/sort-ref.html
new file mode 100644
index 00000000000..163002d0d09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/xslt/sort-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399858">
+
+<div>
+  <div>1</div>
+  <div>2</div>
+  <div>3</div>
+  <div>7</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/dom/xslt/sort.html b/tests/wpt/web-platform-tests/dom/xslt/sort.html
new file mode 100644
index 00000000000..631c3edd6ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/xslt/sort.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<link rel=match href="sort-ref.html">
+
+<body>
+  <div id="container"></div>
+</body>
+
+<script type="text/xml" id="sampleXml">
+  <root>
+    <node id="1" />
+    <node id="7" />
+    <node id="3" />
+    <node id="2" />
+  </root>
+</script>
+
+<script type="text/xml" id="sampleXsl">
+  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+
+    <xsl:template match="/">
+      <xsl:apply-templates select="//node">
+        <xsl:sort select="@id" data-type="number" />
+      </xsl:apply-templates>
+    </xsl:template>
+
+    <xsl:template match="node">
+      <div>
+        <xsl:value-of select="@id"/>
+      </div>
+    </xsl:template>
+
+  </xsl:stylesheet>
+</script>
+
+<script>
+  let parser = new DOMParser();
+  const xslStyleSheet = parser.parseFromString(document.getElementById('sampleXsl').textContent, 'text/xml');
+
+  const xsltProcessor = new XSLTProcessor();
+  xsltProcessor.importStylesheet(xslStyleSheet);
+
+  parser = new DOMParser();
+  const xmlDoc = parser.parseFromString(document.getElementById('sampleXml').textContent, 'text/xml');
+
+  const fragment = xsltProcessor.transformToFragment(xmlDoc, document);
+
+  document.getElementById('container').appendChild(fragment);
+</script>
diff --git a/tests/wpt/web-platform-tests/editing/data/bold.js b/tests/wpt/web-platform-tests/editing/data/bold.js
index 14147e4266c..0d7587de313 100644
--- a/tests/wpt/web-platform-tests/editing/data/bold.js
+++ b/tests/wpt/web-platform-tests/editing/data/bold.js
@@ -1024,5 +1024,18 @@ var browserTests = [
     [["stylewithcss","false"],["bold",""]],
     "<span style=\"font-weight:100\">fo<b>[o</b></span><span style=\"font-weight:200\"><b>b]</b>ar</span>",
     [true,true],
-    {"stylewithcss":[false,true,"",false,false,""],"bold":[false,false,"",false,true,""]}]
+    {"stylewithcss":[false,true,"",false,false,""],"bold":[false,false,"",false,true,""]}],
+
+// Don't delete non-editable node.
+["abc<b>[d<span contenteditable=\"false\"><b>e</b></span>f]</b>ghi",
+    [["stylewithcss","false"],["bold",""]],
+    "abcd<span contenteditable=\"false\"><b>e</b></span>fghi",
+    [true,true],
+    {}],
+// but delete editable node in non-editable node.
+["abc<b>[d<span contenteditable=\"false\"><span contenteditable><b>e</b></span></span>f]</b>ghi",
+    [["stylewithcss","false"],["bold",""]],
+    "abcd<span contenteditable=\"false\"><span contenteditable=\"\">e</span></span>fghi",
+    [true,true],
+    {}],
 ]
diff --git a/tests/wpt/web-platform-tests/editing/data/hilitecolor.js b/tests/wpt/web-platform-tests/editing/data/hilitecolor.js
index 25706196321..7f9f4949dc1 100644
--- a/tests/wpt/web-platform-tests/editing/data/hilitecolor.js
+++ b/tests/wpt/web-platform-tests/editing/data/hilitecolor.js
@@ -352,22 +352,24 @@ var browserTests = [
     {"stylewithcss":[false,true,"",false,false,""],"hilitecolor":[false,false,"rgb(210, 180, 140)",false,false,"rgb(0, 255, 255)"]}],
 ["<font size=6>[foo]</font>",
     [["stylewithcss","true"],["hilitecolor","#00FFFF"]],
-    "<span style=\"background-color:rgb(0, 255, 255)\"><font size=\"6\">[foo]</font></span>",
+    ["<font size=\"6\" style=\"background-color:rgb(0, 255, 255)\">foo</font>",
+     "<font style=\"background-color:rgb(0, 255, 255)\" size=\"6\">foo</font>"],
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"hilitecolor":[false,false,"rgba(0, 0, 0, 0)",false,false,"rgb(0, 255, 255)"]}],
 ["<font size=6>[foo]</font>",
     [["stylewithcss","false"],["hilitecolor","#00FFFF"]],
-    "<span style=\"background-color:rgb(0, 255, 255)\"><font size=\"6\">[foo]</font></span>",
+    ["<font size=\"6\" style=\"background-color:rgb(0, 255, 255)\">foo</font>",
+     "<font style=\"background-color:rgb(0, 255, 255)\" size=\"6\">foo</font>"],
     [true,true],
     {"stylewithcss":[false,true,"",false,false,""],"hilitecolor":[false,false,"rgba(0, 0, 0, 0)",false,false,"rgb(0, 255, 255)"]}],
 ["<span style=font-size:xx-large>[foo]</span>",
     [["stylewithcss","true"],["hilitecolor","#00FFFF"]],
-    "<span style=\"background-color:rgb(0, 255, 255)\"><span style=\"font-size:xx-large\">[foo]</span></span>",
+    "<span style=\"font-size:xx-large; background-color:rgb(0, 255, 255)\">[foo]</span>",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"hilitecolor":[false,false,"rgba(0, 0, 0, 0)",false,false,"rgb(0, 255, 255)"]}],
 ["<span style=font-size:xx-large>[foo]</span>",
     [["stylewithcss","false"],["hilitecolor","#00FFFF"]],
-    "<span style=\"background-color:rgb(0, 255, 255)\"><span style=\"font-size:xx-large\">[foo]</span></span>",
+    "<span style=\"font-size:xx-large; background-color:rgb(0, 255, 255)\">[foo]</span>",
     [true,true],
     {"stylewithcss":[false,true,"",false,false,""],"hilitecolor":[false,false,"rgba(0, 0, 0, 0)",false,false,"rgb(0, 255, 255)"]}],
 ["<font size=6>foo[bar]baz</font>",
diff --git a/tests/wpt/web-platform-tests/editing/data/inserttext.js b/tests/wpt/web-platform-tests/editing/data/inserttext.js
index ca90b9ae9ca..b6b08d5cbc1 100644
--- a/tests/wpt/web-platform-tests/editing/data/inserttext.js
+++ b/tests/wpt/web-platform-tests/editing/data/inserttext.js
@@ -1107,7 +1107,7 @@ var browserTests = [
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<a href=http://www.google.com>[bar</a>baz]",
     [["inserttext","a"]],
-    "foo<a href=\"http://www.google.com\">a[]</a>",
+    "fooa[]",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<font face=sans-serif>[bar</font>baz]",
@@ -1130,39 +1130,40 @@ var browserTests = [
     "foo<span style=\"background-color:rgb(0, 255, 255)\">a[]</span>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
+// <a href> should always be removed if entirely replaced.
 ["foo<a href=http://www.google.com><font color=blue>[bar</font></a>baz]",
     [["inserttext","a"]],
-    "foo<a href=\"http://www.google.com\"><font color=\"blue\">a[]</font></a>",
+    "foo<font color=\"blue\">a[]</font>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<font color=blue><a href=http://www.google.com>[bar</a></font>baz]",
     [["inserttext","a"]],
-    "foo<font color=\"blue\"><a href=\"http://www.google.com\">a[]</a></font>",
+    "foo<font color=\"blue\">a[]</font>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<a href=http://www.google.com><font color=brown>[bar</font></a>baz]",
     [["inserttext","a"]],
-    "foo<a href=\"http://www.google.com\"><font color=\"brown\">a[]</font></a>",
+    "foo<font color=\"brown\">a[]</font>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<font color=brown><a href=http://www.google.com>[bar</a></font>baz]",
     [["inserttext","a"]],
-    "foo<font color=\"brown\"><a href=\"http://www.google.com\">a[]</a></font>",
+    "foo<font color=\"brown\">a[]</font>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<a href=http://www.google.com><font color=black>[bar</font></a>baz]",
     [["inserttext","a"]],
-    "foo<a href=\"http://www.google.com\"><font color=\"black\">a[]</font></a>",
+    "foo<font color=\"black\">a[]</font>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<a href=http://www.google.com><u>[bar</u></a>baz]",
     [["inserttext","a"]],
-    "foo<a href=\"http://www.google.com\"><u>a[]</u></a>",
+    "foo<u>a[]</u>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<u><a href=http://www.google.com>[bar</a></u>baz]",
     [["inserttext","a"]],
-    "foo<u><a href=\"http://www.google.com\">a[]</a></u>",
+    "foo<u>a[]</u>",
     [true],
     {"inserttext":[false,false,"",false,false,""]}],
 ["foo<sub><font size=2>[bar</font></sub>baz]",
diff --git a/tests/wpt/web-platform-tests/editing/data/strikethrough.js b/tests/wpt/web-platform-tests/editing/data/strikethrough.js
index 83cc7edf7ac..86d2668447f 100644
--- a/tests/wpt/web-platform-tests/editing/data/strikethrough.js
+++ b/tests/wpt/web-platform-tests/editing/data/strikethrough.js
@@ -15,9 +15,11 @@ var browserTests = [
     "<p><strike>[foo</strike></p> <p><strike>bar]</strike></p>",
     [true,true],
     {"stylewithcss":[false,true,"",false,false,""],"strikethrough":[false,false,"",false,true,""]}],
+// The first <span> should be styled with text-decoration, then, it becomes a
+// good container for the following text node and the other <span>.
 ["<span>[foo</span> <span>bar]</span>",
     [["stylewithcss","true"],["strikethrough",""]],
-    "<span style=\"text-decoration:line-through\"><span>[foo</span> <span>bar]</span></span>",
+    "<span style=\"text-decoration:line-through\"><span>foo</span> <span>bar</span></span>",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"strikethrough":[false,false,"",false,true,""]}],
 ["<span>[foo</span> <span>bar]</span>",
@@ -25,9 +27,12 @@ var browserTests = [
     "<strike><span>[foo</span> <span>bar]</span></strike>",
     [true,true],
     {"stylewithcss":[false,true,"",false,false,""],"strikethrough":[false,false,"",false,true,""]}],
+// Entire the content of the first <p> and the last <p> should be wrapped in
+// new <span> elements, and in the middle <p>, the <span> element should be
+// styled but the invisible text nodes should be ignored.
 ["<p>[foo</p><p> <span>bar</span> </p><p>baz]</p>",
     [["stylewithcss","true"],["strikethrough",""]],
-    "<p><span style=\"text-decoration:line-through\">[foo</span></p><p> <span style=\"text-decoration:line-through\"><span>bar</span></span> </p><p><span style=\"text-decoration:line-through\">baz]</span></p>",
+    "<p><span style=\"text-decoration:line-through\">[foo</span></p><p> <span style=\"text-decoration:line-through\">bar</span> </p><p><span style=\"text-decoration:line-through\">baz</span></p>",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"strikethrough":[false,false,"",false,true,""]}],
 ["<p>[foo</p><p> <span>bar</span> </p><p>baz]</p>",
@@ -588,7 +593,7 @@ var browserTests = [
     {"stylewithcss":[false,true,"",false,false,""],"strikethrough":[false,false,"",false,true,""]}],
 ["foo<span class=\"underline\">[bar]</span>baz",
     [["stylewithcss","true"],["strikethrough",""]],
-    "foo<span style=\"text-decoration:line-through\"><span class=\"underline\">[bar]</span></span>baz",
+    "foo<span class=\"underline\" style=\"text-decoration:line-through\">bar</span>baz",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"strikethrough":[false,false,"",false,true,""]}],
 ["foo<span class=\"underline\">[bar]</span>baz",
diff --git a/tests/wpt/web-platform-tests/editing/data/underline.js b/tests/wpt/web-platform-tests/editing/data/underline.js
index 4092e5a808f..812798a8e7f 100644
--- a/tests/wpt/web-platform-tests/editing/data/underline.js
+++ b/tests/wpt/web-platform-tests/editing/data/underline.js
@@ -27,7 +27,7 @@ var browserTests = [
     {"stylewithcss":[false,true,"",false,false,""],"underline":[false,false,"",false,true,""]}],
 ["<p>[foo</p><p> <span>bar</span> </p><p>baz]</p>",
     [["stylewithcss","true"],["underline",""]],
-    "<p><span style=\"text-decoration:underline\">[foo</span></p><p> <span style=\"text-decoration:underline\"><span>bar</span></span> </p><p><span style=\"text-decoration:underline\">baz]</span></p>",
+    "<p><span style=\"text-decoration:underline\">[foo</span></p><p> <span style=\"text-decoration:underline\">bar</span> </p><p><span style=\"text-decoration:underline\">baz</span></p>",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"underline":[false,false,"",false,true,""]}],
 ["<p>[foo</p><p> <span>bar</span> </p><p>baz]</p>",
@@ -597,7 +597,7 @@ var browserTests = [
     {"underline":[false,true,"",false,true,""]}],
 ["foo<span class=\"line-through\">[bar]</span>baz",
     [["stylewithcss","true"],["underline",""]],
-    "foo<span style=\"text-decoration:underline\"><span class=\"line-through\">[bar]</span></span>baz",
+    "foo<span class=\"line-through\" style=\"text-decoration:underline\">[bar]</span>baz",
     [true,true],
     {"stylewithcss":[false,false,"",false,true,""],"underline":[false,false,"",false,true,""]}],
 ["foo<span class=\"line-through\">[bar]</span>baz",
diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert-ref.html b/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert-ref.html
new file mode 100644
index 00000000000..dc46b159012
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert-ref.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+  summary {
+    display: list-item;
+    counter-increment: list-item 0;
+    list-style: disclosure-closed inside;
+  }
+  details[open] > summary {
+    list-style-type: disclosure-open;
+  }
+</style>
+<details>
+  <summary>Example</summary>
+</details>
+<details open>
+  <summary>Example</summary>
+</details>
diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert.html b/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert.html
new file mode 100644
index 00000000000..760cc8281e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="help" href="https://html.spec.whatwg.org/#the-details-and-summary-elements">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1804925">
+<link rel="match" href="details-revert-ref.html">
+<style>
+  summary {
+    display: revert;
+    counter-increment: revert;
+    list-style: revert;
+  }
+</style>
+<details>
+  <summary>Example</summary>
+</details>
+<details open>
+  <summary>Example</summary>
+</details>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html
index fc92529efaf..c187d89badf 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html
@@ -55,4 +55,12 @@
     mult.value = 'u,ser1@example.com,user2@test.com,user3@test.com';
     assert_false(mult.validity.valid);
   }, "valid value is a set of valid email addresses separated by a single ','");
+
+  test(function(){
+    mult.removeAttribute('multiple');
+    mult.value = 'user1@example.com , user2@example.com';
+    assert_equals(mult.value, 'user1@example.com , user2@example.com');
+    mult.setAttribute('multiple', true);
+    assert_equals(mult.value, 'user1@example.com,user2@example.com');
+  }, 'When the multiple attribute is set, the user agent must run the value sanitization algorithm');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/light-dismiss-event-ordering.tentative.html b/tests/wpt/web-platform-tests/html/semantics/popovers/light-dismiss-event-ordering.tentative.html
new file mode 100644
index 00000000000..4bfcecc4b05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/popovers/light-dismiss-event-ordering.tentative.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://chromium-review.googlesource.com/c/chromium/src/+/4023021">
+<link rel=help href="https://github.com/whatwg/html/pull/8221#discussion_r1041135388">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="resources/popover-utils.js"></script>
+
+<button id=target>target</button>
+<div id=popover popover=auto>popover</div>
+
+<script>
+for (const capture of [true, false]) {
+  for (const eventName of ['pointerdown', 'pointerup', 'mousedown', 'mouseup', 'click']) {
+    promise_test(async t => {
+      t.add_cleanup(() => {
+        try {
+          popover.hidePopover();
+        } catch {}
+      });
+
+      popover.showPopover();
+      document.addEventListener(eventName, event => {
+        event.preventDefault();
+      }, {capture, once: true});
+      // Click away from the popover to activate light dismiss.
+      await clickOn(target);
+      assert_equals(document.querySelectorAll(':open').length, 0,
+        'The popover should be closed via light dismiss even when preventDefault is called.');
+
+      popover.showPopover();
+      document.addEventListener(eventName, event => {
+        event.stopPropagation();
+      }, {capture, once: true});
+      // Click away from the popover to activate light dismiss.
+      await clickOn(target);
+      assert_equals(document.querySelectorAll(':open').length, 0,
+        'The popover should be closed via light dismiss even when stopPropagation is called.');
+
+    }, `Tests the interactions between popover light dismiss and pointer/mouse events. eventName: ${eventName}, capture: ${capture}`);
+  }
+}
+
+promise_test(async t => {
+  t.add_cleanup(() => {
+    try {
+      popover.hidePopover();
+    } catch {}
+  });
+  popover.showPopover();
+
+  const expectedEvents = [
+    'pointerdown',
+    'mousedown',
+    'beforetoggle newState: closed',
+    'pointerup',
+    'mouseup',
+    'click'
+  ];
+  const events = [];
+
+  for (const eventName of ['pointerdown', 'pointerup', 'mousedown', 'mouseup', 'click']) {
+    document.addEventListener(eventName, () => events.push(eventName));
+  }
+  popover.addEventListener('beforetoggle', event => {
+    events.push('beforetoggle newState: ' + event.newState);
+  });
+
+  // Click away from the popover to activate light dismiss.
+  await clickOn(target);
+
+  assert_array_equals(events, expectedEvents,
+    'pointer and popover events should be fired in the correct order.');
+
+  assert_equals(document.querySelectorAll(':open').length, 0,
+    'The popover should be closed via light dismiss.');
+
+}, 'Tests the order of pointer/mouse events during popover light dismiss.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.tentative.html b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.tentative.html
index 2250d6fabd8..1bc32dbace3 100644
--- a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.tentative.html
@@ -2,6 +2,7 @@
 <meta charset="utf-8">
 <link rel="author" href="mailto:masonf@chromium.org">
 <link rel=help href="https://open-ui.org/components/popup.research.explainer">
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -283,8 +284,9 @@ window.onload = () => {
     other_popover.showPopover();
     const popover = createPopover(t);
     popover.setAttribute('popover','auto');
-    other_popover.addEventListener('toggle', (e) => {
-      if (e.state !== "closing") return;
+    other_popover.addEventListener('beforetoggle', (e) => {
+      if (e.newState !== "closed")
+        return;
       popover.setAttribute('popover','manual');
     },{once: true});
     assert_true(other_popover.matches(':open'));
@@ -292,7 +294,7 @@ window.onload = () => {
     popover.showPopover();
     assert_false(other_popover.matches(':open'),'unrelated popover is hidden');
     assert_false(popover.matches(':open'),'popover is not shown if its type changed during show');
-  },`Changing the popover type in a "toggle" event handler should not cause problems (during showPopover())`);
+  },`Changing the popover type in a "beforetoggle" event handler should not cause problems (during showPopover())`);
 
   test((t) => {
     const popover = createPopover(t);
@@ -303,13 +305,15 @@ window.onload = () => {
     popover.showPopover();
     other_popover.showPopover();
     let nested_popover_hidden=false;
-    other_popover.addEventListener('toggle', (e) => {
-      if (e.state !== "closing") return;
+    other_popover.addEventListener('beforetoggle', (e) => {
+      if (e.newState !== "closed")
+        return;
       nested_popover_hidden = true;
       popover.setAttribute('popover','manual');
     },{once: true});
-    popover.addEventListener('toggle', (e) => {
-      if (e.state !== "closing") return;
+    popover.addEventListener('beforetoggle', (e) => {
+      if (e.newState !== "closed")
+        return;
       assert_true(nested_popover_hidden,'The nested popover should be hidden first');
     },{once: true});
     assert_true(popover.matches(':open'));
@@ -318,7 +322,7 @@ window.onload = () => {
     assert_false(other_popover.matches(':open'),'unrelated popover is hidden');
     assert_false(popover.matches(':open'),'popover is still hidden if its type changed during hide event');
     assert_throws_dom("InvalidStateError",() => other_popover.hidePopover(),'Nested popover should already be hidden');
-  },`Changing the popover type in a "toggle" event handler should not cause problems (during hidePopover())`);
+  },`Changing the popover type in a "beforetoggle" event handler should not cause problems (during hidePopover())`);
 
   function interpretedType(typeString,method) {
     if (validTypes.includes(typeString))
@@ -355,8 +359,9 @@ window.onload = () => {
             popover.showPopover();
             assert_true(popover.matches(':open'));
             let gotEvent = false;
-            popover.addEventListener('toggle', (e) => {
-              if (e.state !== "closing") return;
+            popover.addEventListener('beforetoggle', (e) => {
+              if (e.newState !== "closed")
+                return;
               gotEvent = true;
               setPopoverValue(popover,inEventType,method);
             },{once:true});
@@ -392,7 +397,7 @@ window.onload = () => {
                 }
               }
             }
-          },`Changing a popover from ${type} to ${newType} (via ${method}), and then ${inEventType} during 'toggle' works`);
+          },`Changing a popover from ${type} to ${newType} (via ${method}), and then ${inEventType} during 'beforetoggle' works`);
         });
       });
     });
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html
index 6fad205a9e0..3f9d466148c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html
@@ -63,6 +63,15 @@
         }
       }
     });
+    Array.from(document.getElementById("invalidMultiscripts").
+               getElementsByTagName("mmultiscripts")).forEach(element => {
+      let reference = element.nextElementSibling;
+      let description = element.dataset.description;
+      test(function() {
+        compareLayout(element, reference, epsilon);
+      }, `Invalid mmultiscripts should lay out as an mrow (${description})`);
+    });
+
     done();
   }
 </script>
@@ -70,5 +79,47 @@
 <body>
   <div id="log"></div>
   <div id="container"></div>
+  <div id="invalidMultiscripts">
+    <math>
+      <mmultiscripts data-description="first in-flow child is an <mprescripts>">
+        <mprescripts/>
+        <mspace height="5px" depth="15px" width="10px" style="background: black"/>
+        <mspace height="30px" depth="10px" width="20px" style="background: black"/>
+        <mspace height="15px" depth="45px" width="30px" style="background: black"/>
+        <mspace height="60px" depth="20px" width="40px" style="background: black"/>
+
+      </mmultiscripts>
+      <mrow>
+        <mprescripts/>
+        <mspace height="5px" depth="15px" width="10px" style="background: black"/>
+        <mspace height="30px" depth="10px" width="20px" style="background: black"/>
+        <mspace height="15px" depth="45px" width="30px" style="background: black"/>
+        <mspace height="60px" depth="20px" width="40px" style="background: black"/>
+
+      </mrow>
+    </math>
+    <math>
+      <mmultiscripts data-description="one of the even number of children after the first <mprescripts> is an <mprescripts>">
+        <mspace height="5px" depth="15px" width="10px" style="background: black"/>
+        <mspace height="30px" depth="10px" width="20px" style="background: black"/>
+        <mspace height="15px" depth="45px" width="30px" style="background: black"/>
+        <mprescripts/>
+        <mspace height="60px" depth="20px" width="40px" style="background: black"/>
+        <mprescripts/>
+        <mspace height="25px" depth="75px" width="50px" style="background: black"/>
+        <mspace height="35px" depth="105px" width="70px" style="background: black"/>
+      </mmultiscripts>
+      <mrow>
+        <mspace height="5px" depth="15px" width="10px" style="background: black"/>
+        <mspace height="30px" depth="10px" width="20px" style="background: black"/>
+        <mspace height="15px" depth="45px" width="30px" style="background: black"/>
+        <mprescripts/>
+        <mspace height="60px" depth="20px" width="40px" style="background: black"/>
+        <mprescripts/>
+        <mspace height="25px" depth="75px" width="50px" style="background: black"/>
+        <mspace height="35px" depth="105px" width="70px" style="background: black"/>
+      </mrow>
+    </math>
+  </div>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html b/tests/wpt/web-platform-tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html
new file mode 100644
index 00000000000..7500277f225
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<title>Capturing boundary event handler at UA Shadow DOM</title>
+<meta name="variant" content="?mouse">
+<meta name="variant" content="?touch">
+<meta name="variant" content="?pen">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="pointerevent_support.js"></script>
+
+<style>
+  .target {
+    width: 100px;
+    height: 50px;
+    border: 1px solid red;
+  }
+</style>
+<!-- This div has no shadow dom, serves only as a "control" group. -->
+<div class="target"></div>
+<video class="target"></video>
+<input class="target"></input>
+<div id="done">done</div>
+
+<script>
+  "use strict";
+  const pointer_type = location.search.substring(1);
+
+  const targets = document.getElementsByClassName("target");
+  const done = document.getElementById("done");
+
+  let event_log = [];
+  function logEventAndPhase(e) {
+    event_log.push(`${e.type}-${e.eventPhase}`);
+  }
+
+  const logged_events = [
+    "pointerenter", "pointerleave", "pointerover", "pointerout"
+  ];
+  const expected_events_and_phases = [
+    "pointerover-2", "pointerenter-2", "pointerout-2", "pointerleave-2"
+  ];
+
+  function addPromiseTest(target) {
+    const test_name = `Capturing boundary event handler at ${target.tagName}`;
+    promise_test(async () => {
+      event_log = [];
+
+      logged_events.forEach(ename => {
+        target.addEventListener(ename, logEventAndPhase, {capture:true});
+      });
+
+      let done_click_promise = getEvent("click", done);
+
+      let actions = new test_driver.Actions()
+          .addPointer("TestPointer", pointer_type)
+          .pointerMove(0, 0, {origin: target})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(0, 0, {origin: done})
+          .pointerDown()
+          .pointerUp();
+
+      await actions.send();
+      await done_click_promise;
+
+      logged_events.forEach(ename => {
+        target.removeEventListener(ename, logEventAndPhase, {capture:true});
+      });
+
+      assert_equals(event_log.toString(),
+          expected_events_and_phases.toString(),
+          "received events with phases");
+    }, test_name);
+  }
+
+  for (let i = 0; i < targets.length; i++)
+    addPromiseTest(targets.item(i));
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
index efb7d2c112c..832b3e0cb9b 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
@@ -10,45 +10,23 @@
 <script>
 test_valid_value('animation',
   '1s linear 1s 2 reverse forwards paused anim');
-test_valid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim timeline');
-test_valid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim none');
-test_valid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim "initial"');
-test_valid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim auto',
-  '1s linear 1s 2 reverse forwards paused anim');
-test_valid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim scroll()');
 
 test_invalid_value('animation',
   '1s linear 1s 2 reverse forwards paused anim initial');
 test_invalid_value('animation',
   '1s linear 1s 2 reverse forwards paused anim 2000');
 test_invalid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim scroll(abc block)');
+  '1s linear 1s 2 reverse forwards paused anim scroll()');
 test_invalid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim scroll(inline abc)');
-test_invalid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim scroll(abc)');
-test_invalid_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim scroll("string")');
+  '1s linear 1s 2 reverse forwards paused anim timeline');
 
 test_computed_value('animation',
   '1s linear 1s 2 reverse forwards paused anim');
-test_computed_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim timeline');
-test_computed_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim none');
-test_computed_value('animation',
-  '1s linear 1s 2 reverse forwards paused anim auto',
-  '1s linear 1s 2 reverse forwards paused anim');
 
 test_shorthand_value('animation',
-  `1s linear 1s 2 reverse forwards paused anim1 timeline,
-   1s linear 1s 2 reverse forwards paused anim2 none,
-   1s linear 1s 2 reverse forwards paused anim3 auto`,
+  `1s linear 1s 2 reverse forwards paused anim1,
+   1s linear 1s 2 reverse forwards paused anim2,
+   1s linear 1s 2 reverse forwards paused anim3`,
 {
   'animation-duration': '1s, 1s, 1s',
   'animation-timing-function': 'linear, linear, linear',
@@ -58,6 +36,6 @@ test_shorthand_value('animation',
   'animation-fill-mode': 'forwards, forwards, forwards',
   'animation-play-state': 'paused, paused, paused',
   'animation-name': 'anim1, anim2, anim3',
-  'animation-timeline': 'timeline, none, auto'
+  'animation-timeline': 'auto, auto, auto'
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
index 6b7bab9b650..9f55e2d2c91 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
@@ -39,6 +39,8 @@
 <script>
 "use strict";
 
+setup(assert_implements_animation_timeline);
+
 function createScroller(t, scrollerSizeClass) {
   let scroller = document.createElement('div');
   let className = scrollerSizeClass || 'square';
@@ -89,7 +91,8 @@ promise_test(async t => {
   target.appendChild(content);
 
   target.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   target.scrollTop = 50; // 50%, in [0, 100].
   await waitForNextFrame();
@@ -111,7 +114,8 @@ promise_test(async t => {
   parent.insertBefore(target, parent.firstElementChild);
 
   parent.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   parent.scrollTop = 100; // 50%, in [0, 200].
   await waitForNextFrame();
@@ -128,7 +132,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   sibling.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   sibling.scrollTop = 50; // 50%, in [0, 100].
   await waitForNextFrame();
@@ -149,7 +154,8 @@ promise_test(async t => {
   parent.appendChild(target);
 
   sibling.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   sibling.scrollTop = 50; // 50%, in [0, 100].
   await waitForNextFrame();
@@ -170,7 +176,8 @@ promise_test(async t => {
   document.body.appendChild(sibling);
 
   sibling.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   sibling.scrollTop = 50; // 50%, in [0, 100].
   await waitForNextFrame();
@@ -199,7 +206,8 @@ promise_test(async t => {
   parent.style.scrollTimelineName = 'timeline';
   parent.style.scrollTimelineAxis = 'inline';
   sibling.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   parent.scrollTop = 50; // 25%, in [0, 200].
   sibling.scrollTop = 50; // 50%, in [0, 100].
@@ -224,7 +232,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   sibling.style.scrollTimelineName = 'timeline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   sibling.scrollTop = 50; // 50%, in [0, 100].
   await waitForNextFrame();
@@ -248,7 +257,8 @@ promise_test(async t => {
   main.appendChild(sibling);
   main.appendChild(target);
 
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
   sibling.scrollTop = 50; // 50%, in [50, 150].
   await waitForNextFrame();
 
@@ -270,7 +280,8 @@ promise_test(async t => {
   // <div id='target'></div>
   document.body.appendChild(target);
 
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
 
   // Unknown animation-timeline, current time held at zero.
   assert_equals(getComputedStyle(target).translate, '50px');
@@ -302,7 +313,8 @@ promise_test(async t => {
   await waitForNextFrame();
 
   scroller.style.scrollTimelineName = 'timeline';
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
   await waitForCSSScrollTimelineStyle();
 
   assert_equals(getComputedStyle(target).translate, '100px');
@@ -329,7 +341,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   scroller.style.scrollTimelineName = 'timeline';
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
 
   // Unknown animation-timeline, current time held at zero.
   assert_equals(getComputedStyle(target).translate, '50px');
@@ -353,7 +366,8 @@ promise_test(async t => {
   await waitForNextFrame();
 
   scroller.style.scrollTimelineName = 'timeline';
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
   await waitForCSSScrollTimelineStyle();
 
   assert_equals(getComputedStyle(target).translate, '100px');
@@ -377,7 +391,8 @@ promise_test(async t => {
 
   scroller.style.scrollTimelineName = 'timeline';
   scroller.style.display = 'none';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   await waitForNextFrame();
 
@@ -407,7 +422,8 @@ promise_test(async t => {
 
   scroller.style.scrollTimelineName = 'timeline-A';
   scroller.scrollTop = 50;
-  target.style.animation = "anim 10s linear timeline-B";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline-B';
 
   await waitForNextFrame();
 
@@ -436,7 +452,8 @@ promise_test(async t => {
 
   scroller.style.scrollTimelineName = 'timeline-A';
   scroller.scrollTop = 50;
-  target.style.animation = "anim 10s linear timeline-A";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline-A';
 
   await waitForNextFrame();
 
@@ -458,7 +475,8 @@ promise_test(async t => {
   let scroller1 = createScroller(t);
   let scroller2 = createScroller(t);
 
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
   scroller1.style.scrollTimelineName = 'timeline';
   scroller2.style.scrollTimelineName = 'timeline';
   scroller1.id = 'A';
@@ -496,7 +514,8 @@ promise_test(async t => {
   let target = createTarget(t);
   let scroller1 = createScroller(t);
 
-  target.style.animation = 'anim 10s linear timeline';
+  target.style.animation = 'anim 10s linear';
+  target.style.animationTimeline = 'timeline';
   scroller1.style.scrollTimelineName = 'timeline';
   scroller1.id = 'A';
 
@@ -541,7 +560,8 @@ promise_test(async t => {
 
   // <div id='target'></div>
   document.body.append(target);
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   await waitForNextFrame();
 
@@ -579,7 +599,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   scroller.style.scrollTimeline = 'timeline block';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   scroller.scrollLeft = 50;
   await waitForNextFrame();
@@ -594,7 +615,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   scroller.style.scrollTimeline = 'timeline inline';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   scroller.scrollTop = 50;
   await waitForNextFrame();
@@ -609,7 +631,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   scroller.style.scrollTimeline = 'timeline horizontal';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   scroller.scrollLeft = 50;
   await waitForNextFrame();
@@ -624,7 +647,8 @@ promise_test(async t => {
   document.body.appendChild(target);
 
   scroller.style.scrollTimeline = 'timeline vertical';
-  target.style.animation = "anim 10s linear timeline";
+  target.style.animation = "anim 10s linear";
+  target.style.animationTimeline = 'timeline';
 
   scroller.scrollTop = 50;
   await waitForNextFrame();
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html
index a721c66e53f..e28e85245e1 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html
@@ -6,6 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { translate: 50px; }
@@ -43,6 +44,8 @@
 <script>
 "use strict";
 
+setup(assert_implements_animation_timeline);
+
 const root = document.scrollingElement;
 const createTargetWithStuff = function(t, contentClass) {
   let container = document.createElement('div');
@@ -83,7 +86,8 @@ async function scrollTop(element, value) {
 
 promise_test(async t => {
   let [container, div] = createTargetWithStuff(t, 'block-content');
-  div.style.animation = "anim 10s linear scroll(nearest)";
+  div.style.animation = "anim 10s linear";
+  div.style.animationTimeline = "scroll(nearest)";
 
   await scrollTop(root, 50);
   assert_equals(getComputedStyle(div).translate, '50px');
@@ -96,7 +100,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [container, div] = createTargetWithStuff(t, 'block-content');
-  div.style.animation = "anim 10s linear scroll(root)";
+  div.style.animation = "anim 10s linear";
+  div.style.animationTimeline = "scroll(root)";
 
   await scrollTop(container, 50);
   assert_equals(getComputedStyle(div).translate, '50px');
@@ -109,7 +114,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [container, div] = createTargetWithStuff(t, 'inline-content');
-  div.style.animation = "anim 10s linear scroll(inline)";
+  div.style.animation = "anim 10s linear";
+  div.style.animationTimeline = "scroll(inline)";
 
   await scrollLeft(container, 50);
   assert_equals(getComputedStyle(div).translate, '100px');
@@ -118,7 +124,8 @@ promise_test(async t => {
 promise_test(async t => {
   let [container, div] = createTargetWithStuff(t, 'block-content');
   container.style.writingMode = 'vertical-lr';
-  div.style.animation = "anim 10s linear scroll(horizontal)";
+  div.style.animation = "anim 10s linear";
+  div.style.animationTimeline = "scroll(horizontal)";
 
   await scrollLeft(container, 50);
   assert_equals(getComputedStyle(div).translate, '100px');
@@ -127,7 +134,8 @@ promise_test(async t => {
 promise_test(async t => {
   let [container, div] = createTargetWithStuff(t, 'inline-content');
   container.style.writingMode = 'vertical-lr';
-  div.style.animation = "anim 10s linear scroll(vertical)";
+  div.style.animation = "anim 10s linear";
+  div.style.animationTimeline = "scroll(vertical)";
 
   await scrollTop(container, 50);
   assert_equals(getComputedStyle(div).translate, '100px');
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html b/tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html
index 71a66cae2cd..10bf00fbbc0 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html
@@ -6,6 +6,7 @@
  href="https://www.w3.org/TR/web-animations-1/#animation-effect-phases-and-states">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes slide {
     from { transform: translateX(100px);  }
@@ -26,7 +27,8 @@
     background-color:  green;
     height:  100px;
     width:  100px;
-    animation:  slide 1s linear timeline;
+    animation:  slide 1s linear;
+    animation-timeline: timeline;
   }
 </style>
 <body>
@@ -36,6 +38,8 @@
   </div>
 </body>
 <script type="text/javascript">
+  setup(assert_implements_animation_timeline);
+
   promise_test(async t => {
     // Newly created timeline is inactive,
     let animations = document.getAnimations();
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html
index f91be8d7534..f4f9a669f3d 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html
@@ -28,6 +28,8 @@
 <script>
 "use strict";
 
+setup(assert_implements_animation_timeline);
+
 const createTargetAndScroller = function(t) {
   let container = document.createElement('div');
   container.id = 'container';
@@ -69,7 +71,8 @@ async function scrollTop(element, value) {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   await scrollTop(scroller, 25); // [0, 100].
   assert_equals(getComputedStyle(target).translate, '25px');
@@ -77,7 +80,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '0s linear anim forwards scroll(nearest)';
+  target.style.animation = '0s linear anim forwards';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   await scrollTop(scroller, 25); // [0, 100].
   assert_equals(getComputedStyle(target).translate, '100px');
@@ -90,7 +94,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   await scrollTop(scroller, 25); // [0, 100].
   assert_equals(getComputedStyle(target).translate, '25px');
@@ -108,7 +113,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim forwards scroll(nearest)';
+  target.style.animation = '10s linear anim forwards';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationIterationCount = '0';
 
   await scrollTop(scroller, 25); // [0, 100].
@@ -117,7 +123,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim forwards scroll(nearest)';
+  target.style.animation = '10s linear anim forwards';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationIterationCount = 'infinite';
 
   await scrollTop(scroller, 25); // [0, 100].
@@ -131,7 +138,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   await scrollTop(scroller, 25) // [0, 100].
   assert_equals(getComputedStyle(target).translate, '25px');
@@ -139,7 +147,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationDirection = 'reverse';
 
   await scrollTop(scroller, 25); // 25% in the reversing direction.
@@ -148,7 +157,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationIterationCount = '2';
   target.style.animationDirection = 'alternate';
 
@@ -161,7 +171,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationIterationCount = '2';
   target.style.animationDirection = 'alternate-reverse';
 
@@ -179,7 +190,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   await scrollTop(scroller, 25); // [0, 100].
   assert_equals(getComputedStyle(target).translate, '25px');
@@ -204,7 +216,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
 
   //         active
   // |--------------------|
@@ -225,7 +238,8 @@ promise_test(async t => {
 
 promise_test(async t => {
   let [target, scroller] = createTargetAndScroller(t);
-  target.style.animation = '10s linear anim scroll(nearest)';
+  target.style.animation = '10s linear anim';
+  target.style.animationTimeline = 'scroll(nearest)';
   target.style.animationDelay = '10s';
   target.style.animationDelayStart = '10s'; // crbug.com/1375994
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html
index 1a9e6a2b3aa..809a658a15e 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html
@@ -14,7 +14,8 @@
     to { z-index: 100; }
   }
   #element {
-    animation: anim forwards scroll(root);
+    animation: anim forwards;
+    animation-timeline: scroll(root);
   }
   #spacer {
     height:  200vh;
@@ -26,6 +27,8 @@
 <script>
 'use strict';
 
+setup(assert_implements_animation_timeline);
+
 promise_test(async () => {
   await waitForCSSScrollTimelineStyle();
   assert_equals(getComputedStyle(element).zIndex, "100");
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html
index 59e85bf5608..d6a8ba8e605 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html
@@ -39,7 +39,8 @@
   #element {
     height: 10px;
     width: 10px;
-    animation: expand 10s linear timeline;
+    animation: expand 10s linear;
+    animation-timeline: timeline;
     background-color: rgb(0, 0, 0);
   }
 </style>
@@ -53,6 +54,8 @@
   </div>
 </div>
 <script>
+  setup(assert_implements_animation_timeline);
+
   promise_test(async (t) => {
     element.offsetTop;
     scroller.scrollTop = 50;
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html
index 01223910e8c..91668ada5be 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html
@@ -5,6 +5,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes expand_width {
     from { width: 100px; }
@@ -27,11 +28,13 @@
   }
   #element1 {
     width: 1px;
-    animation: expand_width 10s timeline1;
+    animation: expand_width 10s;
+    animation-timeline: timeline1;
   }
   #element2 {
     height: 1px;
-    animation: expand_height 10s timeline2;
+    animation: expand_height 10s;
+    animation-timeline: timeline2;
   }
 </style>
 <main id=main>
@@ -41,6 +44,8 @@
   </div>
 </main>
 <script>
+    setup(assert_implements_animation_timeline);
+
     function insertScroller(timeline_name) {
       let scroller = document.createElement('div');
       scroller.classList.add('scroller');
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html
index 6914fc616a4..1a79c9bb222 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html
@@ -17,7 +17,8 @@
     height: 100px;
   }
   #element {
-    animation: anim forwards scroll();
+    animation: anim forwards;
+    animation-timeline: scroll();
   }
   #spacer {
     height: 200px;
@@ -29,6 +30,8 @@
 </div>
 
 <script>
+setup(assert_implements_animation_timeline);
+
 promise_test(async () => {
   await waitForCSSScrollTimelineStyle();
   assert_equals(getComputedStyle(element).zIndex, '100');
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html
index 3ae2e75ecd7..54518a5e871 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html
@@ -24,6 +24,8 @@
 <script>
 'use strict';
 
+setup(assert_implements_animation_timeline);
+
 async function resetScrollPosition() {
   // Reset to 0 so we don't affect following tests.
   document.scrollingElement.scrollTop = 0;
@@ -36,7 +38,8 @@ promise_test(async t => {
   const scroller = document.scrollingElement;
   t.add_cleanup(resetScrollPosition);
 
-  div.style.animation = 'anim 100s linear paused scroll(root)';
+  div.style.animation = 'anim 100s linear paused';
+  div.style.animationTimeline = 'scroll(root)';
   await waitForCSSScrollTimelineStyle();
 
   const anim = div.getAnimations()[0];
@@ -57,7 +60,8 @@ promise_test(async t => {
   const scroller = document.scrollingElement;
   await waitForNextFrame();
 
-  div.style.animation = 'anim 100s linear forwards scroll(root)';
+  div.style.animation = 'anim 100s linear forwards';
+  div.style.animationTimeline = 'scroll(root)';
   await waitForCSSScrollTimelineStyle();
 
   const anim = div.getAnimations()[0];
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html
index ed6e2915dac..71d3699077e 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html
@@ -25,6 +25,8 @@
 <script>
 'use strict';
 
+setup(assert_implements_animation_timeline);
+
 promise_test(async t => {
   const div = addDiv(t, { style: 'width: 50px; height: 100px;' });
   const filling = addDiv(t, { class: 'fill-vh' });
@@ -32,7 +34,8 @@ promise_test(async t => {
   scroller.scrollTop = 0;
   await waitForNextFrame();
 
-  div.style.animation = 'anim 100s linear scroll(root)';
+  div.style.animation = 'anim 100s linear';
+  div.style.animationTimeline = 'scroll(root)';
   await waitForCSSScrollTimelineStyle();
 
   const anim = div.getAnimations()[0];
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html
index 873f18cbe3c..1c0b73ab45f 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html
@@ -12,7 +12,8 @@
     to { z-index: 100; }
   }
   #element {
-    animation: anim forwards scroll(root);
+    animation: anim forwards;
+    animation-timeline: scroll(root);
   }
   #spacer {
     height: 200vh;
@@ -22,6 +23,8 @@
 <div id=spacer></div>
 
 <script>
+setup(assert_implements_animation_timeline);
+
 promise_test(async () => {
   await waitForCSSScrollTimelineStyle();
   assert_equals(getComputedStyle(element).zIndex, '100');
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sibling-gcs.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sibling-gcs.html
index a1ba3b704b7..6062e795f43 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sibling-gcs.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sibling-gcs.html
@@ -23,7 +23,8 @@
   #element {
     height: 10px;
     width: 10px;
-    animation: anim 10s linear timeline;
+    animation: anim 10s linear;
+    animation-timeline: timeline;
     background-color: rgb(0, 0, 0);
   }
 </style>
@@ -36,6 +37,8 @@
   </div>
 </div>
 <script>
+  setup(assert_implements_animation_timeline);
+
   promise_test(async (t) => {
     element.offsetTop;
     scroller.scrollTop = 50;
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-specified-scroller-print.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-specified-scroller-print.html
index 0d262c2ed2e..ba97bd80c32 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-specified-scroller-print.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-specified-scroller-print.html
@@ -28,7 +28,14 @@
     width: 100px;
     height: 100px;
     background-color: green;
-    animation: anim 1s linear timeline;
+    animation: anim 1s linear;
+    animation-timeline: timeline;
+  }
+
+  @supports not (animation-timeline:timeline) {
+    #box {
+      animation-play-state: paused;
+    }
   }
 </style>
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js b/tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js
index 9f71af1bf11..66bc27bb104 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js
@@ -12,3 +12,8 @@ async function waitForCSSScrollTimelineStyle() {
   await waitForNextFrame();
   await waitForNextFrame();
 }
+
+function assert_implements_animation_timeline() {
+  assert_implements(CSS.supports('animation-timeline:foo'),
+      'animation-timeline not supported');
+}
diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/timeline-range-name-offset-in-keyframes.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html
similarity index 94%
rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/timeline-range-name-offset-in-keyframes.tentative.html
rename to tests/wpt/web-platform-tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html
index 38eecd9829c..993046c5f2b 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/timeline-range-name-offset-in-keyframes.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html
@@ -6,6 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes fade-in-out-animation {
     enter 0%, exit 100% { opacity: 0 }
@@ -17,7 +18,8 @@
     height: 200px;
     width: 200px;
     view-timeline-name: foo;
-    animation: linear 1s both fade-in-out-animation foo;
+    animation: linear 1s both fade-in-out-animation;
+    animation-timeline: foo;
   }
 
   #container {
@@ -42,6 +44,8 @@
 </body>
 
 <script type="text/javascript">
+  setup(assert_implements_animation_timeline);
+
   function runTests() {
     promise_test(async t => {
       // scrollTop=200 to 400 is the enter range
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html
index 3ba474a7797..b816bb68973 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { z-index: 0; }
@@ -31,6 +32,8 @@
 </style>
 <main id=main></main>
 <script>
+  setup(assert_implements_animation_timeline);
+
   function inflate(t, template) {
     t.add_cleanup(() => main.replaceChildren());
     main.append(template.content.cloneNode(true));
@@ -49,7 +52,8 @@
   <style>
     #target {
       view-timeline: t1;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical-scroller>
@@ -83,7 +87,8 @@
   <style>
     #target {
       view-timeline: t1 horizontal;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=horizontal-scroller>
@@ -132,8 +137,14 @@
       width: 50px;
       height: 50px;
     }
-    #target_v { animation: anim 1s linear tv; }
-    #target_h { animation: anim 1s linear th; }
+    #target_v {
+      animation: anim 1s linear;
+      animation-timeline: tv;
+    }
+    #target_h {
+      animation: anim 1s linear;
+      animation-timeline: th;
+    }
   </style>
   <div id=scroller>
     <!-- Created dynamically -->
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-delay-animation.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-delay-animation.html
index 9124df6bce5..dfb0e59f5d7 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-delay-animation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-delay-animation.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { z-index: 0; background-color: skyblue;}
@@ -31,6 +32,8 @@
   </div>
 </template>
 <script>
+  setup(assert_implements_animation_timeline);
+
   function inflate(t, template) {
     t.add_cleanup(() => main.replaceChildren());
     main.append(template.content.cloneNode(true));
@@ -59,7 +62,8 @@
       // work around a bug.
       await waitForNextFrame();
 
-      target.style.animation = 'anim 10s linear t1';
+      target.style.animation = 'anim 10s linear';
+      target.style.animationTimeline = 't1';
       target.style.animationDelayStart = options.startDelay;
       target.style.animationDelayEnd = options.endDelay;
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html
index b9908b10ea4..74da8850d46 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html
@@ -25,6 +25,8 @@
 </style>
 <main id=main></main>
 <script>
+  setup(assert_implements_animation_timeline);
+
   function inflate(t, template) {
     t.add_cleanup(() => main.replaceChildren());
     main.append(template.content.cloneNode(true));
@@ -46,7 +48,8 @@
       view-timeline-name: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -98,7 +101,8 @@
       view-timeline-name: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -129,7 +133,8 @@
       view-timeline-name: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -156,7 +161,8 @@
       view-timeline-name: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html
index 1f33c6642fa..a95086b62bf 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { z-index: 0; }
@@ -23,6 +24,8 @@
 </style>
 <main id=main></main>
 <script>
+  setup(assert_implements_animation_timeline);
+
   function inflate(t, template) {
     t.add_cleanup(() => main.replaceChildren());
     main.append(template.content.cloneNode(true));
@@ -89,7 +92,8 @@
     #target {
       view-timeline: t1;
       view-timeline-inset: 10px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical>
@@ -112,7 +116,8 @@
     #target {
       view-timeline: t1;
       view-timeline-inset: 10px 20px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical>
@@ -136,7 +141,8 @@
       font-size: 10px;
       view-timeline: t1;
       view-timeline-inset: 10px 2em;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical>
@@ -160,7 +166,8 @@
       font-size: 10px;
       view-timeline: t1;
       view-timeline-inset: calc(5px + max(1%, 5%)) 20%;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical>
@@ -183,7 +190,8 @@
     #target {
       view-timeline: t1;
       view-timeline-inset: -10px -20px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=vertical>
@@ -206,7 +214,8 @@
     #target {
       view-timeline: t1 horizontal;
       view-timeline-inset: 10px 20px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -229,7 +238,8 @@
     #target {
       view-timeline: t1 block;
       view-timeline-inset: 10px 20px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -252,7 +262,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: 10px 20px;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -278,7 +289,8 @@
     #target {
       view-timeline: t1 block;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -305,7 +317,8 @@
     #target {
       view-timeline: t1 block;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -332,7 +345,8 @@
     #target {
       view-timeline: t1 block;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -359,7 +373,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -386,7 +401,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -413,7 +429,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -440,7 +457,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -468,7 +486,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -496,7 +515,8 @@
     #target {
       view-timeline: t1 inline;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -522,7 +542,8 @@
     #target {
       view-timeline: t1 vertical;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -549,7 +570,8 @@
     #target {
       view-timeline: t1 vertical;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -577,7 +599,8 @@
     #target {
       view-timeline: t1 vertical;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -603,7 +626,8 @@
     #target {
       view-timeline: t1 horizontal;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -630,7 +654,8 @@
     #target {
       view-timeline: t1 horizontal;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -657,7 +682,8 @@
     #target {
       view-timeline: t1 horizontal;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -684,7 +710,8 @@
     #target {
       view-timeline: t1 horizontal;
       view-timeline-inset: auto auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
@@ -711,7 +738,8 @@
     #target {
       view-timeline: t1;
       view-timeline-inset: 10% auto;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html
index 2dd8cf9a6fd..c1797c7ba1c 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { z-index: 0; }
@@ -33,7 +34,8 @@
     #target {
       height: 0px;
       view-timeline: t1;
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -60,7 +62,8 @@
       view-timeline: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -88,7 +91,8 @@
       view-timeline: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -119,7 +123,8 @@
       view-timeline: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -150,7 +155,8 @@
       view-timeline: t1;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -186,7 +192,8 @@
       view-timeline: t2;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -225,7 +232,8 @@
       height: 50px;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
@@ -265,7 +273,8 @@
       height: 50px;
     }
     #target {
-      animation: anim 1s linear t1;
+      animation: anim 1s linear;
+      animation-timeline: t1;
     }
   </style>
   <div id=scroller class=scroller>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html
index cf327772d50..6627eeb9988 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html
@@ -5,6 +5,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
   @keyframes anim {
     from { z-index: 0; }
@@ -23,6 +24,8 @@
 </style>
 <main id=main></main>
 <script>
+  setup(assert_implements_animation_timeline);
+
   function inflate(t, template) {
     t.add_cleanup(() => main.replaceChildren());
     main.append(template.content.cloneNode(true));
@@ -42,7 +45,8 @@
     #target {
       view-timeline-name: t1, t2; /* Two items */
       view-timeline-axis: inline; /* One item */
-      animation: anim 1s linear t2;
+      animation: anim 1s linear;
+      animation-timeline: t2;
     }
   </style>
   <div id=scroller class=scroller>
@@ -74,7 +78,8 @@
     #target {
       view-timeline-name: t1, t2; /* Two items */
       view-timeline-inset: 100px; /* One item */
-      animation: anim 1s linear t2;
+      animation: anim 1s linear;
+      animation-timeline: t2;
     }
   </style>
   <div id=scroller class=scroller>
diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/supported-entry-types.tentative.html b/tests/wpt/web-platform-tests/soft-navigation-heuristics/supported-entry-types.tentative.html
new file mode 100644
index 00000000000..4ab408e10b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/soft-navigation-heuristics/supported-entry-types.tentative.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Soft navigations are a supported entry type</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  promise_test(async () => {
+    assert_true(PerformanceObserver.supportedEntryTypes.includes(
+      "soft-navigation"));
+  }, "Soft navigations are a supported entry type");
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.tentative.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.tentative.html
new file mode 100644
index 00000000000..923598bd273
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.tentative.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+  <script>
+    setup(() => assertSpeculationRulesIsSupported());
+
+    promise_test(async t => {
+      // The key used for storing a test result in the server.
+      const key = token();
+
+      // Open the test runner in a popup - it will prerender itself, record the
+      // test results, and send them back to this harness.
+      const url =
+        `resources/csp-script-src-inline-speculation-rules.html?key=${key}`;
+      window.open(url, '_blank', 'noopener');
+
+      // Wait until the test sends us the results.
+      const result = await nextValueFromServer(key);
+
+      assert_equals(result, "true", "initial document.prerendering");
+    }, 'Test if CSP script-src inline-speculation-rules permits inline speculationrules.');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-self.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-self.html
new file mode 100644
index 00000000000..f0f9784666b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-self.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+  <script>
+    setup(() => assertSpeculationRulesIsSupported());
+
+    promise_test(async t => {
+      // The key used for storing a test result in the server.
+      const key = token();
+
+      // Open the test runner in a popup - it will prerender itself, record the
+      // test results, and send them back to this harness.
+      const url =
+        `resources/csp-script-src-self.html?key=${key}`;
+      window.open(url, '_blank', 'noopener');
+
+      // Wait until the test sends us the results.
+      const result = await nextValueFromServer(key);
+
+      assert_equals(result, "blocked by script-src-elem", "csp block");
+    }, 'Test if CSP script-src self does not permit inline speculationrules.');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html
new file mode 100644
index 00000000000..f6925f59f45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+  <script>
+    setup(() => assertSpeculationRulesIsSupported());
+
+    promise_test(async t => {
+      // The key used for storing a test result in the server.
+      const key = token();
+
+      // Open the test runner in a popup - it will prerender itself, record the
+      // test results, and send them back to this harness.
+      const url =
+        `resources/csp-script-src-unsafe-inline.html?key=${key}`;
+      window.open(url, '_blank', 'noopener');
+
+      // Wait until the test sends us the results.
+      const result = await nextValueFromServer(key);
+
+      assert_equals(result, "true", "initial document.prerendering");
+    }, 'Test if CSP script-src unsafe-inline permits inline speculationrules.');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html
new file mode 100644
index 00000000000..febfbd01ba1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'inline-speculation-rules'">
+</head>
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="utils.js"></script>
+<script src="csp-script-src.js"></script>
+<script>
+  const params = new URLSearchParams(location.search);
+  writeValueToServer(params.get('key'), "csp is ignored unexpectedly");
+</script>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-self.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-self.html
new file mode 100644
index 00000000000..8dc382068a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-self.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<head>
+  <!-- disallow inline script -->
+  <meta http-equiv="Content-Security-Policy" content="script-src 'self'">
+</head>
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="utils.js"></script>
+<script src="csp-script-src.js"></script>
+<script>
+  const params = new URLSearchParams(location.search);
+  writeValueToServer(params.get('key'), "csp is ignored unexpectedly");
+</script>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html
new file mode 100644
index 00000000000..d2f010dc569
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+</head>
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="utils.js"></script>
+<script src="csp-script-src.js"></script>
diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src.js b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src.js
new file mode 100644
index 00000000000..52419f9b4c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src.js
@@ -0,0 +1,57 @@
+const params = new URLSearchParams(location.search);
+
+// Take a key used for storing a test result in the server.
+const key = params.get('key');
+
+// Speculation rules injection is not blocked in the csp-script-src 'self' test.
+const block = location.pathname.endsWith('csp-script-src-self.html');
+
+// The main test page (csp-script-src-*.html) in the parent directory) will load
+// this page only with the "key" parameter. This page will then try prerendering
+// itself with the "run-test" parameter. When "run-test" is in the URL we'll
+// actually start the test process and record the results to send back to the
+// main test page. We do this because the main test page cannot navigate itself
+// but it also cannot open a popup to a prerendered browsing context so the
+// prerender triggering and activation must both happen in this popup.
+const run_test = params.has('run-test');
+if (!run_test) {
+  // Generate a new stash key so we can communicate with the prerendered page
+  // about when to close the popup.
+  const done_key = token();
+  const url = new URL(document.URL);
+  url.searchParams.append('run-test', '');
+  url.searchParams.append('done-key', done_key);
+
+  if (block) {
+    // Observe `securitypolicyviolation` event that will be triggered by
+    // startPrerendering().
+    document.addEventListener('securitypolicyviolation', e => {
+      if (e.effectiveDirective != 'script-src' &&
+          e.effectiveDirective != 'script-src-elem') {
+        const message = 'unexpected effective directive: ' + e.effectiveDirective;
+        writeValueToServer(key, message).then(() => { window.close(); });
+      } else {
+        const message = 'blocked by ' + e.effectiveDirective;
+        writeValueToServer(key, message).then(() => { window.close(); });
+      }
+    });
+  }
+
+  startPrerendering(url.toString());
+
+  // Wait until the prerendered page signals us it's ready to close.
+  nextValueFromServer(done_key).then(() => {
+    window.close();
+  });
+} else {
+  if (block) {
+    writeValueToServer(key, 'unexpected prerendering');
+  } else {
+    // Tell the harness the initial document.prerendering value.
+    writeValueToServer(key, document.prerendering);
+
+    // Tell the prerendering initiating page test being finished.
+    const done_key = params.get('done-key');
+    writeValueToServer(done_key, "done");
+  }
+}
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
index b02ce60b7c2..9a8fbedc231 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
@@ -376,27 +376,6 @@
     hasProps(pc.getTransceivers(), []);
   };
 
-  const checkMsidNoTrackId = async t => {
-    const pc1 = new RTCPeerConnection();
-    const pc2 = new RTCPeerConnection();
-    t.add_cleanup(() => pc1.close());
-    t.add_cleanup(() => pc2.close());
-    const stream = await getNoiseStream({audio: true});
-    t.add_cleanup(() => stopTracks(stream));
-    const track = stream.getAudioTracks()[0];
-    pc1.addTrack(track, stream);
-    const offer = await pc1.createOffer();
-    await pc1.setLocalDescription(offer);
-    // Remove track-id from msid
-    // Fixate stream-id so that error message is consistent.
-    offer.sdp = offer.sdp.replace(/(a=msid:[^ \t]+).*\r\n/g,
-                                  "a=msid:fake-stream-id\r\n");
-    await pc2.setRemoteDescription(offer);
-    const answer = await pc2.createAnswer();
-    await pc1.setRemoteDescription(answer);
-    await pc2.setLocalDescription(answer);
-  };
-
   const checkNoMidOffer = async t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
@@ -2277,7 +2256,6 @@ const tests = [
   checkAddTransceiverWithTrack,
   checkAddTransceiverWithAddTrack,
   checkAddTransceiverWithDirection,
-  checkMsidNoTrackId,
   checkAddTransceiverWithSetRemoteOfferSending,
   checkAddTransceiverWithSetRemoteOfferNoSend,
   checkAddTransceiverBadKind,
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html b/tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html
index 9630919b808..5596446e001 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html
@@ -68,4 +68,16 @@ promise_test(async t => {
   assert_equals(trackevent.streams.length, 2);
 }, 'Description with two msid produces two streams');
 
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const ontrackPromise = addEventListenerPromise(t, pc, 'track');
+  await pc.setRemoteDescription({type: 'offer',
+                                 sdp: preamble + 'a=msid:foo\n'});
+  const trackevent = await ontrackPromise;
+  assert_equals(pc.getReceivers().length, 1);
+  assert_equals(trackevent.streams.length, 1);
+  assert_equals(trackevent.streams[0].id, 'foo');
+}, 'Description with msid foo but no track id is accepted');
+
 </script>