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
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-animations/parsing/animation-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-animations/parsing/animation-shorthand.html.ini
new file mode 100644
index 00000000000..8507b545441
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-animations/parsing/animation-shorthand.html.ini
@@ -0,0 +1,10 @@
+[animation-shorthand.html]
+  [e.style['animation'\] = "anim paused both reverse, 4 1s -3s cubic-bezier(0, -2, 1, 3)" should set animation-timeline]
+    expected: FAIL
+
+  [e.style['animation'\] = "4 1s -3s cubic-bezier(0, -2, 1, 3), anim paused both reverse" should set animation-timeline]
+    expected: FAIL
+
+  [e.style['animation'\] = "anim paused both reverse 4 1s -3s cubic-bezier(0, -2, 1, 3)" should set animation-timeline]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 6d548fe4825..51fbe6127a8 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,15 +312,6 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
@@ -330,6 +321,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     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 61682d248e2..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.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/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index dc2e45516de..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index dc2e45516de..385376c7321 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
deleted file mode 100644
index 5105aa291b2..00000000000
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[skip-another-top-level-browsing-context.html]
-  expected: TIMEOUT
-  [Autofocus elements queued in another top-level browsing context's documents should be skipped.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 42ebcc9d57e..88f4ddd0e9a 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,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.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-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 1b74d6e073d..0c89d5253df 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     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 0407f0cc2b7..9eb581fcf1f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..7a36937927c 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,5 +1,4 @@
 [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/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 e6268369cf5..b1aa0f1f1c4 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
@@ -1,5 +1,4 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
@@ -10,5 +9,5 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini
new file mode 100644
index 00000000000..b2afc243d35
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini
@@ -0,0 +1,7 @@
+[dynamic-imports-credentials-setTimeout.sub.html]
+  [Cross-origin dynamic import from setTimeout(string) from classic script (crossOrigin=use-credentials)]
+    expected: FAIL
+
+  [Cross-origin dynamic import from setTimeout(string) from module script (crossOrigin=use-credentials)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini
new file mode 100644
index 00000000000..e37b4ba8935
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini
@@ -0,0 +1,4 @@
+[dynamic-imports-credentials.sub.html]
+  [Cross-origin dynamic import from classic script (crossOrigin=use-credentials)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index dbec6f2c2ff..450c88bd32b 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index bf48285d7eb..3f45e524eb7 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -209,3 +209,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t5.5061018466949463e-1\t9.3139332532882690e-1\t3.8078314065933228e-1\t4.0883172587144900e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.8078314065933228e-1 at index of 28696.\n\tMax RelError of 4.0883172587144900e-1 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (50.42093089793805 dB) is not greater than or equal to 65.737. Got 50.42093089793805.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t5.3959959745407104e-1\t9.3139332532882690e-1\t3.9179372787475586e-1\t4.2065335580586616e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.9179372787475586e-1 at index of 28696.\n\tMax RelError of 4.2065335580586616e-1 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
index 70d9b449e7a..6f53dbb324f 100644
--- a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor move gets propagated to anchor poses]
     expected: FAIL
 
+  [Ensures free-floating anchor move gets propagated to anchor poses - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor move gets propagated to anchor poses - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
index 9230c90b6d2..71812051826 100644
--- a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
@@ -5,3 +5,15 @@
   [Ensures free-floating anchor creation with delayed success is handled correctly]
     expected: FAIL
 
+  [Ensures free-floating anchor creation with delayed failure is handled correctly - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed success is handled correctly - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed failure is handled correctly - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed success is handled correctly - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
index a35e5ba16b8..dbf744c58b5 100644
--- a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor creation failure is handled correctly]
     expected: FAIL
 
+  [Ensures free-floating anchor creation failure is handled correctly - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation failure is handled correctly - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
index 85cc42a65b0..829bbeca986 100644
--- a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor state changes get propagated]
     expected: FAIL
 
+  [Ensures free-floating anchor state changes get propagated - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor state changes get propagated - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_states.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_states.https.html.ini
index 4385dfb3f1f..4cd0644d4b6 100644
--- a/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_states.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/anchors/ar_anchor_states.https.html.ini
@@ -8,3 +8,21 @@
   [Anchor creation succeeds if the feature was requested]
     expected: FAIL
 
+  [Anchor creation succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was not requested - webgl]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Anchor creation succeeds if the feature was requested - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini
index 4718874f28d..c816936e7ad 100644
--- a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini
@@ -2,3 +2,6 @@
   [Tests requestSession accepts immersive-ar mode]
     expected: FAIL
 
+  [Tests requestSession accepts immersive-ar mode - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
index aab2d4efa19..20b54c1fd80 100644
--- a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
@@ -5,3 +5,12 @@
   [Tests environmentBlendMode for an AR device]
     expected: FAIL
 
+  [Tests environmentBlendMode for an AR device - webgl2]
+    expected: FAIL
+
+  [Tests environmentBlendMode for an AR device - webgl]
+    expected: FAIL
+
+  [Tests environmentBlendMode for a VR device - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_interactionMode.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_interactionMode.https.html.ini
index b03b63587e6..f71c95cd14d 100644
--- a/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_interactionMode.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/ar-module/xrSession_interactionMode.https.html.ini
@@ -14,3 +14,33 @@
   [Tests interactionMode for an VR_HMD_DEVICE]
     expected: FAIL
 
+  [Tests interactionMode for an AR_HMD_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_HMD_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for a INLINE_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for a INLINE_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_HMD_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_HMD_DEVICE - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_input_source_recreation.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_input_source_recreation.https.html.ini
index 976a3ad323d..257d72fcb2b 100644
--- a/tests/wpt/metadata-layout-2020/webxr/events_input_source_recreation.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/events_input_source_recreation.https.html.ini
@@ -2,3 +2,9 @@
   [Input sources are re-created when handedness or target ray mode changes]
     expected: FAIL
 
+  [Input sources are re-created when handedness or target ray mode changes - webgl2]
+    expected: FAIL
+
+  [Input sources are re-created when handedness or target ray mode changes - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_input_sources_change.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_input_sources_change.https.html.ini
new file mode 100644
index 00000000000..134434a757a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/events_input_sources_change.https.html.ini
@@ -0,0 +1,7 @@
+[events_input_sources_change.https.html]
+  [Transient input sources fire events in the right order - webgl2]
+    expected: FAIL
+
+  [Transient input sources fire events in the right order - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_immersive.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_immersive.https.html.ini
new file mode 100644
index 00000000000..7919292fc78
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_immersive.https.html.ini
@@ -0,0 +1,7 @@
+[events_referenceSpace_reset_immersive.https.html]
+  [XRSession resetpose from a device properly fires off the right events for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession resetpose from a device properly fires off the right events for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_inline.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_inline.https.html.ini
new file mode 100644
index 00000000000..192d8334c45
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/events_referenceSpace_reset_inline.https.html.ini
@@ -0,0 +1,7 @@
+[events_referenceSpace_reset_inline.https.html]
+  [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_session_select.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_session_select.https.html.ini
index 59dac282700..67c17917c7c 100644
--- a/tests/wpt/metadata-layout-2020/webxr/events_session_select.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/events_session_select.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSources primary input presses properly fires off the right events]
     expected: FAIL
 
+  [XRInputSources primary input presses properly fires off the right events - webgl]
+    expected: FAIL
+
+  [XRInputSources primary input presses properly fires off the right events - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_session_select_subframe.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_session_select_subframe.https.html.ini
index d2dbc3fef51..c93691a4b18 100644
--- a/tests/wpt/metadata-layout-2020/webxr/events_session_select_subframe.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/events_session_select_subframe.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures that an XRInputSources primary input being pressed and released in the space of a single frame properly fires off the right events]
     expected: FAIL
 
+  [Ensures that an XRInputSources primary input being pressed and released in the space of a single frame properly fires off the right events - webgl2]
+    expected: FAIL
+
+  [Ensures that an XRInputSources primary input being pressed and released in the space of a single frame properly fires off the right events - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/events_session_squeeze.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/events_session_squeeze.https.html.ini
index 9e8141bb04b..7353ed05b15 100644
--- a/tests/wpt/metadata-layout-2020/webxr/events_session_squeeze.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/events_session_squeeze.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSources primary input presses properly fires off the right events]
     expected: FAIL
 
+  [XRInputSources primary input presses properly fires off the right events - webgl]
+    expected: FAIL
+
+  [XRInputSources primary input presses properly fires off the right events - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/exclusive_requestFrame_nolayer.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/exclusive_requestFrame_nolayer.https.html.ini
new file mode 100644
index 00000000000..73074ad280d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/exclusive_requestFrame_nolayer.https.html.ini
@@ -0,0 +1,13 @@
+[exclusive_requestFrame_nolayer.https.html]
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for non immersive - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for immersive - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for non immersive - webgl]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
index 325a0bb6738..98916b3e3c8 100644
--- a/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
@@ -2,3 +2,9 @@
   [WebXR InputSource's gamepad gets disconnected when the input source is removed]
     expected: FAIL
 
+  [WebXR InputSource's gamepad gets disconnected when the input source is removed - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's gamepad gets disconnected when the input source is removed - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
index 3735666ae5e..4f884fa5a6e 100644
--- a/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
@@ -2,3 +2,9 @@
   [WebXR InputSource's gamepad properly registers input]
     expected: FAIL
 
+  [WebXR InputSource's gamepad properly registers input - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's gamepad properly registers input - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/getInputPose_handedness.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/getInputPose_handedness.https.html.ini
index 0f61faf25dc..960d17f9bc6 100644
--- a/tests/wpt/metadata-layout-2020/webxr/getInputPose_handedness.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/getInputPose_handedness.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSources properly communicate their handedness]
     expected: FAIL
 
+  [XRInputSources properly communicate their handedness - webgl2]
+    expected: FAIL
+
+  [XRInputSources properly communicate their handedness - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/getInputPose_pointer.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/getInputPose_pointer.https.html.ini
index c7ab709ce6d..671bc646408 100644
--- a/tests/wpt/metadata-layout-2020/webxr/getInputPose_pointer.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/getInputPose_pointer.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses]
     expected: FAIL
 
+  [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses - webgl2]
+    expected: FAIL
+
+  [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/getViewerPose_emulatedPosition.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/getViewerPose_emulatedPosition.https.html.ini
new file mode 100644
index 00000000000..381eaf4af19
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/getViewerPose_emulatedPosition.https.html.ini
@@ -0,0 +1,7 @@
+[getViewerPose_emulatedPosition.https.html]
+  [XRFrame getViewerPose has emulatedPosition set properly. - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose has emulatedPosition set properly. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
index b6c39009140..fc79b794724 100644
--- a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
@@ -8,3 +8,27 @@
   [Ensures transient input hit test source cancellation works when the session has ended]
     expected: FAIL
 
+  [Ensures hit test source cancellation works when the session has ended - webgl2]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended. - webgl2]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended. - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has not ended. - webgl]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has ended - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended - webgl2]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has not ended. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini
new file mode 100644
index 00000000000..e059dee0486
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini
@@ -0,0 +1,19 @@
+[ar_hittest_subscription_inputSources.https.html]
+  [Ensures subscription to hit test works with an XRSpace from input source - no move - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - 1 result - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - no results - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - no move - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - 1 result - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - no results - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
index 694dd586a5d..d6ee1407f95 100644
--- a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
@@ -11,3 +11,27 @@
   [Ensures subscription to hit test works with local-floor space]
     expected: FAIL
 
+  [Ensures subscription to hit test works with viewer space - straight up - no results - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight ahead - plane - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local-floor space - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local space - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight up - no results - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight ahead - plane - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local-floor space - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local space - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini
index c82ddf9b4af..39b45513a37 100644
--- a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini
@@ -8,3 +8,21 @@
   [Hit test subscription fails if the feature was requested but the session already ended]
     expected: FAIL
 
+  [Hit test subscription fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Hit test subscription succeeds if the feature was requested - webgl]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was not requested - webgl]
+    expected: FAIL
+
+  [Hit test subscription succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini
new file mode 100644
index 00000000000..11aadc90587
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini
@@ -0,0 +1,19 @@
+[ar_hittest_subscription_states_transient.https.html]
+  [Transient test subscription fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Transient hit test subscription fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Transient test subscription fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Transient hit test subscription succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
+  [Transient hit test subscription succeeds if the feature was requested - webgl]
+    expected: FAIL
+
+  [Transient hit test subscription fails if the feature was not requested - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
index 77ee3e16b32..5342452838c 100644
--- a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
@@ -8,3 +8,21 @@
   [Ensures subscription to transient hit test works with an XRSpace from input source - no move]
     expected: FAIL
 
+  [Ensures subscription to transient hit test works with an XRSpace from input source - no move - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - no results - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - no move - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - 1 result - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - 1 result - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - no results - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/navigator_xr_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/navigator_xr_sameObject.https.html.ini
index b9fb8d94210..a2898c6c4d3 100644
--- a/tests/wpt/metadata-layout-2020/webxr/navigator_xr_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/navigator_xr_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [Navigator.xr meets [SameObject\] requirement]
     expected: FAIL
 
+  [Navigator.xr meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [Navigator.xr meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
new file mode 100644
index 00000000000..2af21d4cacd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
@@ -0,0 +1,31 @@
+[render_state_update.https.html]
+  [updateRenderState handles appropriately XRRenderStateInit with no params - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately baseLayers created with different sessions - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately immersive sessions with specified inlineVerticalFieldOfView - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit params - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit params - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately ended sessions - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately ended sessions - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately immersive sessions with specified inlineVerticalFieldOfView - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately baseLayers created with different sessions - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit with no params - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_immersive.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_immersive.https.html.ini
index 2ae6711642c..4d184a33f10 100644
--- a/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_immersive.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_immersive.https.html.ini
@@ -2,3 +2,9 @@
   [inlineVerticalFieldOfView is set appropriately on immersively sessions]
     expected: FAIL
 
+  [inlineVerticalFieldOfView is set appropriately on immersively sessions - webgl2]
+    expected: FAIL
+
+  [inlineVerticalFieldOfView is set appropriately on immersively sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_inline.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_inline.https.html.ini
index d9762ab91bc..a23818dba3d 100644
--- a/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_inline.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/render_state_vertical_fov_inline.https.html.ini
@@ -2,3 +2,9 @@
   [inlineVerticalFieldOfView is set appropriately on inline sessions]
     expected: FAIL
 
+  [inlineVerticalFieldOfView is set appropriately on inline sessions - webgl2]
+    expected: FAIL
+
+  [inlineVerticalFieldOfView is set appropriately on inline sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
index 499ac075aee..815dab905d7 100644
--- a/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
@@ -5,3 +5,15 @@
   [An XR-compatible webglCanvasContext can be created]
     expected: FAIL
 
+  [Creating a webgl context with no device]
+    expected: FAIL
+
+  [An XR-compatible webgl2 context can be created]
+    expected: FAIL
+
+  [An XR-compatible webgl context can be created]
+    expected: FAIL
+
+  [Creating a webgl2 context with no device]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini
new file mode 100644
index 00000000000..9a0451e4aa4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini
@@ -0,0 +1,7 @@
+[webGLCanvasContext_makecompatible_contextlost.https.html]
+  [A lost webgl2 context should not be able to set xr compatibility]
+    expected: FAIL
+
+  [A lost webgl context should not be able to set xr compatibility]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
index efbea3de8fc..a26f359c2c2 100644
--- a/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
@@ -5,3 +5,15 @@
   [Verify promise from a non-reentrant to makeXRCompatible() is resolved]
     expected: FAIL
 
+  [Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl]
+    expected: FAIL
+
+  [Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl2]
+    expected: FAIL
+
+  [Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl]
+    expected: FAIL
+
+  [Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrBoundedReferenceSpace_updates.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrBoundedReferenceSpace_updates.https.html.ini
index 27f6c5ed7a2..4f2a1535b94 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrBoundedReferenceSpace_updates.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrBoundedReferenceSpace_updates.https.html.ini
@@ -1,5 +1,10 @@
 [xrBoundedReferenceSpace_updates.https.html]
-  expected: ERROR
   ['XRBoundedReferenceSpace updates properly when the changes are applied]
     expected: TIMEOUT
 
+  ['XRBoundedReferenceSpace updates properly when the changes are applied - webgl2]
+    expected: FAIL
+
+  ['XRBoundedReferenceSpace updates properly when the changes are applied - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrDevice_disconnect_ends.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrDevice_disconnect_ends.https.html.ini
index adfe53ea1b6..3688554e8d1 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrDevice_disconnect_ends.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrDevice_disconnect_ends.https.html.ini
@@ -1,4 +1,11 @@
 [xrDevice_disconnect_ends.https.html]
+  expected: TIMEOUT
   [Immersive session ends when device is disconnected]
     expected: FAIL
 
+  [Immersive session ends when device is disconnected - webgl2]
+    expected: NOTRUN
+
+  [Immersive session ends when device is disconnected - webgl]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_immersive.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_immersive.https.html.ini
index 1feed04bc79..cb0b0df067d 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_immersive.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_immersive.https.html.ini
@@ -8,3 +8,12 @@
   [Tests requestSession resolves when supported]
     expected: FAIL
 
+  [Tests requestSession accepts XRSessionInit dictionary - webgl2]
+    expected: FAIL
+
+  [Tests requestSession resolves when supported - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown optionalFeatures - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
index ad5d37bd599..4cb40f303a0 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
@@ -11,3 +11,15 @@
   [Tests requestSession accepts XRSessionInit dictionary with empty feature lists]
     expected: FAIL
 
+  [Tests requestSession accepts XRSessionInit dictionary with empty feature lists - webgl2]
+    expected: FAIL
+
+  [Tests requestSession accepts XRSessionInit dictionary - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown strings in optionalFeatures - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown objects in optionalFeatures - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrFrame_getPose.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrFrame_getPose.https.html.ini
index 13082ca9797..3e2b0a735e3 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrFrame_getPose.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrFrame_getPose.https.html.ini
@@ -5,3 +5,15 @@
   [XRFrame.getPose works for non-immersive sessions]
     expected: FAIL
 
+  [XRFrame.getPose works for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame.getPose works for immersive sessions - webgl]
+    expected: FAIL
+
+  [XRFrame.getPose works for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame.getPose works for non-immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrFrame_getViewerPose_getPose.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrFrame_getViewerPose_getPose.https.html.ini
index 176132f98c3..a1232ee62cc 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrFrame_getViewerPose_getPose.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrFrame_getViewerPose_getPose.https.html.ini
@@ -2,3 +2,6 @@
   [XRFrame getViewerPose(refSpace) matches getPose(viewer, refSpace).]
     expected: FAIL
 
+  [XRFrame getViewerPose(refSpace) matches getPose(viewer, refSpace). - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrFrame_lifetime.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrFrame_lifetime.https.html.ini
index e6867166ccd..495f0fb6c42 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrFrame_lifetime.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrFrame_lifetime.https.html.ini
@@ -5,3 +5,9 @@
   [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for immersive sessions]
     expected: FAIL
 
+  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for non-immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrFrame_session_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrFrame_session_sameObject.https.html.ini
index b6c20337194..4c6d7e3eb9d 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrFrame_session_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrFrame_session_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRFrame.session meets [SameObject\] requirement]
     expected: FAIL
 
+  [XRFrame.session meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRFrame.session meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_add_remove.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_add_remove.https.html.ini
index d6125717313..2ab1307e993 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_add_remove.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_add_remove.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSources can be properly added and removed from the session]
     expected: FAIL
 
+  [XRInputSources can be properly added and removed from the session - webgl2]
+    expected: FAIL
+
+  [XRInputSources can be properly added and removed from the session - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_emulatedPosition.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_emulatedPosition.https.html.ini
new file mode 100644
index 00000000000..6fb5da65d66
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_emulatedPosition.https.html.ini
@@ -0,0 +1,7 @@
+[xrInputSource_emulatedPosition.https.html]
+  [Poses from XRInputSource.gripSpace have emulatedPosition set properly - webgl]
+    expected: FAIL
+
+  [Poses from XRInputSource.gripSpace have emulatedPosition set properly - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_profiles.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_profiles.https.html.ini
index 3e2806dfae7..2113d1398d7 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_profiles.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_profiles.https.html.ini
@@ -2,3 +2,9 @@
   [WebXR InputSource's profiles list can be set]
     expected: FAIL
 
+  [WebXR InputSource's profiles list can be set - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's profiles list can be set - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_sameObject.https.html.ini
index 980f9d31c32..ff587bf454e 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrInputSource_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrInputSource_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRInputSource attributes meet [SameObject\] requirement]
     expected: FAIL
 
+  [XRInputSource attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRInputSource attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrPose_transform_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrPose_transform_sameObject.https.html.ini
index 3e442625aa8..d8f59ae0c4f 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrPose_transform_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrPose_transform_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRPose.transform meets [SameObject\] requirement]
     expected: FAIL
 
+  [XRPose.transform meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [XRPose.transform meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset.https.html.ini
index 8ba221772e5..0b2ff688fcc 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset.https.html.ini
@@ -2,3 +2,9 @@
   [Updating XRReferenceSpace origin offset updates view and input matrices.]
     expected: FAIL
 
+  [Updating XRReferenceSpace origin offset updates view and input matrices. - webgl2]
+    expected: FAIL
+
+  [Updating XRReferenceSpace origin offset updates view and input matrices. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
index 21b3815f4da..72f0557799c 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
@@ -1,5 +1,10 @@
 [xrReferenceSpace_originOffsetBounded.https.html]
-  expected: ERROR
   [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry.]
     expected: TIMEOUT
 
+  [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry. - webgl]
+    expected: FAIL
+
+  [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini
index dd44bffa639..9169ed4facb 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini
@@ -2,3 +2,9 @@
   [Creating XRReferenceSpace origin offset off of `viewer` space works.]
     expected: FAIL
 
+  [Creating XRReferenceSpace origin offset off of `viewer` space works. - webgl2]
+    expected: FAIL
+
+  [Creating XRReferenceSpace origin offset off of `viewer` space works. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_relationships.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_relationships.https.html.ini
index 293a38132c2..8c86b7973b2 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_relationships.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrReferenceSpace_relationships.https.html.ini
@@ -2,3 +2,9 @@
   [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other]
     expected: FAIL
 
+  [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other - webgl2]
+    expected: FAIL
+
+  [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_constructor.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_constructor.https.html.ini
index 637e266aaa2..4fc36ae4d8f 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_constructor.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_constructor.https.html.ini
@@ -2,3 +2,9 @@
   [XRRigidTransform constructor works]
     expected: FAIL
 
+  [XRRigidTransform constructor works - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform constructor works - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_inverse.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_inverse.https.html.ini
index 8c7f90b61e7..c62f9aa6185 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_inverse.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_inverse.https.html.ini
@@ -2,3 +2,9 @@
   [XRRigidTransform inverse works]
     expected: FAIL
 
+  [XRRigidTransform inverse works - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform inverse works - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_sameObject.https.html.ini
index 92751e2c79f..508101511ce 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrRigidTransform_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRRigidTransform position and orientation meet [SameObject\] requirements]
     expected: FAIL
 
+  [XRRigidTransform position and orientation meet [SameObject\] requirements - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform position and orientation meet [SameObject\] requirements - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame.https.html.ini
index e43f56bd74e..d6e11deb8dc 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame.https.html.ini
@@ -5,3 +5,9 @@
   [XRSession requestAnimationFrame callbacks can be unregistered with cancelAnimationFrame for immersive sessions]
     expected: FAIL
 
+  [XRSession requestAnimationFrame callbacks can be unregistered with cancelAnimationFrame for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame callbacks can be unregistered with cancelAnimationFrame for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
index 603023c9992..71facd8faf2 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
@@ -1,7 +1,20 @@
 [xrSession_cancelAnimationFrame_invalidhandle.https.html]
+  expected: TIMEOUT
   [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on immersive testSession]
     expected: FAIL
 
   [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession]
     expected: FAIL
 
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession - webgl2]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession - webgl]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on immersive testSession - webgl2]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on immersive testSession - webgl]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_end.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_end.https.html.ini
index 4d09e769ae8..e34ae7b4530 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_end.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_end.https.html.ini
@@ -5,3 +5,9 @@
   [end event fires when immersive session ends]
     expected: FAIL
 
+  [end event fires when non-immersive session ends - webgl2]
+    expected: FAIL
+
+  [end event fires when immersive session ends - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_input_events_end.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_input_events_end.https.html.ini
new file mode 100644
index 00000000000..081b724d3b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_input_events_end.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_input_events_end.https.html]
+  [Calling end during an input callback stops processing at the right time - webgl]
+    expected: FAIL
+
+  [Calling end during an input callback stops processing at the right time - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini
index de062c9f543..9527169692c 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini
@@ -5,3 +5,9 @@
   [XRSession requestAnimationFrame calls the provided callback for an immersive session]
     expected: FAIL
 
+  [XRSession requestAnimationFrame calls the provided callback for an immersive session - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame calls the provided callback a non-immersive session - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini
index d64bcd941e3..716fc2ac8c4 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini
@@ -2,3 +2,6 @@
   [RequestAnimationFrame resolves with good data]
     expected: FAIL
 
+  [RequestAnimationFrame resolves with good data - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
index 5ee23ba9713..0efbeb7929f 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
@@ -5,3 +5,9 @@
   [XRFrame getViewerPose updates on the next frame for immersive sessions]
     expected: FAIL
 
+  [XRFrame getViewerPose updates on the next frame for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini
index 85fce01757f..b22bb26a31b 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini
@@ -5,3 +5,15 @@
   [XRFrame getViewerPose updates on the next frame for non-immersive]
     expected: FAIL
 
+  [XRFrame getViewerPose updates on the next frame for non-immersive - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for non-immersive - webgl]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace.https.html.ini
new file mode 100644
index 00000000000..2e1ee6bf0df
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace.https.html.ini
@@ -0,0 +1,13 @@
+[xrSession_requestReferenceSpace.https.html]
+  [Immersive XRSession requestReferenceSpace returns expected objects - webgl2]
+    expected: FAIL
+
+  [Immersive XRSession requestReferenceSpace returns expected objects - webgl]
+    expected: FAIL
+
+  [Non-immersive XRSession requestReferenceSpace returns expected objects - webgl2]
+    expected: FAIL
+
+  [Non-immersive XRSession requestReferenceSpace returns expected objects - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace_features.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace_features.https.html.ini
index 84a5e1496a8..f47b387bca8 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace_features.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestReferenceSpace_features.https.html.ini
@@ -35,3 +35,39 @@
   [Immersive session supports viewer space by default]
     expected: FAIL
 
+  [Non-immersive session supports viewer space by default - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local-floor space when required - webgl2]
+    expected: FAIL
+
+  [Immersive session supports viewer space by default - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects unbounded space even when requested - webgl2]
+    expected: FAIL
+
+  [Immersive session rejects local-floor space if not requested - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local space by default - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects local space if not requested - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local-floor space when required - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects bounded-floor space even when requested - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local space when optional - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local-floor space when optional - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local space when required - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini
index df0dc8e6485..12fa56fa6c3 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini
@@ -5,3 +5,15 @@
   [Create mew session in end promise]
     expected: FAIL
 
+  [Create mew session in end promise - webgl2]
+    expected: FAIL
+
+  [Create mew session in end promise - webgl]
+    expected: FAIL
+
+  [Create new session in OnSessionEnded event - webgl2]
+    expected: FAIL
+
+  [Create new session in OnSessionEnded event - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_sameObject.https.html.ini
index 09170ad4d6a..49e1b9fd7ca 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRSession attributes meet [SameObject\] requirement]
     expected: FAIL
 
+  [XRSession attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRSession attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_viewer_referenceSpace.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_viewer_referenceSpace.https.html.ini
index b6af7d5f905..2630cae8812 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrSession_viewer_referenceSpace.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_viewer_referenceSpace.https.html.ini
@@ -5,3 +5,9 @@
   [Identity reference space provides correct poses for inline sessions]
     expected: FAIL
 
+  [Identity reference space provides correct poses for inline sessions - webgl2]
+    expected: FAIL
+
+  [Identity reference space provides correct poses for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_visibilityState.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_visibilityState.https.html.ini
new file mode 100644
index 00000000000..2fb311447c3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_visibilityState.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_visibilityState.https.html]
+  [Ensures that the XRSession's visibilityState is correctly reported and that the associated visibilitychange event fires. - webgl]
+    expected: FAIL
+
+  [Ensures that the XRSession's visibilityState is correctly reported and that the associated visibilitychange event fires. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
new file mode 100644
index 00000000000..4c68fc61aee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
@@ -0,0 +1,13 @@
+[xrStationaryReferenceSpace_floorlevel_updates.https.html]
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for immersive sessions - webgl2]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for immersive sessions - webgl]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrView_eyes.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrView_eyes.https.html.ini
index 77bf402064a..b45a8988e63 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrView_eyes.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrView_eyes.https.html.ini
@@ -5,3 +5,15 @@
   [XRView.eye is correct for immersive sessions]
     expected: FAIL
 
+  [XRView.eye is correct for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRView.eye is correct for non-immersive sessions - webgl]
+    expected: FAIL
+
+  [XRView.eye is correct for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRView.eye is correct for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrView_match.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrView_match.https.html.ini
index a767630fd30..b19131ceae5 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrView_match.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrView_match.https.html.ini
@@ -2,3 +2,9 @@
   [XRFrame contains the expected views]
     expected: FAIL
 
+  [XRFrame contains the expected views - webgl]
+    expected: FAIL
+
+  [XRFrame contains the expected views - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrView_oneframeupdate.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrView_oneframeupdate.https.html.ini
new file mode 100644
index 00000000000..400adbb18a9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrView_oneframeupdate.https.html.ini
@@ -0,0 +1,7 @@
+[xrView_oneframeupdate.https.html]
+  [XRView projection matrices update near and far depths on the next frame - webgl]
+    expected: FAIL
+
+  [XRView projection matrices update near and far depths on the next frame - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrView_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrView_sameObject.https.html.ini
index 0bb0534886b..6688e2b6f77 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrView_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrView_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRView attributes meet [SameObject\] requirement]
     expected: FAIL
 
+  [XRView attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [XRView attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrViewerPose_views_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrViewerPose_views_sameObject.https.html.ini
index 376386ed9ea..bfaddfc3833 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrViewerPose_views_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrViewerPose_views_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRViewerPose.views meets [SameObject\] requirement]
     expected: FAIL
 
+  [XRViewerPose.views meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRViewerPose.views meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrViewport_valid.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrViewport_valid.https.html.ini
index 7f6950b2cb0..6f0cbab613d 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrViewport_valid.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrViewport_valid.https.html.ini
@@ -2,3 +2,9 @@
   [XRViewport attributes are valid]
     expected: FAIL
 
+  [XRViewport attributes are valid - webgl]
+    expected: FAIL
+
+  [XRViewport attributes are valid - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_constructor.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_constructor.https.html.ini
new file mode 100644
index 00000000000..0de39606381
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_constructor.https.html.ini
@@ -0,0 +1,7 @@
+[xrWebGLLayer_constructor.https.html]
+  [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl2]
+    expected: FAIL
+
+  [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini
index bf7eed9a971..bf621b8aeef 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini
@@ -2,3 +2,9 @@
   [Ensure a WebGL layer's framebuffer can only be drawn to inside a XR frame]
     expected: FAIL
 
+  [Ensure a WebGL layer's framebuffer can only be drawn to inside a XR frame - webgl]
+    expected: FAIL
+
+  [Ensure a WebGL layer's framebuffer can only be drawn to inside a XR frame - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini
index d59b6c7434f..bf2fec04ff9 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini
@@ -2,3 +2,9 @@
   [XRWebGLLayer.framebuffer meets [SameObject\] requirement]
     expected: FAIL
 
+  [XRWebGLLayer.framebuffer meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer.framebuffer meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini
new file mode 100644
index 00000000000..8dec964c030
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini
@@ -0,0 +1,7 @@
+[xrWebGLLayer_framebuffer_scale.https.html]
+  [Ensure framebuffer scaling works as expected. - webgl]
+    expected: FAIL
+
+  [Ensure framebuffer scaling works as expected. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini
index 63c92e14304..fc2eb812709 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini
@@ -5,3 +5,15 @@
   [Ensure that the framebuffer given by the WebGL layer is opaque for non-immersive]
     expected: FAIL
 
+  [Ensure that the framebuffer given by the WebGL layer is opaque for non-immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for non-immersive - webgl]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini
new file mode 100644
index 00000000000..2f354a26b66
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini
@@ -0,0 +1,13 @@
+[xrWebGLLayer_opaque_framebuffer_stencil.https.html]
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for immersive - webgl]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for non-immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for non-immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_viewports.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_viewports.https.html.ini
index a489b6968a3..43649982b19 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_viewports.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xrWebGLLayer_viewports.https.html.ini
@@ -5,3 +5,15 @@
   [XRWebGLLayer reports a valid viewports for immersive sessions]
     expected: FAIL
 
+  [XRWebGLLayer reports a valid viewports for inline sessions - webgl]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for inline sessions - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/xr_viewport_scale.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xr_viewport_scale.https.html.ini
index 1741fe64785..e4403044a54 100644
--- a/tests/wpt/metadata-layout-2020/webxr/xr_viewport_scale.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/webxr/xr_viewport_scale.https.html.ini
@@ -1,5 +1,4 @@
 [xr_viewport_scale.https.html]
-  expected: ERROR
   [requestViewportScale valid viewport for inline session]
     expected: TIMEOUT
 
@@ -42,3 +41,87 @@
   [requestViewportScale applied next frame for immersive-vr session]
     expected: NOTRUN
 
+  [requestViewportScale valid viewport for inline session - webgl]
+    expected: FAIL
+
+  [recommendedViewportScale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for inline session - webgl]
+    expected: FAIL
+
+  [recommendedViewportScale for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale same frame for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for inline session - webgl2]
+    expected: FAIL
+
+  [recommendedViewportScale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for inline session - webgl2]
+    expected: FAIL
+
+  [recommendedViewportScale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for inline session - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
index c2c57aec558..dd49aa8e457 100644
--- a/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/semantics/run-a-worker/003.html.ini
@@ -1,4 +1,5 @@
 [003.html]
+  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
index daa7a8c41bc..10dda3a6659 100644
--- a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
     expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/xhr/cookies.http.html.ini b/tests/wpt/metadata-layout-2020/xhr/cookies.http.html.ini
new file mode 100644
index 00000000000..b3ed182ef25
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/xhr/cookies.http.html.ini
@@ -0,0 +1,4 @@
+[cookies.http.html]
+  [Basic non-cross-site cookie handling in XHR]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index a5910a9728d..f2da62c63b6 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -346196,19 +346196,27 @@
           []
          ],
          "check-cookie.py": [
-          "ec5fdc8cce4743fdd577f2209c00a4f37ed29d0e",
+          "90551e92c336d7923450c4f86b92ee338d996d56",
           []
          ],
          "credentials-iframe.sub.html": [
-          "8a0506ccec63b1c7f04b3818e980d0faea45f5eb",
+          "dbc14dffec5ffaa87de256d4601012cf6f139d01",
           []
          ],
          "delayed-modulescript.py": [
           "52dbfba445e18389a6ca13cbc5580b99d308ec2f",
           []
          ],
+         "dynamic-import-credentials-helper.sub.js": [
+          "7d9b024e752e11d17011133c2a0db4c239f6325b",
+          []
+         ],
          "dynamic-import-credentials-iframe.sub.html": [
-          "836ece62c5f601b91a9f255f4e6a646160fa7f48",
+          "88204ef00b7f05ebcf5ce189adaf4c9d431d8342",
+          []
+         ],
+         "dynamic-import-credentials-setTimeout-iframe.sub.html": [
+          "ffba14152700b2ecae815eaa5c90674638c6e288",
           []
          ],
          "fast-module.js": [
@@ -347283,11 +347291,11 @@
        },
        "support": {
         "syntax-error-in-setInterval.js": [
-         "3b42fd9bc92e64873dadd1dc15ddd1492320378c",
+         "afec114458b37a31f28bc6833a93dfb604ed2f84",
          []
         ],
         "syntax-error-in-setTimeout.js": [
-         "84eb4fc419925d70470cd5fb90befb97e4fcd4fe",
+         "427542b42ec39d555599894e175393b4f157918d",
          []
         ],
         "syntax-error.js": [
@@ -347295,11 +347303,11 @@
          []
         ],
         "undefined-variable-in-setInterval.js": [
-         "4aa7da8256c655694fc9db1a29025bcb7658697f",
+         "c2a017a2abfbe4bac9720139f83ae0775c2e9ecc",
          []
         ],
         "undefined-variable-in-setTimeout.js": [
-         "6350ab62ebf335ce7ce539b4e7065ef2ccd9f9ee",
+         "6fa54cda9fb847dce7d9cc5bd5078d07f0f3f25a",
          []
         ],
         "undefined-variable.js": [
@@ -355202,7 +355210,7 @@
       }
      },
      "tox.ini": [
-      "c38b9f2749c8c0f8b5820ca3c621e396d4a14c7e",
+      "266a6e8952e04d901206483614bda9097933bb8e",
       []
      ],
      "variants.js": [
@@ -359638,7 +359646,7 @@
       ],
       "tasks": {
        "test.yml": [
-        "4fa69e871bc19249d138531eaa9b7ccff458c582",
+        "578b769455b2afbae43fa1d6ad06f9f447435335",
         []
        ]
       },
@@ -359670,7 +359678,7 @@
         []
        ],
        "test_valid.py": [
-        "472f83f86a0fbb154502f48dfb5cfcc09cf8459f",
+        "4f6bcc2f0a8d4c404b423b6c60c28c9d28b8183a",
         []
        ]
       }
@@ -366160,7 +366168,7 @@
       ]
      },
      "requirements.txt": [
-      "7567e81ada590486bda300e484564700c373d11a",
+      "4893d7bd628949bdcbe6f8ba54daba1fd46bdf3e",
       []
      ],
      "requirements_android_webview.txt": [
@@ -371934,7 +371942,7 @@
       []
      ],
      "webxr_util.js": [
-      "aa45e257db678a67521d1f167d5ffdfd5d11eae2",
+      "fc4ca7d0d379cd81287723fcae0b6e70eeeaed22",
       []
      ]
     },
@@ -373441,6 +373449,10 @@
       "c592943b795596c4ebbd06c6ddfc79ed0fad2ec0",
       []
      ],
+     "get-set-cookie.py": [
+      "cdba642fca96f93a8d9d33a909682b4a1d2a7f04",
+      []
+     ],
      "gzip.py": [
       "17f142c4405f8e121a2468ffc380a9d56ef0822e",
       []
@@ -390773,7 +390785,7 @@
     ],
     "detached-iframe": {
      "clipboard-on-detached-iframe.https.html": [
-      "84fce80323624af9d1f431e85bc90e9d620174b0",
+      "5eb58e3213e33a0cf7150acbfaac8125bd0f61e5",
       [
        null,
        {}
@@ -399034,7 +399046,7 @@
        ]
       ],
       "animation-invalid.html": [
-       "c5790a3fafa4cbdb73126c98596506e3ed796310",
+       "dce5c29fdc88c9f0cfcfba48d1cf7608ed1a50dc",
        [
         null,
         {}
@@ -399104,7 +399116,7 @@
        ]
       ],
       "animation-shorthand.html": [
-       "2e3053e7afcc6eaa7cd2b3912b37b80295ea426d",
+       "b981ad3ad6893c3305183c965be973eb369331c5",
        [
         null,
         {}
@@ -480190,8 +480202,15 @@
            ]
           ]
          },
+         "dynamic-imports-credentials-setTimeout.sub.html": [
+          "189aa819fa53a5e701969429ff596863e7f0a84c",
+          [
+           null,
+           {}
+          ]
+         ],
          "dynamic-imports-credentials.sub.html": [
-          "b939a3ef1639db8027519ac004cd3197e254c0b9",
+          "910644531c22d3b3ce7479e58fe0e4d4ac4873ad",
           [
            null,
            {}
@@ -485252,14 +485271,14 @@
         ]
        ],
        "compile-error-cross-origin-setInterval.html": [
-        "14e9a8bc21532aa0446ca883daa9bf7bb0ec07af",
+        "c4028e650bf72b51d5fc3b594b16c253bdd59be6",
         [
          null,
          {}
         ]
        ],
        "compile-error-cross-origin-setTimeout.html": [
-        "7c46cc21a3e915764cc69fec39dade84070b8c42",
+        "1eebf82fbb0576b6ca955ca3ce7d518b7629e54a",
         [
          null,
          {}
@@ -485404,14 +485423,14 @@
         ]
        },
        "runtime-error-cross-origin-setInterval.html": [
-        "dd97566d70107a9713e05c838f63de07512a29e3",
+        "8b92f7d148d864842b5f1f19d1658979f280b39f",
         [
          null,
          {}
         ]
        ],
        "runtime-error-cross-origin-setTimeout.html": [
-        "6f9add5c9f59be752b2539414631126c4f33a4e5",
+        "2e1a9d23151804dd9635c19e1c1f5c5cbb05868f",
         [
          null,
          {}
@@ -513147,8 +513166,15 @@
        {}
       ]
      ],
+     "at-scroll-timeline-dynamic.tentative.html": [
+      "0722115593c4800aac8b613be936e5aa71d7d4c4",
+      [
+       null,
+       {}
+      ]
+     ],
      "at-scroll-timeline-element-offsets.html": [
-      "884f2ab5ed71f199603ca4fc1f0063528e6d19e8",
+      "0d591ea370778e9c9e54f707f6663db3d67e2587",
       [
        null,
        {}
@@ -513161,8 +513187,15 @@
        {}
       ]
      ],
+     "at-scroll-timeline-offset-invalidation.tentative.html": [
+      "5a560ad004cf292b9e1061a55b6cd1e286e42c4d",
+      [
+       null,
+       {}
+      ]
+     ],
      "at-scroll-timeline-orientation.html": [
-      "9bc49d284b85d5d18c2548a5b3dc7b82375ae507",
+      "345633cb927e12890476c33ad72043b511f48e97",
       [
        null,
        {}
@@ -513175,6 +513208,13 @@
        {}
       ]
      ],
+     "at-scroll-timeline-source-invalidation.tentative.html": [
+      "5f9561c4f5e104b31073d68d158adffc998fb252",
+      [
+       null,
+       {}
+      ]
+     ],
      "at-scroll-timeline-source.html": [
       "ed24d1865790a0000dcb9c5b208ac8be43f4144b",
       [
@@ -529810,7 +529850,7 @@
      ]
     ],
     "request-video-frame-callback-before-xr-session.https.html": [
-     "db662bd92899c49648e2487e5b5b798dd1be80b9",
+     "5277fbba92fbf63579ad4d4d5a2ca1dc2e356cd6",
      [
       null,
       {}
@@ -544572,35 +544612,35 @@
    "webxr": {
     "anchors": {
      "ar_anchor_freefloating_create_move.https.html": [
-      "af1898cac2eba38a8b769621708cbc95772c8a2b",
+      "87f7556007d42f65cf710970ab3f31a9f23f2fe6",
       [
        null,
        {}
       ]
      ],
      "ar_anchor_freefloating_delay_creation.https.html": [
-      "a2f438781813e963e829f224a4f79ee6aeb0d46f",
+      "686eacf8487a0002f03213770ee52680514cf59c",
       [
        null,
        {}
       ]
      ],
      "ar_anchor_freefloating_failure.https.html": [
-      "1625538d7542965f07a19eb534fdb31b1fb49082",
+      "dd03be0ad5bfd2198428ec150be44016f8917ad0",
       [
        null,
        {}
       ]
      ],
      "ar_anchor_freefloating_pause_resume_stop.https.html": [
-      "d3cc4c72dd2e88016abe7afabe3e5abd12b91019",
+      "6eb6bc76e64c963ab1512998c9262489f528d4f2",
       [
        null,
        {}
       ]
      ],
      "ar_anchor_states.https.html": [
-      "1872cf527b8b5ec1f25d044b8021f5b75ea9e4a6",
+      "83695498529a57caa98cc019f146b0f7df58da55",
       [
        null,
        {}
@@ -544652,14 +544692,14 @@
       ]
      ],
      "xrDevice_requestSession_immersive-ar.https.html": [
-      "1be56dd60ec81de8595bfca7e1fd39e6e9554b31",
+      "9984ee589d77c03496e3ba8cfe03d124d7a12ffc",
       [
        null,
        {}
       ]
      ],
      "xrSession_environmentBlendMode.https.html": [
-      "28f31da7827abbb197f5d37fe4b4fbf78158fdcc",
+      "beff66586c7119d15fdc6c6960d67b0023fdab53",
       [
        null,
        {}
@@ -544717,56 +544757,56 @@
      ]
     },
     "events_input_source_recreation.https.html": [
-     "ecb4b022bf09410cae44b4f5a3c71bc5c054181e",
+     "f7ef86c27321106eeaec50b91333bf4a5d3f8569",
      [
       null,
       {}
      ]
     ],
     "events_input_sources_change.https.html": [
-     "7c784c34479842148a3310b3f48d41990fcd4c34",
+     "b2a17d4e17ae03bf7ed51e07095aa36dcce033a3",
      [
       null,
       {}
      ]
     ],
     "events_referenceSpace_reset_immersive.https.html": [
-     "9643bf61c877ed50fa70e49015828e1b58ba7870",
+     "d12d8f77379010a57bbf69a1f9636e098854808a",
      [
       null,
       {}
      ]
     ],
     "events_referenceSpace_reset_inline.https.html": [
-     "b3abcc817bdf3e53c22284a14d03e31e1184e1a3",
+     "a445886a52daa7d4c27873292e66cf53291a5446",
      [
       null,
       {}
      ]
     ],
     "events_session_select.https.html": [
-     "f83d3c4f85421999d2480049dc4daa62acf07666",
+     "9b7402d2b65b37f21e8e7b5f0548f72a136b26f5",
      [
       null,
       {}
      ]
     ],
     "events_session_select_subframe.https.html": [
-     "96fa11713dd480b947b0c64b624dc6022cb7e8d0",
+     "b7615c3d0b42178ceb0e73ed168b0740a561f1bc",
      [
       null,
       {}
      ]
     ],
     "events_session_squeeze.https.html": [
-     "101f1dc7c886906a9f6bc9db8bba0e01fdcb4b73",
+     "122fe340a272f06e4cb7fdaaf0586e487d5e9998",
      [
       null,
       {}
      ]
     ],
     "exclusive_requestFrame_nolayer.https.html": [
-     "f76847a8769073bb4753702f32dd5c2ccc9d3532",
+     "c1c52f03746cf6aec64704b2ea9c6861bce08fd7",
      [
       null,
       {}
@@ -544792,14 +544832,14 @@
       ]
      ],
      "xrInputSource_gamepad_disconnect.https.html": [
-      "f69f943b5b58451f75a4f21ac149676066d1f799",
+      "bd69649d443ec856f77f1369c02dde5fe9152eee",
       [
        null,
        {}
       ]
      ],
      "xrInputSource_gamepad_input_registered.https.html": [
-      "1ff9dcf3b40c9a9c9f41fcc756f6bab1d3add7b3",
+      "28f308467118bac8e8ce1c48209eeaef3355a67d",
       [
        null,
        {}
@@ -544807,21 +544847,21 @@
      ]
     },
     "getInputPose_handedness.https.html": [
-     "c5c13fd08f4ec43cb33155c9ea92ad2177b6035e",
+     "9dbaf3b629d607d1d69a8d328b626dac6e62cb92",
      [
       null,
       {}
      ]
     ],
     "getInputPose_pointer.https.html": [
-     "30dbe4c5304a33d2131548d8c168c85225cd4b82",
+     "302dc399eee983f837ac69b6e7538a5d91e2fbca",
      [
       null,
       {}
      ]
     ],
     "getViewerPose_emulatedPosition.https.html": [
-     "acba79136a2925ef8c37ffe0a992c5a8da967976",
+     "7bffaf51a5fc0c7e027c8813becaee0105040c9e",
      [
       null,
       {}
@@ -544849,42 +544889,42 @@
     },
     "hit-test": {
      "ar_hittest_source_cancel.https.html": [
-      "66f22b1f0c4bede2543f10f8e2cbd6ff78d981d3",
+      "5e7381df02def47929c3792740a750168dbd046c",
       [
        null,
        {}
       ]
      ],
      "ar_hittest_subscription_inputSources.https.html": [
-      "d419055ab264276ab6c2c2f064ab11785440bdfe",
+      "dcd1d717883367fc8f01f49864621be913fb3850",
       [
        null,
        {}
       ]
      ],
      "ar_hittest_subscription_refSpaces.https.html": [
-      "f1c223ae7495390fdd2592f24e29869663cde931",
+      "465e16110394600c6ffaefdd23cb58958411bd02",
       [
        null,
        {}
       ]
      ],
      "ar_hittest_subscription_states_regular.https.html": [
-      "0678ff55cef90620e55bbd893ff2fc16e1a69252",
+      "9f5513fd1e73f034267e7171c95986dbcfbd54e2",
       [
        null,
        {}
       ]
      ],
      "ar_hittest_subscription_states_transient.https.html": [
-      "accd4bbf70f716faf9885ca6e3088ceab48493ef",
+      "e8a83a62a60929ec7f2625bc1bb522a13de94089",
       [
        null,
        {}
       ]
      ],
      "ar_hittest_subscription_transientInputSources.https.html": [
-      "e38e9c601b312f1207cce29bd64d588381275e3c",
+      "04df13240668c2513ccb01975259919cc95438e9",
       [
        null,
        {}
@@ -544936,49 +544976,49 @@
      ]
     ],
     "navigator_xr_sameObject.https.html": [
-     "56cd65c4e42dbe7bb9d652547e65f0491e05f831",
+     "2c3ea541a97301d4dfabe93bc71c8c6d3c50b5d1",
      [
       null,
       {}
      ]
     ],
     "render_state_update.https.html": [
-     "2f28d442ec9889ae9cf6d54b70e1c4c64b862a0f",
+     "3801a42947a792cc2e5b625dd7fc1efa9ac8da35",
      [
       null,
       {}
      ]
     ],
     "render_state_vertical_fov_immersive.https.html": [
-     "485438cabf6a633df42a0f94c04922e7274013e1",
+     "c09cd7c174d3b338a319141f7902023d36fe87fe",
      [
       null,
       {}
      ]
     ],
     "render_state_vertical_fov_inline.https.html": [
-     "8bf384f4f150b0b2e841b33d67e290011694c0f4",
+     "3b33fb15c31ef472d90e5a751b31ef1e27f6081b",
      [
       null,
       {}
      ]
     ],
     "webGLCanvasContext_create_xrcompatible.https.html": [
-     "2b3a1fccc45fb9f1fad9fc11f3641b313929116b",
+     "e3e83a50eeec07c090660a3cd2b83af41129123a",
      [
       null,
       {}
      ]
     ],
     "webGLCanvasContext_makecompatible_contextlost.https.html": [
-     "0e59807cb4c2999b5287cee56a117294b06b569f",
+     "354c61479277d4dbb8f200b53938597b5a58252f",
      [
       null,
       {}
      ]
     ],
     "webGLCanvasContext_makecompatible_reentrant.https.html": [
-     "f412c6fb2e00caae8eafe6407038acd26d592dd4",
+     "f54a878d45d08fd74f8d4341ad8d70e16c79a8ca",
      [
       null,
       {}
@@ -545006,14 +545046,14 @@
      ]
     ],
     "xrBoundedReferenceSpace_updates.https.html": [
-     "bb4cb2c4c4c787e9ce10aa096826b7887f171e02",
+     "c5f9b7f325a8203ea44d6ab863fd9263f08111bf",
      [
       null,
       {}
      ]
     ],
     "xrDevice_disconnect_ends.https.html": [
-     "ace64e8f41212d2e21a450ef6958bf2b7508a0da",
+     "644a4d68e4336b9b5532046a7f8e454483a36bb6",
      [
       null,
       {}
@@ -545041,7 +545081,7 @@
      ]
     ],
     "xrDevice_requestSession_immersive.https.html": [
-     "be0bb32995b86ee576c1e55414d7f7d81a1e0fc1",
+     "6ff88216708f62d22fba5ee9e1c860e6adf4642f",
      [
       null,
       {}
@@ -545076,7 +545116,7 @@
      ]
     ],
     "xrDevice_requestSession_optionalFeatures.https.html": [
-     "0071b81e828603c3765edc1fea3ff659b3e39452",
+     "f7737624a6ff48dcb03a9e8c307e61f7ee0f8f46",
      [
       null,
       {}
@@ -545090,105 +545130,105 @@
      ]
     ],
     "xrFrame_getPose.https.html": [
-     "1f3e3765df4e0a4319ea94842f2368e673948c4c",
+     "9cd7922f64f7d8be8c37b86d4b7f829283a4fed4",
      [
       null,
       {}
      ]
     ],
     "xrFrame_getViewerPose_getPose.https.html": [
-     "7d26983fc963c3ef4b00726d055f6b1a85d2d5f9",
+     "05cbf785237b7c7d2177976ea16b31a4060e3a1f",
      [
       null,
       {}
      ]
     ],
     "xrFrame_lifetime.https.html": [
-     "7c71f0af3dda960bb4c723e4cd8a1267db45a3e6",
+     "e457ef020fd81a77070541c77f7680c99485c556",
      [
       null,
       {}
      ]
     ],
     "xrFrame_session_sameObject.https.html": [
-     "cbbef68713b2991945827899407036a8a9205a14",
+     "d1d4beb16473fd123d24205c20fc5ade4a4c5cd0",
      [
       null,
       {}
      ]
     ],
     "xrInputSource_add_remove.https.html": [
-     "7764017910d2e5ada78febe954e9543aca89226b",
+     "00253311982cb1bb8841894633323ccd2cb56e38",
      [
       null,
       {}
      ]
     ],
     "xrInputSource_emulatedPosition.https.html": [
-     "2bc21ffe6c395de22a1aa840cb8a97e44a81eebe",
+     "8a4aec48a84b35383c3b3fae885c2a470e3d7b71",
      [
       null,
       {}
      ]
     ],
     "xrInputSource_profiles.https.html": [
-     "f55e682b67528c0e01406163490fa433a69d0592",
+     "de70c9058fee58e893085b962d6d591c9342ddf8",
      [
       null,
       {}
      ]
     ],
     "xrInputSource_sameObject.https.html": [
-     "305e5f9e0fccc8ef7a7d96d9e65da130b5f54239",
+     "999b4d82b6fa2abf10c76ff28fb5beb5f0c23e87",
      [
       null,
       {}
      ]
     ],
     "xrPose_transform_sameObject.https.html": [
-     "8e2239cff167cbb88b8702c4f3f413d447b5015e",
+     "9ea07fcd3bf223df7aa8b7e5959a6721e43d17b5",
      [
       null,
       {}
      ]
     ],
     "xrReferenceSpace_originOffset.https.html": [
-     "f6929f27af0ee73676c09be7de25afa2ed3d1fd4",
+     "d93f696a2dafa5e92bb55a14c65d74bc0216bb56",
      [
       null,
       {}
      ]
     ],
     "xrReferenceSpace_originOffsetBounded.https.html": [
-     "7ce4acafd35ef7ccad553cdf15ebd43a0e24d6c7",
+     "e03735360623b09e8719b2a581d15765af2bda81",
      [
       null,
       {}
      ]
     ],
     "xrReferenceSpace_originOffset_viewer.https.html": [
-     "5cd0f027266eee2a341e5b5d062227d2013ee67b",
+     "8a9fb344a385a3dea05774f9308f420a6d9923bf",
      [
       null,
       {}
      ]
     ],
     "xrReferenceSpace_relationships.https.html": [
-     "f97ca6639f7c991fa81ba6bab4560ad932270fbd",
+     "5b680fb86182f9343da05b1842b77e182ae748a4",
      [
       null,
       {}
      ]
     ],
     "xrRigidTransform_constructor.https.html": [
-     "5e055efc41b74fc968b097610e8deba38f2642df",
+     "fbea1c1ccb3f7c6d9e09b900624f07ddee327730",
      [
       null,
       {}
      ]
     ],
     "xrRigidTransform_inverse.https.html": [
-     "79acca9ae1abed3d6f3f1ebfce5d2b84eeb5b49e",
+     "cd5b34583b3a152879ad6d559a3c3098357630b8",
      [
       null,
       {}
@@ -545202,28 +545242,28 @@
      ]
     ],
     "xrRigidTransform_sameObject.https.html": [
-     "57c7ef1853ea24f9ce8f339e01ce9e929dcaf22f",
+     "8ff4f5c258b489793e89e75304a876dc28eae995",
      [
       null,
       {}
      ]
     ],
     "xrSession_cancelAnimationFrame.https.html": [
-     "6a294f21f06d98483d9278d08e50124d84779aad",
+     "2b3403fe461adf9d54bae468f210ea951af179c4",
      [
       null,
       {}
      ]
     ],
     "xrSession_cancelAnimationFrame_invalidhandle.https.html": [
-     "51a639b956c8f64c3f219df4fbde2e99160e9959",
+     "f036e3080fc213eb58455e7b17d91a99884f5083",
      [
       null,
       {}
      ]
     ],
     "xrSession_end.https.html": [
-     "e8c078ead9b7eaf4ed4312f14945ddfa07994614",
+     "dccc550be58b2e8c99ca7220f0c33e0ea9e4f3b5",
      [
       null,
       {}
@@ -545237,7 +545277,7 @@
      ]
     ],
     "xrSession_input_events_end.https.html": [
-     "636562dd6ec06c1d5d84d73b0b10ed38d7950ad5",
+     "b7f64617eefe1da28835c6d77d67b6b605778519",
      [
       null,
       {}
@@ -545251,56 +545291,56 @@
      ]
     ],
     "xrSession_requestAnimationFrame_callback_calls.https.html": [
-     "98231c8e9e70ea73a0b63785bb108362512f36e4",
+     "ee29b8794a7e5058688f7b3cb7681d19194eb1f8",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestAnimationFrame_data_valid.https.html": [
-     "760ff3dd657f9c56d01f6d952879bb20dd9a0e46",
+     "812c79c1d58f8b05b08d6ad47c513d990216e696",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestAnimationFrame_getViewerPose.https.html": [
-     "1b54f5f6ec147f8e1d3877bb28c5bb5c1ff104b6",
+     "68ad344320e04914917f7851b89262ae5c449c3b",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestAnimationFrame_timestamp.https.html": [
-     "32638894470d09bb865aaf0f14607433f30badea",
+     "ee6bb49432069aba7647d269d0576ab3453660b3",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestReferenceSpace.https.html": [
-     "b141d6d14d531649fdff091e176ed68ea7a363c2",
+     "b8765fd060f2e2bb5a08250d7b3170f312f07d85",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestReferenceSpace_features.https.html": [
-     "bdfd8c79cfae840038f642235eecc1be46a173cd",
+     "a20223fca3b1ae2d04441b83680107a3de45675a",
      [
       null,
       {}
      ]
     ],
     "xrSession_requestSessionDuringEnd.https.html": [
-     "2ab6cb7fbb5ede0523a143e042a459e6f3c5cde5",
+     "38133b616ad560711f4806990455d915c5baf95b",
      [
       null,
       {}
      ]
     ],
     "xrSession_sameObject.https.html": [
-     "66aeef81c50c36ff2fc50dcc7c45749f25605893",
+     "1795ee7a727d775e2a0655ffad1a073d9cb3d656",
      [
       null,
       {}
@@ -545314,119 +545354,119 @@
      ]
     ],
     "xrSession_viewer_referenceSpace.https.html": [
-     "fd6082bc3468f094953152d220fceafa083baf76",
+     "0098d4d918daf26342c8672c7e6699e2824581e3",
      [
       null,
       {}
      ]
     ],
     "xrSession_visibilityState.https.html": [
-     "2311792d0fd0e748bed709bfc90682682d44d9fd",
+     "12655f4be0bbb7604e68f8c906572c73b258b26a",
      [
       null,
       {}
      ]
     ],
     "xrStationaryReferenceSpace_floorlevel_updates.https.html": [
-     "967291609c0f05a9e457e3ffa2a77f601fa9d461",
+     "f1e907d6bbe6ebb86f27aa79b47bcd13e06f5022",
      [
       null,
       {}
      ]
     ],
     "xrView_eyes.https.html": [
-     "956edba98365d90eb180ad3c9697dae098bd25db",
+     "ac017cd80098334db482f2ad212e297df656251d",
      [
       null,
       {}
      ]
     ],
     "xrView_match.https.html": [
-     "4bb48826ae02d995e6d8763c04cefe64f7057274",
+     "2ef430734d6c894ea5e538d605de54fc70404e9a",
      [
       null,
       {}
      ]
     ],
     "xrView_oneframeupdate.https.html": [
-     "6671721e4c54059373e7a031132dddb41237094c",
+     "6c50f6f0c9d0225128f0cb328fe9a9277f45a9af",
      [
       null,
       {}
      ]
     ],
     "xrView_sameObject.https.html": [
-     "1213bcb1f1166a876ecb7e0d76260092525e3cd6",
+     "2defa722060c4f277688e404432b462b18bd2c2f",
      [
       null,
       {}
      ]
     ],
     "xrViewerPose_views_sameObject.https.html": [
-     "ec1ee6964f0ddcfc93e1be13ff0b4d09a2af59ec",
+     "af64111d8242d954acf29c123834833f12b16e96",
      [
       null,
       {}
      ]
     ],
     "xrViewport_valid.https.html": [
-     "1b7d982d596187f1381bee73eac2990900a37f8f",
+     "4588a3fbc2bda8739b286509a931907c256b3e7c",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_constructor.https.html": [
-     "e5b2335c2351ebda7aec3466a1583f1202e6e447",
+     "5796e1e0ef32d95b38a7cac5169c87320a17ee9e",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_framebuffer_draw.https.html": [
-     "dd40865e445aafce88f5941f4127236c36f01f2d",
+     "eb797cf93ae9e671e92f93f7758c2c4d835132a1",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_framebuffer_sameObject.https.html": [
-     "b0f637863b6aec46d36d3d1400219ce7aebb494a",
+     "75efc626d69e7d2d46366191f18112ccbc56f4f8",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_framebuffer_scale.https.html": [
-     "3faab3bf6bc849330afa331dd8789dac39c07eec",
+     "065fc3df4e4b6f0e4ac0ab5683daa3ad67223abf",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_opaque_framebuffer.https.html": [
-     "4d27a9155e6a63e70a4a0f22e16c51f10214d796",
+     "f0d63de501545f3626e3af10fab6994b662e7baa",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_opaque_framebuffer_stencil.https.html": [
-     "8e3e60cca058a0d8eb87f235169927309b528770",
+     "7eadd005ecf713ade2d67cb6c1308ed0493f93e0",
      [
       null,
       {}
      ]
     ],
     "xrWebGLLayer_viewports.https.html": [
-     "94a23dcdb427298722a989987a02f35a8d98d055",
+     "74cc86f231b02ccc5590c7eedf9ee94974828c5d",
      [
       null,
       {}
      ]
     ],
     "xr_viewport_scale.https.html": [
-     "baff125705fb2121c973845d89214e8bc435e115",
+     "86e6f40005f43d845a547cce3404d5814f4839e8",
      [
       null,
       {}
@@ -549442,6 +549482,13 @@
       {}
      ]
     ],
+    "cookies.http.html": [
+     "0ab71dd168ab6de239c55287db204f8f9f14a4ff",
+     [
+      null,
+      {}
+     ]
+    ],
     "cors-expose-star.sub.any.js": [
      "9d88046806c764a467b0ad59fec3c73d9f0fa14b",
      [
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
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-animations/parsing/animation-shorthand.html.ini b/tests/wpt/metadata/css/css-animations/parsing/animation-shorthand.html.ini
new file mode 100644
index 00000000000..8507b545441
--- /dev/null
+++ b/tests/wpt/metadata/css/css-animations/parsing/animation-shorthand.html.ini
@@ -0,0 +1,10 @@
+[animation-shorthand.html]
+  [e.style['animation'\] = "anim paused both reverse, 4 1s -3s cubic-bezier(0, -2, 1, 3)" should set animation-timeline]
+    expected: FAIL
+
+  [e.style['animation'\] = "4 1s -3s cubic-bezier(0, -2, 1, 3), anim paused both reverse" should set animation-timeline]
+    expected: FAIL
+
+  [e.style['animation'\] = "anim paused both reverse 4 1s -3s cubic-bezier(0, -2, 1, 3)" should set animation-timeline]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index c2ecc1870c5..e2ef19a26e6 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,6 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
@@ -330,6 +321,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     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 61682d248e2..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    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_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
deleted file mode 100644
index 5105aa291b2..00000000000
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[skip-another-top-level-browsing-context.html]
-  expected: TIMEOUT
-  [Autofocus elements queued in another top-level browsing context's documents should be skipped.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index fc37df7e3fa..2a166bb97b7 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,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.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-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3f7e3e9544f..4bc0524f105 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     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 d43f38b40cd..45d8be1c898 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..dc856a3d5a3 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,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.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/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 47d8a8e4cfe..a057142bbc5 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
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -14,5 +13,5 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
deleted file mode 100644
index bcd2fd0eab8..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[077.html]
-  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/credentials.sub.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/credentials.sub.html.ini
deleted file mode 100644
index 1d6ade5a09d..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/credentials.sub.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-
-[credentials.sub.html]
-  type: testharness
-  [Modules should be loaded with or without the credentials based on the same-origin-ness and the crossOrigin attribute]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini
new file mode 100644
index 00000000000..b2afc243d35
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html.ini
@@ -0,0 +1,7 @@
+[dynamic-imports-credentials-setTimeout.sub.html]
+  [Cross-origin dynamic import from setTimeout(string) from classic script (crossOrigin=use-credentials)]
+    expected: FAIL
+
+  [Cross-origin dynamic import from setTimeout(string) from module script (crossOrigin=use-credentials)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini
index d6db2e55af7..440eb981229 100644
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html.ini
@@ -2,3 +2,6 @@
   [Dynamic imports should be loaded with or without the credentials based on the same-origin-ness and the parent script's crossOrigin attribute]
     expected: FAIL
 
+  [Cross-origin dynamic import from classic script (crossOrigin=use-credentials)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 0cef5158fae..01f7b72cbe7 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,3 +4,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html.ini
index bf3a6c1905b..f64c116a17a 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html.ini
@@ -1,8 +1,5 @@
 [compile-error-cross-origin-setInterval.html]
   type: testharness
-  [window.onerror - compile error in cross-origin setInterval]
-    expected: FAIL
-
   [window.onerror - compile error in cross-origin setInterval (column)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html.ini
index f81f381d0ca..fc0aa9bbf20 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html.ini
@@ -1,8 +1,5 @@
 [compile-error-cross-origin-setTimeout.html]
   type: testharness
-  [window.onerror - compile error in cross-origin setTimeout]
-    expected: FAIL
-
   [window.onerror - compile error in cross-origin setTimeout (column)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html.ini
index 0bf31cb9ef1..cef30686860 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html.ini
@@ -1,8 +1,5 @@
 [runtime-error-cross-origin-setInterval.html]
   type: testharness
-  [window.onerror - runtime error in cross-origin setInterval]
-    expected: FAIL
-
   [window.onerror - runtime error in cross-origin setInterval (column)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html.ini
index 8b575d9b0d4..16d89f4b7f9 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html.ini
@@ -1,8 +1,5 @@
 [runtime-error-cross-origin-setTimeout.html]
   type: testharness
-  [window.onerror - runtime error in cross-origin setTimeout]
-    expected: FAIL
-
   [window.onerror - runtime error in cross-origin setTimeout (column)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index ca423a023ef..2482af37f3c 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -437,3 +437,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t5.5061018466949463e-1\t9.3139332532882690e-1\t3.8078314065933228e-1\t4.0883172587144900e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.8078314065933228e-1 at index of 28696.\n\tMax RelError of 4.0883172587144900e-1 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (50.42093089793805 dB) is not greater than or equal to 65.737. Got 50.42093089793805.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t5.3959959745407104e-1\t9.3139332532882690e-1\t3.9179372787475586e-1\t4.2065335580586616e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.9179372787475586e-1 at index of 28696.\n\tMax RelError of 4.2065335580586616e-1 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
index 70d9b449e7a..6f53dbb324f 100644
--- a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
+++ b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_create_move.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor move gets propagated to anchor poses]
     expected: FAIL
 
+  [Ensures free-floating anchor move gets propagated to anchor poses - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor move gets propagated to anchor poses - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
index 9230c90b6d2..71812051826 100644
--- a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
+++ b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html.ini
@@ -5,3 +5,15 @@
   [Ensures free-floating anchor creation with delayed success is handled correctly]
     expected: FAIL
 
+  [Ensures free-floating anchor creation with delayed failure is handled correctly - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed success is handled correctly - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed failure is handled correctly - webgl]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation with delayed success is handled correctly - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
index a35e5ba16b8..dbf744c58b5 100644
--- a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
+++ b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_failure.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor creation failure is handled correctly]
     expected: FAIL
 
+  [Ensures free-floating anchor creation failure is handled correctly - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor creation failure is handled correctly - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
index 85cc42a65b0..829bbeca986 100644
--- a/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
+++ b/tests/wpt/metadata/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures free-floating anchor state changes get propagated]
     expected: FAIL
 
+  [Ensures free-floating anchor state changes get propagated - webgl2]
+    expected: FAIL
+
+  [Ensures free-floating anchor state changes get propagated - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/anchors/ar_anchor_states.https.html.ini b/tests/wpt/metadata/webxr/anchors/ar_anchor_states.https.html.ini
index 4385dfb3f1f..4cd0644d4b6 100644
--- a/tests/wpt/metadata/webxr/anchors/ar_anchor_states.https.html.ini
+++ b/tests/wpt/metadata/webxr/anchors/ar_anchor_states.https.html.ini
@@ -8,3 +8,21 @@
   [Anchor creation succeeds if the feature was requested]
     expected: FAIL
 
+  [Anchor creation succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was not requested - webgl]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Anchor creation fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Anchor creation succeeds if the feature was requested - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini b/tests/wpt/metadata/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini
new file mode 100644
index 00000000000..ab95729970a
--- /dev/null
+++ b/tests/wpt/metadata/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html.ini
@@ -0,0 +1,4 @@
+[xrDevice_requestSession_immersive-ar.https.html]
+  [Tests requestSession accepts immersive-ar mode - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini b/tests/wpt/metadata/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
index 76f40939f59..cc2643b9902 100644
--- a/tests/wpt/metadata/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
+++ b/tests/wpt/metadata/webxr/ar-module/xrSession_environmentBlendMode.https.html.ini
@@ -2,3 +2,12 @@
   [Tests environmentBlendMode for an AR device]
     expected: FAIL
 
+  [Tests environmentBlendMode for an AR device - webgl2]
+    expected: FAIL
+
+  [Tests environmentBlendMode for an AR device - webgl]
+    expected: FAIL
+
+  [Tests environmentBlendMode for a VR device - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/ar-module/xrSession_interactionMode.https.html.ini b/tests/wpt/metadata/webxr/ar-module/xrSession_interactionMode.https.html.ini
index b03b63587e6..f71c95cd14d 100644
--- a/tests/wpt/metadata/webxr/ar-module/xrSession_interactionMode.https.html.ini
+++ b/tests/wpt/metadata/webxr/ar-module/xrSession_interactionMode.https.html.ini
@@ -14,3 +14,33 @@
   [Tests interactionMode for an VR_HMD_DEVICE]
     expected: FAIL
 
+  [Tests interactionMode for an AR_HMD_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_HMD_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for a INLINE_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for a INLINE_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_SCREEN_DEVICE - webgl]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_SCREEN_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an AR_HMD_DEVICE - webgl2]
+    expected: FAIL
+
+  [Tests interactionMode for an VR_HMD_DEVICE - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_input_source_recreation.https.html.ini b/tests/wpt/metadata/webxr/events_input_source_recreation.https.html.ini
new file mode 100644
index 00000000000..84dd98f469b
--- /dev/null
+++ b/tests/wpt/metadata/webxr/events_input_source_recreation.https.html.ini
@@ -0,0 +1,7 @@
+[events_input_source_recreation.https.html]
+  [Input sources are re-created when handedness or target ray mode changes - webgl2]
+    expected: FAIL
+
+  [Input sources are re-created when handedness or target ray mode changes - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_input_sources_change.https.html.ini b/tests/wpt/metadata/webxr/events_input_sources_change.https.html.ini
index 74eb9b449ba..e563d84dbc0 100644
--- a/tests/wpt/metadata/webxr/events_input_sources_change.https.html.ini
+++ b/tests/wpt/metadata/webxr/events_input_sources_change.https.html.ini
@@ -2,3 +2,9 @@
   [Transient input sources fire events in the right order]
     expected: FAIL
 
+  [Transient input sources fire events in the right order - webgl2]
+    expected: FAIL
+
+  [Transient input sources fire events in the right order - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_referenceSpace_reset_immersive.https.html.ini b/tests/wpt/metadata/webxr/events_referenceSpace_reset_immersive.https.html.ini
index 1433a6309d5..4dec49a9720 100644
--- a/tests/wpt/metadata/webxr/events_referenceSpace_reset_immersive.https.html.ini
+++ b/tests/wpt/metadata/webxr/events_referenceSpace_reset_immersive.https.html.ini
@@ -2,3 +2,9 @@
   [XRSession resetpose from a device properly fires off the right events for immersive sessions]
     expected: FAIL
 
+  [XRSession resetpose from a device properly fires off the right events for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession resetpose from a device properly fires off the right events for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_referenceSpace_reset_inline.https.html.ini b/tests/wpt/metadata/webxr/events_referenceSpace_reset_inline.https.html.ini
index 94f78bccd2b..ede896bb8c1 100644
--- a/tests/wpt/metadata/webxr/events_referenceSpace_reset_inline.https.html.ini
+++ b/tests/wpt/metadata/webxr/events_referenceSpace_reset_inline.https.html.ini
@@ -2,3 +2,9 @@
   [XRSession resetpose from a device properly fires off the right events for non-immersive sessions]
     expected: FAIL
 
+  [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_session_select.https.html.ini b/tests/wpt/metadata/webxr/events_session_select.https.html.ini
new file mode 100644
index 00000000000..94271b68e1b
--- /dev/null
+++ b/tests/wpt/metadata/webxr/events_session_select.https.html.ini
@@ -0,0 +1,7 @@
+[events_session_select.https.html]
+  [XRInputSources primary input presses properly fires off the right events - webgl]
+    expected: FAIL
+
+  [XRInputSources primary input presses properly fires off the right events - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_session_select_subframe.https.html.ini b/tests/wpt/metadata/webxr/events_session_select_subframe.https.html.ini
new file mode 100644
index 00000000000..a7b8b679313
--- /dev/null
+++ b/tests/wpt/metadata/webxr/events_session_select_subframe.https.html.ini
@@ -0,0 +1,7 @@
+[events_session_select_subframe.https.html]
+  [Ensures that an XRInputSources primary input being pressed and released in the space of a single frame properly fires off the right events - webgl2]
+    expected: FAIL
+
+  [Ensures that an XRInputSources primary input being pressed and released in the space of a single frame properly fires off the right events - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini b/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
index 63b20530a3f..a33f8c47bd6 100644
--- a/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
+++ b/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
@@ -1,5 +1,10 @@
 [events_session_squeeze.https.html]
-  expected: ERROR
   [XRInputSources primary input presses properly fires off the right events]
     expected: TIMEOUT
 
+  [XRInputSources primary input presses properly fires off the right events - webgl]
+    expected: FAIL
+
+  [XRInputSources primary input presses properly fires off the right events - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/exclusive_requestFrame_nolayer.https.html.ini b/tests/wpt/metadata/webxr/exclusive_requestFrame_nolayer.https.html.ini
index 19dcddf4665..a308e779858 100644
--- a/tests/wpt/metadata/webxr/exclusive_requestFrame_nolayer.https.html.ini
+++ b/tests/wpt/metadata/webxr/exclusive_requestFrame_nolayer.https.html.ini
@@ -5,3 +5,15 @@
   [XRSession requestAnimationFrame must fail if the session has no baseLayer for non immersive]
     expected: FAIL
 
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for non immersive - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for immersive - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for non immersive - webgl]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame must fail if the session has no baseLayer for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini b/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
index 325a0bb6738..98916b3e3c8 100644
--- a/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
+++ b/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html.ini
@@ -2,3 +2,9 @@
   [WebXR InputSource's gamepad gets disconnected when the input source is removed]
     expected: FAIL
 
+  [WebXR InputSource's gamepad gets disconnected when the input source is removed - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's gamepad gets disconnected when the input source is removed - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini b/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
index 21d7102822a..4f884fa5a6e 100644
--- a/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
+++ b/tests/wpt/metadata/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html.ini
@@ -1,5 +1,10 @@
 [xrInputSource_gamepad_input_registered.https.html]
-  expected: ERROR
   [WebXR InputSource's gamepad properly registers input]
     expected: FAIL
 
+  [WebXR InputSource's gamepad properly registers input - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's gamepad properly registers input - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/getInputPose_handedness.https.html.ini b/tests/wpt/metadata/webxr/getInputPose_handedness.https.html.ini
new file mode 100644
index 00000000000..e7911b8f5d2
--- /dev/null
+++ b/tests/wpt/metadata/webxr/getInputPose_handedness.https.html.ini
@@ -0,0 +1,7 @@
+[getInputPose_handedness.https.html]
+  [XRInputSources properly communicate their handedness - webgl2]
+    expected: FAIL
+
+  [XRInputSources properly communicate their handedness - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini b/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini
new file mode 100644
index 00000000000..720dfaf8323
--- /dev/null
+++ b/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini
@@ -0,0 +1,7 @@
+[getInputPose_pointer.https.html]
+  [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses - webgl2]
+    expected: FAIL
+
+  [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/getViewerPose_emulatedPosition.https.html.ini b/tests/wpt/metadata/webxr/getViewerPose_emulatedPosition.https.html.ini
index 66dc95ea0de..153cc3476a4 100644
--- a/tests/wpt/metadata/webxr/getViewerPose_emulatedPosition.https.html.ini
+++ b/tests/wpt/metadata/webxr/getViewerPose_emulatedPosition.https.html.ini
@@ -2,3 +2,9 @@
   [XRFrame getViewerPose has emulatedPosition set properly.]
     expected: FAIL
 
+  [XRFrame getViewerPose has emulatedPosition set properly. - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose has emulatedPosition set properly. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
index b6c39009140..fc79b794724 100644
--- a/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
@@ -8,3 +8,27 @@
   [Ensures transient input hit test source cancellation works when the session has ended]
     expected: FAIL
 
+  [Ensures hit test source cancellation works when the session has ended - webgl2]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended. - webgl2]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended. - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has not ended. - webgl]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has ended - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended - webgl2]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended - webgl]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has not ended. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini
index 23f35a787af..3aa61418c92 100644
--- a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_inputSources.https.html.ini
@@ -8,3 +8,21 @@
   [Ensures subscription to hit test works with an XRSpace from input source - no move]
     expected: FAIL
 
+  [Ensures subscription to hit test works with an XRSpace from input source - no move - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - 1 result - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - no results - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - no move - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - 1 result - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with an XRSpace from input source - after move - no results - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
index eca12b3d24c..049f3a5fecf 100644
--- a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html.ini
@@ -8,3 +8,27 @@
   [Ensures subscription to hit test works with local-floor space]
     expected: FAIL
 
+  [Ensures subscription to hit test works with viewer space - straight up - no results - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight ahead - plane - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local-floor space - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local space - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight up - no results - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with viewer space - straight ahead - plane - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local-floor space - webgl]
+    expected: FAIL
+
+  [Ensures subscription to hit test works with local space - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini
new file mode 100644
index 00000000000..75c0cd74616
--- /dev/null
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_regular.https.html.ini
@@ -0,0 +1,19 @@
+[ar_hittest_subscription_states_regular.https.html]
+  [Hit test subscription fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Hit test subscription succeeds if the feature was requested - webgl]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Hit test subscription fails if the feature was not requested - webgl]
+    expected: FAIL
+
+  [Hit test subscription succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini
index d7ac3ac5369..7cb49bb7bb3 100644
--- a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_states_transient.https.html.ini
@@ -8,3 +8,21 @@
   [Transient hit test subscription fails if the feature was not requested]
     expected: FAIL
 
+  [Transient test subscription fails if the feature was requested but the session already ended - webgl]
+    expected: FAIL
+
+  [Transient hit test subscription fails if the feature was not requested - webgl2]
+    expected: FAIL
+
+  [Transient test subscription fails if the feature was requested but the session already ended - webgl2]
+    expected: FAIL
+
+  [Transient hit test subscription succeeds if the feature was requested - webgl2]
+    expected: FAIL
+
+  [Transient hit test subscription succeeds if the feature was requested - webgl]
+    expected: FAIL
+
+  [Transient hit test subscription fails if the feature was not requested - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
index 95708a29336..0c25fb9313e 100644
--- a/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html.ini
@@ -1,5 +1,4 @@
 [ar_hittest_subscription_transientInputSources.https.html]
-  expected: ERROR
   [Ensures subscription to transient hit test works with an XRSpace from input source - after move - 1 result]
     expected: NOTRUN
 
@@ -9,3 +8,21 @@
   [Ensures subscription to transient hit test works with an XRSpace from input source - no move]
     expected: TIMEOUT
 
+  [Ensures subscription to transient hit test works with an XRSpace from input source - no move - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - no results - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - no move - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - 1 result - webgl2]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - 1 result - webgl]
+    expected: FAIL
+
+  [Ensures subscription to transient hit test works with an XRSpace from input source - after move - no results - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/navigator_xr_sameObject.https.html.ini b/tests/wpt/metadata/webxr/navigator_xr_sameObject.https.html.ini
new file mode 100644
index 00000000000..8f3df8c5bb3
--- /dev/null
+++ b/tests/wpt/metadata/webxr/navigator_xr_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[navigator_xr_sameObject.https.html]
+  [Navigator.xr meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [Navigator.xr meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/render_state_update.https.html.ini b/tests/wpt/metadata/webxr/render_state_update.https.html.ini
new file mode 100644
index 00000000000..2af21d4cacd
--- /dev/null
+++ b/tests/wpt/metadata/webxr/render_state_update.https.html.ini
@@ -0,0 +1,31 @@
+[render_state_update.https.html]
+  [updateRenderState handles appropriately XRRenderStateInit with no params - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately baseLayers created with different sessions - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately immersive sessions with specified inlineVerticalFieldOfView - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit params - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit params - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately ended sessions - webgl2]
+    expected: FAIL
+
+  [updateRenderState handles appropriately ended sessions - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately immersive sessions with specified inlineVerticalFieldOfView - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately baseLayers created with different sessions - webgl]
+    expected: FAIL
+
+  [updateRenderState handles appropriately XRRenderStateInit with no params - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/render_state_vertical_fov_immersive.https.html.ini b/tests/wpt/metadata/webxr/render_state_vertical_fov_immersive.https.html.ini
new file mode 100644
index 00000000000..ca89f619145
--- /dev/null
+++ b/tests/wpt/metadata/webxr/render_state_vertical_fov_immersive.https.html.ini
@@ -0,0 +1,7 @@
+[render_state_vertical_fov_immersive.https.html]
+  [inlineVerticalFieldOfView is set appropriately on immersively sessions - webgl2]
+    expected: FAIL
+
+  [inlineVerticalFieldOfView is set appropriately on immersively sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/render_state_vertical_fov_inline.https.html.ini b/tests/wpt/metadata/webxr/render_state_vertical_fov_inline.https.html.ini
new file mode 100644
index 00000000000..e7a9adae97b
--- /dev/null
+++ b/tests/wpt/metadata/webxr/render_state_vertical_fov_inline.https.html.ini
@@ -0,0 +1,7 @@
+[render_state_vertical_fov_inline.https.html]
+  [inlineVerticalFieldOfView is set appropriately on inline sessions - webgl2]
+    expected: FAIL
+
+  [inlineVerticalFieldOfView is set appropriately on inline sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini b/tests/wpt/metadata/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
index b3887279762..53229946517 100644
--- a/tests/wpt/metadata/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
+++ b/tests/wpt/metadata/webxr/webGLCanvasContext_create_xrcompatible.https.html.ini
@@ -5,3 +5,15 @@
   [Creating a webglCanvasContext with no device]
     expected: FAIL
 
+  [Creating a webgl context with no device]
+    expected: FAIL
+
+  [An XR-compatible webgl2 context can be created]
+    expected: FAIL
+
+  [An XR-compatible webgl context can be created]
+    expected: FAIL
+
+  [Creating a webgl2 context with no device]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini b/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini
index 33544b450d3..03a0a6fe821 100644
--- a/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini
+++ b/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_contextlost.https.html.ini
@@ -2,3 +2,9 @@
   [A lost webglCanvasContext should not be able to set xr compatibility]
     expected: FAIL
 
+  [A lost webgl2 context should not be able to set xr compatibility]
+    expected: FAIL
+
+  [A lost webgl context should not be able to set xr compatibility]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini b/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
index efbea3de8fc..a26f359c2c2 100644
--- a/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
+++ b/tests/wpt/metadata/webxr/webGLCanvasContext_makecompatible_reentrant.https.html.ini
@@ -5,3 +5,15 @@
   [Verify promise from a non-reentrant to makeXRCompatible() is resolved]
     expected: FAIL
 
+  [Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl]
+    expected: FAIL
+
+  [Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl2]
+    expected: FAIL
+
+  [Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl]
+    expected: FAIL
+
+  [Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrBoundedReferenceSpace_updates.https.html.ini b/tests/wpt/metadata/webxr/xrBoundedReferenceSpace_updates.https.html.ini
index 27f6c5ed7a2..4f2a1535b94 100644
--- a/tests/wpt/metadata/webxr/xrBoundedReferenceSpace_updates.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrBoundedReferenceSpace_updates.https.html.ini
@@ -1,5 +1,10 @@
 [xrBoundedReferenceSpace_updates.https.html]
-  expected: ERROR
   ['XRBoundedReferenceSpace updates properly when the changes are applied]
     expected: TIMEOUT
 
+  ['XRBoundedReferenceSpace updates properly when the changes are applied - webgl2]
+    expected: FAIL
+
+  ['XRBoundedReferenceSpace updates properly when the changes are applied - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrDevice_disconnect_ends.https.html.ini b/tests/wpt/metadata/webxr/xrDevice_disconnect_ends.https.html.ini
index 36724622cc6..7109d35f246 100644
--- a/tests/wpt/metadata/webxr/xrDevice_disconnect_ends.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrDevice_disconnect_ends.https.html.ini
@@ -3,3 +3,9 @@
   [Immersive session ends when device is disconnected]
     expected: TIMEOUT
 
+  [Immersive session ends when device is disconnected - webgl2]
+    expected: NOTRUN
+
+  [Immersive session ends when device is disconnected - webgl]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/xrDevice_requestSession_immersive.https.html.ini b/tests/wpt/metadata/webxr/xrDevice_requestSession_immersive.https.html.ini
new file mode 100644
index 00000000000..7231e66e765
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrDevice_requestSession_immersive.https.html.ini
@@ -0,0 +1,10 @@
+[xrDevice_requestSession_immersive.https.html]
+  [Tests requestSession accepts XRSessionInit dictionary - webgl2]
+    expected: FAIL
+
+  [Tests requestSession resolves when supported - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown optionalFeatures - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini b/tests/wpt/metadata/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
index 4e60af060a6..3cdd57af948 100644
--- a/tests/wpt/metadata/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrDevice_requestSession_optionalFeatures.https.html.ini
@@ -2,3 +2,15 @@
   [Tests requestSession ignores unknown optionalFeatures]
     expected: FAIL
 
+  [Tests requestSession accepts XRSessionInit dictionary with empty feature lists - webgl2]
+    expected: FAIL
+
+  [Tests requestSession accepts XRSessionInit dictionary - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown strings in optionalFeatures - webgl2]
+    expected: FAIL
+
+  [Tests requestSession ignores unknown objects in optionalFeatures - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini b/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini
new file mode 100644
index 00000000000..e0ba6429d6f
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini
@@ -0,0 +1,13 @@
+[xrFrame_getPose.https.html]
+  [XRFrame.getPose works for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame.getPose works for immersive sessions - webgl]
+    expected: FAIL
+
+  [XRFrame.getPose works for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame.getPose works for non-immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrFrame_getViewerPose_getPose.https.html.ini b/tests/wpt/metadata/webxr/xrFrame_getViewerPose_getPose.https.html.ini
new file mode 100644
index 00000000000..3f0720114aa
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrFrame_getViewerPose_getPose.https.html.ini
@@ -0,0 +1,4 @@
+[xrFrame_getViewerPose_getPose.https.html]
+  [XRFrame getViewerPose(refSpace) matches getPose(viewer, refSpace). - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrFrame_lifetime.https.html.ini b/tests/wpt/metadata/webxr/xrFrame_lifetime.https.html.ini
new file mode 100644
index 00000000000..a26cdd97e32
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrFrame_lifetime.https.html.ini
@@ -0,0 +1,7 @@
+[xrFrame_lifetime.https.html]
+  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for non-immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrFrame_session_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrFrame_session_sameObject.https.html.ini
new file mode 100644
index 00000000000..eeaf8e45d21
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrFrame_session_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrFrame_session_sameObject.https.html]
+  [XRFrame.session meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRFrame.session meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrInputSource_add_remove.https.html.ini b/tests/wpt/metadata/webxr/xrInputSource_add_remove.https.html.ini
new file mode 100644
index 00000000000..075fa21bf28
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrInputSource_add_remove.https.html.ini
@@ -0,0 +1,7 @@
+[xrInputSource_add_remove.https.html]
+  [XRInputSources can be properly added and removed from the session - webgl2]
+    expected: FAIL
+
+  [XRInputSources can be properly added and removed from the session - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrInputSource_emulatedPosition.https.html.ini b/tests/wpt/metadata/webxr/xrInputSource_emulatedPosition.https.html.ini
index 78cd06f3dfe..0238c92af2c 100644
--- a/tests/wpt/metadata/webxr/xrInputSource_emulatedPosition.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrInputSource_emulatedPosition.https.html.ini
@@ -2,3 +2,9 @@
   [Poses from XRInputSource.gripSpace have emulatedPosition set properly]
     expected: FAIL
 
+  [Poses from XRInputSource.gripSpace have emulatedPosition set properly - webgl]
+    expected: FAIL
+
+  [Poses from XRInputSource.gripSpace have emulatedPosition set properly - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrInputSource_profiles.https.html.ini b/tests/wpt/metadata/webxr/xrInputSource_profiles.https.html.ini
new file mode 100644
index 00000000000..d78d39a4e34
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrInputSource_profiles.https.html.ini
@@ -0,0 +1,7 @@
+[xrInputSource_profiles.https.html]
+  [WebXR InputSource's profiles list can be set - webgl2]
+    expected: FAIL
+
+  [WebXR InputSource's profiles list can be set - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrInputSource_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrInputSource_sameObject.https.html.ini
new file mode 100644
index 00000000000..af661b488ec
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrInputSource_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrInputSource_sameObject.https.html]
+  [XRInputSource attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRInputSource attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrPose_transform_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrPose_transform_sameObject.https.html.ini
new file mode 100644
index 00000000000..110cc05d20b
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrPose_transform_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrPose_transform_sameObject.https.html]
+  [XRPose.transform meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [XRPose.transform meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini
new file mode 100644
index 00000000000..3167786fd49
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini
@@ -0,0 +1,7 @@
+[xrReferenceSpace_originOffset.https.html]
+  [Updating XRReferenceSpace origin offset updates view and input matrices. - webgl2]
+    expected: FAIL
+
+  [Updating XRReferenceSpace origin offset updates view and input matrices. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
index 21b3815f4da..72f0557799c 100644
--- a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffsetBounded.https.html.ini
@@ -1,5 +1,10 @@
 [xrReferenceSpace_originOffsetBounded.https.html]
-  expected: ERROR
   [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry.]
     expected: TIMEOUT
 
+  [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry. - webgl]
+    expected: FAIL
+
+  [Updating XRBoundedReferenceSpace origin offset updates view, input matrices, and bounds geometry. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini
new file mode 100644
index 00000000000..a70d0a6f749
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset_viewer.https.html.ini
@@ -0,0 +1,7 @@
+[xrReferenceSpace_originOffset_viewer.https.html]
+  [Creating XRReferenceSpace origin offset off of `viewer` space works. - webgl2]
+    expected: FAIL
+
+  [Creating XRReferenceSpace origin offset off of `viewer` space works. - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrReferenceSpace_relationships.https.html.ini b/tests/wpt/metadata/webxr/xrReferenceSpace_relationships.https.html.ini
index bc5e1b0b573..ea71a961a1a 100644
--- a/tests/wpt/metadata/webxr/xrReferenceSpace_relationships.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrReferenceSpace_relationships.https.html.ini
@@ -1,5 +1,10 @@
 [xrReferenceSpace_relationships.https.html]
-  expected: ERROR
   [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other]
     expected: TIMEOUT
 
+  [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other - webgl2]
+    expected: FAIL
+
+  [Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrRigidTransform_constructor.https.html.ini b/tests/wpt/metadata/webxr/xrRigidTransform_constructor.https.html.ini
new file mode 100644
index 00000000000..0d061166e52
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrRigidTransform_constructor.https.html.ini
@@ -0,0 +1,7 @@
+[xrRigidTransform_constructor.https.html]
+  [XRRigidTransform constructor works - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform constructor works - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrRigidTransform_inverse.https.html.ini b/tests/wpt/metadata/webxr/xrRigidTransform_inverse.https.html.ini
new file mode 100644
index 00000000000..ee8504fbb39
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrRigidTransform_inverse.https.html.ini
@@ -0,0 +1,7 @@
+[xrRigidTransform_inverse.https.html]
+  [XRRigidTransform inverse works - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform inverse works - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrRigidTransform_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrRigidTransform_sameObject.https.html.ini
new file mode 100644
index 00000000000..497c5ce8f7d
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrRigidTransform_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrRigidTransform_sameObject.https.html]
+  [XRRigidTransform position and orientation meet [SameObject\] requirements - webgl2]
+    expected: FAIL
+
+  [XRRigidTransform position and orientation meet [SameObject\] requirements - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame.https.html.ini b/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame.https.html.ini
new file mode 100644
index 00000000000..fd8f9c1c0f6
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_cancelAnimationFrame.https.html]
+  [XRSession requestAnimationFrame callbacks can be unregistered with cancelAnimationFrame for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame callbacks can be unregistered with cancelAnimationFrame for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini b/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
index eab756254f7..b2acdfd29c6 100644
--- a/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html.ini
@@ -6,3 +6,15 @@
   [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession]
     expected: NOTRUN
 
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession - webgl2]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on non-immersive testSession - webgl]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on immersive testSession - webgl2]
+    expected: NOTRUN
+
+  [XRSession cancelAnimationFrame does not have unexpected behavior when given invalid handles on immersive testSession - webgl]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/xrSession_end.https.html.ini b/tests/wpt/metadata/webxr/xrSession_end.https.html.ini
new file mode 100644
index 00000000000..849a07c6aa0
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_end.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_end.https.html]
+  [end event fires when non-immersive session ends - webgl2]
+    expected: FAIL
+
+  [end event fires when immersive session ends - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_input_events_end.https.html.ini b/tests/wpt/metadata/webxr/xrSession_input_events_end.https.html.ini
index 739e7b4c112..a0cd317dbd6 100644
--- a/tests/wpt/metadata/webxr/xrSession_input_events_end.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_input_events_end.https.html.ini
@@ -2,3 +2,9 @@
   [Calling end during an input callback stops processing at the right time]
     expected: FAIL
 
+  [Calling end during an input callback stops processing at the right time - webgl]
+    expected: FAIL
+
+  [Calling end during an input callback stops processing at the right time - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini
new file mode 100644
index 00000000000..62141d11570
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_requestAnimationFrame_callback_calls.https.html]
+  [XRSession requestAnimationFrame calls the provided callback for an immersive session - webgl2]
+    expected: FAIL
+
+  [XRSession requestAnimationFrame calls the provided callback a non-immersive session - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini
new file mode 100644
index 00000000000..0a9fa312220
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_data_valid.https.html.ini
@@ -0,0 +1,4 @@
+[xrSession_requestAnimationFrame_data_valid.https.html]
+  [RequestAnimationFrame resolves with good data - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
new file mode 100644
index 00000000000..cde41b1c243
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_requestAnimationFrame_getViewerPose.https.html]
+  [XRFrame getViewerPose updates on the next frame for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini
new file mode 100644
index 00000000000..ee8ba626a6a
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestAnimationFrame_timestamp.https.html.ini
@@ -0,0 +1,13 @@
+[xrSession_requestAnimationFrame_timestamp.https.html]
+  [XRFrame getViewerPose updates on the next frame for non-immersive - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for non-immersive - webgl]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive - webgl2]
+    expected: FAIL
+
+  [XRFrame getViewerPose updates on the next frame for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace.https.html.ini
index eee7a9c591d..3502c8772dd 100644
--- a/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace.https.html.ini
@@ -5,3 +5,15 @@
   [Immersive XRSession requestReferenceSpace returns expected objects]
     expected: FAIL
 
+  [Immersive XRSession requestReferenceSpace returns expected objects - webgl2]
+    expected: FAIL
+
+  [Immersive XRSession requestReferenceSpace returns expected objects - webgl]
+    expected: FAIL
+
+  [Non-immersive XRSession requestReferenceSpace returns expected objects - webgl2]
+    expected: FAIL
+
+  [Non-immersive XRSession requestReferenceSpace returns expected objects - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace_features.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace_features.https.html.ini
new file mode 100644
index 00000000000..ab5b30d9767
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestReferenceSpace_features.https.html.ini
@@ -0,0 +1,37 @@
+[xrSession_requestReferenceSpace_features.https.html]
+  [Non-immersive session supports viewer space by default - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local-floor space when required - webgl2]
+    expected: FAIL
+
+  [Immersive session supports viewer space by default - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects unbounded space even when requested - webgl2]
+    expected: FAIL
+
+  [Immersive session rejects local-floor space if not requested - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local space by default - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects local space if not requested - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local-floor space when required - webgl2]
+    expected: FAIL
+
+  [Non-immersive session rejects bounded-floor space even when requested - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local space when optional - webgl2]
+    expected: FAIL
+
+  [Immersive session supports local-floor space when optional - webgl2]
+    expected: FAIL
+
+  [Non-immersive session supports local space when required - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini
index df0dc8e6485..12fa56fa6c3 100644
--- a/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini
@@ -5,3 +5,15 @@
   [Create mew session in end promise]
     expected: FAIL
 
+  [Create mew session in end promise - webgl2]
+    expected: FAIL
+
+  [Create mew session in end promise - webgl]
+    expected: FAIL
+
+  [Create new session in OnSessionEnded event - webgl2]
+    expected: FAIL
+
+  [Create new session in OnSessionEnded event - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrSession_sameObject.https.html.ini
new file mode 100644
index 00000000000..83576512c4c
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_sameObject.https.html]
+  [XRSession attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRSession attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_viewer_referenceSpace.https.html.ini b/tests/wpt/metadata/webxr/xrSession_viewer_referenceSpace.https.html.ini
new file mode 100644
index 00000000000..64b56698b85
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_viewer_referenceSpace.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_viewer_referenceSpace.https.html]
+  [Identity reference space provides correct poses for inline sessions - webgl2]
+    expected: FAIL
+
+  [Identity reference space provides correct poses for immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_visibilityState.https.html.ini b/tests/wpt/metadata/webxr/xrSession_visibilityState.https.html.ini
index ad979f41d3a..8e4e33f5e6c 100644
--- a/tests/wpt/metadata/webxr/xrSession_visibilityState.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_visibilityState.https.html.ini
@@ -2,3 +2,9 @@
   [Ensures that the XRSession's visibilityState is correctly reported and that the associated visibilitychange event fires.]
     expected: FAIL
 
+  [Ensures that the XRSession's visibilityState is correctly reported and that the associated visibilitychange event fires. - webgl]
+    expected: FAIL
+
+  [Ensures that the XRSession's visibilityState is correctly reported and that the associated visibilitychange event fires. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini b/tests/wpt/metadata/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
index 6526448d68c..ff46269e1ba 100644
--- a/tests/wpt/metadata/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
@@ -5,3 +5,15 @@
   ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions]
     expected: FAIL
 
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for immersive sessions - webgl2]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for immersive sessions - webgl]
+    expected: FAIL
+
+  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrView_eyes.https.html.ini b/tests/wpt/metadata/webxr/xrView_eyes.https.html.ini
new file mode 100644
index 00000000000..a1dd85bcc33
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrView_eyes.https.html.ini
@@ -0,0 +1,13 @@
+[xrView_eyes.https.html]
+  [XRView.eye is correct for non-immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRView.eye is correct for non-immersive sessions - webgl]
+    expected: FAIL
+
+  [XRView.eye is correct for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRView.eye is correct for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrView_match.https.html.ini b/tests/wpt/metadata/webxr/xrView_match.https.html.ini
new file mode 100644
index 00000000000..3cb4bf6bfaa
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrView_match.https.html.ini
@@ -0,0 +1,7 @@
+[xrView_match.https.html]
+  [XRFrame contains the expected views - webgl]
+    expected: FAIL
+
+  [XRFrame contains the expected views - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrView_oneframeupdate.https.html.ini b/tests/wpt/metadata/webxr/xrView_oneframeupdate.https.html.ini
index cdfe879fb87..b29c2ab55e7 100644
--- a/tests/wpt/metadata/webxr/xrView_oneframeupdate.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrView_oneframeupdate.https.html.ini
@@ -2,3 +2,9 @@
   [XRView projection matrices update near and far depths on the next frame]
     expected: FAIL
 
+  [XRView projection matrices update near and far depths on the next frame - webgl]
+    expected: FAIL
+
+  [XRView projection matrices update near and far depths on the next frame - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrView_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrView_sameObject.https.html.ini
new file mode 100644
index 00000000000..2d21173c39a
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrView_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrView_sameObject.https.html]
+  [XRView attributes meet [SameObject\] requirement - webgl]
+    expected: FAIL
+
+  [XRView attributes meet [SameObject\] requirement - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrViewerPose_views_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrViewerPose_views_sameObject.https.html.ini
new file mode 100644
index 00000000000..c5058f12c3e
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrViewerPose_views_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrViewerPose_views_sameObject.https.html]
+  [XRViewerPose.views meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRViewerPose.views meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrViewport_valid.https.html.ini b/tests/wpt/metadata/webxr/xrViewport_valid.https.html.ini
new file mode 100644
index 00000000000..d7fbf4dd813
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrViewport_valid.https.html.ini
@@ -0,0 +1,7 @@
+[xrViewport_valid.https.html]
+  [XRViewport attributes are valid - webgl]
+    expected: FAIL
+
+  [XRViewport attributes are valid - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_constructor.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_constructor.https.html.ini
index 08a51f5b1bc..d4e96417d6d 100644
--- a/tests/wpt/metadata/webxr/xrWebGLLayer_constructor.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_constructor.https.html.ini
@@ -1,5 +1,10 @@
 [xrWebGLLayer_constructor.https.html]
-  expected: ERROR
   [Ensure that XRWebGLLayer's constructor throws appropriate errors]
     expected: TIMEOUT
 
+  [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl2]
+    expected: FAIL
+
+  [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini
new file mode 100644
index 00000000000..cb87adff2a1
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_draw.https.html.ini
@@ -0,0 +1,7 @@
+[xrWebGLLayer_framebuffer_draw.https.html]
+  [Ensure a WebGL layer's framebuffer can only be drawn to inside a XR frame - webgl]
+    expected: FAIL
+
+  [Ensure a WebGL layer's framebuffer can only be drawn to inside a XR frame - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini
new file mode 100644
index 00000000000..b6b9872a238
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_sameObject.https.html.ini
@@ -0,0 +1,7 @@
+[xrWebGLLayer_framebuffer_sameObject.https.html]
+  [XRWebGLLayer.framebuffer meets [SameObject\] requirement - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer.framebuffer meets [SameObject\] requirement - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini
index 0b738710eea..908182b8f4a 100644
--- a/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer_scale.https.html.ini
@@ -2,3 +2,9 @@
   [Ensure framebuffer scaling works as expected.]
     expected: FAIL
 
+  [Ensure framebuffer scaling works as expected. - webgl]
+    expected: FAIL
+
+  [Ensure framebuffer scaling works as expected. - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini
new file mode 100644
index 00000000000..a1fdcb71f3a
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer.https.html.ini
@@ -0,0 +1,13 @@
+[xrWebGLLayer_opaque_framebuffer.https.html]
+  [Ensure that the framebuffer given by the WebGL layer is opaque for non-immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for non-immersive - webgl]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer is opaque for immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini
index 4ac759d2ada..2be642581b6 100644
--- a/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html.ini
@@ -5,3 +5,15 @@
   [Ensure that the framebuffer given by the WebGL layer works with stencil for immersive]
     expected: FAIL
 
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for immersive - webgl]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for non-immersive - webgl2]
+    expected: FAIL
+
+  [Ensure that the framebuffer given by the WebGL layer works with stencil for non-immersive - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_viewports.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_viewports.https.html.ini
new file mode 100644
index 00000000000..6ef555c4825
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrWebGLLayer_viewports.https.html.ini
@@ -0,0 +1,13 @@
+[xrWebGLLayer_viewports.https.html]
+  [XRWebGLLayer reports a valid viewports for inline sessions - webgl]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for inline sessions - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for immersive sessions - webgl2]
+    expected: FAIL
+
+  [XRWebGLLayer reports a valid viewports for immersive sessions - webgl]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xr_viewport_scale.https.html.ini b/tests/wpt/metadata/webxr/xr_viewport_scale.https.html.ini
index 1741fe64785..e4403044a54 100644
--- a/tests/wpt/metadata/webxr/xr_viewport_scale.https.html.ini
+++ b/tests/wpt/metadata/webxr/xr_viewport_scale.https.html.ini
@@ -1,5 +1,4 @@
 [xr_viewport_scale.https.html]
-  expected: ERROR
   [requestViewportScale valid viewport for inline session]
     expected: TIMEOUT
 
@@ -42,3 +41,87 @@
   [requestViewportScale applied next frame for immersive-vr session]
     expected: NOTRUN
 
+  [requestViewportScale valid viewport for inline session - webgl]
+    expected: FAIL
+
+  [recommendedViewportScale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for inline session - webgl]
+    expected: FAIL
+
+  [recommendedViewportScale for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale same frame for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for inline session - webgl2]
+    expected: FAIL
+
+  [recommendedViewportScale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale same frame for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale applied next frame for inline session - webgl2]
+    expected: FAIL
+
+  [recommendedViewportScale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport for inline session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for inline session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ null scale for immersive-vr session - webgl2]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ very small scale for immersive-vr session - webgl]
+    expected: FAIL
+
+  [requestViewportScale valid viewport w/ undefined scale for inline session - webgl2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index d6e39444229..49f489d2a1c 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,5 +1,6 @@
 [003.html]
   type: testharness
+  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index daa7a8c41bc..10dda3a6659 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
     expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/xhr/cookies.http.html.ini b/tests/wpt/metadata/xhr/cookies.http.html.ini
new file mode 100644
index 00000000000..b3ed182ef25
--- /dev/null
+++ b/tests/wpt/metadata/xhr/cookies.http.html.ini
@@ -0,0 +1,4 @@
+[cookies.http.html]
+  [Basic non-cross-site cookie handling in XHR]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
index 84fce803236..5eb58e3213e 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
@@ -20,7 +20,7 @@ promise_test(async () => {
   iframe.parentNode.removeChild(iframe);
   assert_not_equals(navigator.clipboard, null,
       "parent frame's clipboard should exist with iframe detached");
-  assert_equals(iframeNavigator.clipboard, null,
-      "detached child iframe's clipboard should not exist");
-}, 'Verify navigator.clipboard attached only on attached frames');
-</script>
\ No newline at end of file
+  assert_not_equals(iframeNavigator.clipboard, null,
+      "detached child iframe's clipboard should still exist");
+}, 'Verify navigator.clipboard behavior in detached frames');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html b/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html
index c5790a3fafa..dce5c29fdc8 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html
@@ -18,13 +18,13 @@ test_invalid_value("animation", "steps(1) steps(2)");
 
 test_invalid_value("animation", "1 2");
 
-test_invalid_value("animation", "reverse alternate anim");
+test_invalid_value("animation", "reverse alternate alternate-reverse anim");
 
-test_invalid_value("animation", "both backwards anim");
+test_invalid_value("animation", "both backwards forwards anim");
 
-test_invalid_value("animation", "paused running anim");
+test_invalid_value("animation", "paused running paused anim");
 
-test_invalid_value("animation", "anim1 anim2");
+test_invalid_value("animation", "anim1 timeline1 anim2");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html b/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html
index 2e3053e7afc..b981ad3ad68 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html
@@ -19,7 +19,8 @@ test_shorthand_value('animation', 'anim paused both reverse 4 1s -3s cubic-bezie
   'animation-direction': 'reverse',
   'animation-fill-mode': 'both',
   'animation-play-state': 'paused',
-  'animation-name': 'anim'
+  'animation-name': 'anim',
+  'animation-timeline': 'auto'
 });
 
 test_shorthand_value('animation', 'anim paused both reverse, 4 1s -3s cubic-bezier(0, -2, 1, 3)', {
@@ -30,7 +31,8 @@ test_shorthand_value('animation', 'anim paused both reverse, 4 1s -3s cubic-bezi
   'animation-direction': 'reverse, normal',
   'animation-fill-mode': 'both, none',
   'animation-play-state': 'paused, running',
-  'animation-name': 'anim, none'
+  'animation-name': 'anim, none',
+  'animation-timeline': 'auto, auto'
 });
 
 test_shorthand_value('animation', '4 1s -3s cubic-bezier(0, -2, 1, 3), anim paused both reverse', {
@@ -41,7 +43,8 @@ test_shorthand_value('animation', '4 1s -3s cubic-bezier(0, -2, 1, 3), anim paus
   'animation-direction': 'normal, reverse',
   'animation-fill-mode': 'none, both',
   'animation-play-state': 'running, paused',
-  'animation-name': 'none, anim'
+  'animation-name': 'none, anim',
+  'animation-timeline': 'auto, auto'
 });
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html
new file mode 100644
index 00000000000..189aa819fa5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/dynamic-import-credentials-helper.sub.js"></script>
+
+<script type="text/javascript">
+runTestsFromIframe('../resources/dynamic-import-credentials-setTimeout-iframe.sub.html');
+</script>
+<body>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html
index b939a3ef163..910644531c2 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html
@@ -2,57 +2,10 @@
 <meta charset="utf-8">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
+<script src="../resources/dynamic-import-credentials-helper.sub.js"></script>
 
 <script type="text/javascript">
-host_info = get_host_info();
-
-document.cookie = 'same=1';
-
-const setCookiePromise = fetch(
-    'http://{{domains[www2]}}:{{ports[http][0]}}/cookies/resources/set-cookie.py?name=cross&path=/html/semantics/scripting-1/the-script-element/module/',
-    {
-      mode: 'no-cors',
-      credentials: 'include',
-    });
-
-const windowLoadPromise = new Promise(resolve => {
-  window.addEventListener('load', () => {
-    resolve();
-  });
-});
-
-promise_test(t => {
-  const iframe = document.createElement('iframe');
-
-  return Promise.all([setCookiePromise, windowLoadPromise]).then(() => {
-    const messagePromise = new Promise(resolve => {
-      window.addEventListener('message', event => {
-        resolve();
-      });
-    });
-
-    iframe.src = '../resources/dynamic-import-credentials-iframe.sub.html';
-    document.body.appendChild(iframe);
-
-    return messagePromise;
-  }).then(() => {
-    const w = iframe.contentWindow;
-
-    assert_equals(w.sameOriginNoneDynamicDescendant, 'found',
-                  'Dynamic descendant modules should be loaded with the credentials when the crossOrigin attribute is not specified and the target is same-origin');
-    assert_equals(w.sameOriginAnonymousDynamicDescendant, 'found',
-                  'Dynamic descendant modules should be loaded with the credentials when the crossOrigin attribute is specified with "anonymous" as its value and the target is same-origin');
-    assert_equals(w.sameOriginUseCredentialsDynamicDescendant, 'found',
-                  'Dynamic descendant modules should be loaded with the credentials when the crossOrigin attribute is specified with "use-credentials" as its value and the target is same-origin');
-    assert_equals(w.crossOriginNoneDynamicDescendant, 'not found',
-                  'Dynamic descendant modules should not be loaded with the credentials when the crossOrigin attribute is not specified and the target is cross-origin');
-    assert_equals(w.crossOriginAnonymousDynamicDescendant, 'not found',
-                  'Dynamic descendant modules should not be loaded with the credentials when the crossOrigin attribute is specified with "anonymous" as its value and the target is cross-origin');
-    assert_equals(w.crossOriginUseCredentialsDynamicDescendant, 'found',
-                  'Dynamic descendant modules should be loaded with the credentials when the crossOrigin attribute is specified with "use-credentials" as its value and the target is cross-origin');
-});
-}, 'Dynamic imports should be loaded with or without the credentials based on the same-origin-ness and the parent script\'s crossOrigin attribute');
+runTestsFromIframe('../resources/dynamic-import-credentials-iframe.sub.html');
 </script>
 <body>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py
index ec5fdc8cce4..90551e92c33 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py
@@ -1,7 +1,7 @@
 def main(request, response):
     headers = [
         (b"Content-Type", b"text/javascript"),
-        (b"Access-Control-Allow-Origin", request.headers.get(b"Origin")),
+        (b"Access-Control-Allow-Origin", request.GET.first(b"origin")),
         (b"Access-Control-Allow-Credentials", b"true")
     ]
     identifier = request.GET.first(b"id")
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html
index 8a0506ccec6..dbc14dffec5 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html
@@ -2,45 +2,45 @@
 <meta charset="utf-8">
 
 <script type="module"
-        src="check-cookie.py?id=sameOriginNone&cookieName=same">
+        src="check-cookie.py?id=sameOriginNone&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}">
 </script>
 <script type="module"
-        src="check-cookie.py?id=sameOriginAnonymous&cookieName=same"
+        src="check-cookie.py?id=sameOriginAnonymous&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}"
         crossOrigin="anonymous">
 </script>
 <script type="module"
-        src="check-cookie.py?id=sameOriginUseCredentials&cookieName=same"
+        src="check-cookie.py?id=sameOriginUseCredentials&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}"
         crossOrigin="use-credentials">
 </script>
 <script type="module"
-        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginNone&cookieName=cross">
+        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginNone&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}">
 </script>
 <script type="module"
-        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginAnonymous&cookieName=cross"
+        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginAnonymous&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}"
         crossOrigin="anonymous">
 </script>
 <script type="module"
-        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginUseCredentials&cookieName=cross"
+        src="http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginUseCredentials&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}"
         crossOrigin="use-credentials">
 </script>
 
 <script type="module">
-import "./check-cookie.py?id=sameOriginNoneDescendant&cookieName=same";
+import "./check-cookie.py?id=sameOriginNoneDescendant&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 <script type="module" crossOrigin="anonymous">
-import "./check-cookie.py?id=sameOriginAnonymousDescendant&cookieName=same";
+import "./check-cookie.py?id=sameOriginAnonymousDescendant&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 <script type="module" crossOrigin="use-credentials">
-import "./check-cookie.py?id=sameOriginUseCredentialsDescendant&cookieName=same";
+import "./check-cookie.py?id=sameOriginUseCredentialsDescendant&cookieName=same&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 <script type="module">
-import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginNoneDescendant&cookieName=cross";
+import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginNoneDescendant&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 <script type="module" crossOrigin="anonymous">
-import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginAnonymousDescendant&cookieName=cross";
+import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginAnonymousDescendant&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 <script type="module" crossOrigin="use-credentials">
-import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginUseCredentialsDescendant&cookieName=cross";
+import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginUseCredentialsDescendant&cookieName=cross&origin=http://{{host}}:{{ports[http][0]}}";
 </script>
 
 <script type="text/javascript">
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js
new file mode 100644
index 00000000000..7d9b024e752
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js
@@ -0,0 +1,67 @@
+// runTestsFromIframe() is used in the top-level HTML to set cookies and then
+// start actual tests in iframe.
+function runTestsFromIframe(iframe_url) {
+  const setSameOriginCookiePromise = fetch(
+    '/cookies/resources/set-cookie.py?name=same&path=/html/semantics/scripting-1/the-script-element/module/',
+    {
+      mode: 'no-cors',
+      credentials: 'include',
+    });
+  const setCrossOriginCookiePromise = fetch(
+    'http://{{domains[www2]}}:{{ports[http][0]}}/cookies/resources/set-cookie.py?name=cross&path=/html/semantics/scripting-1/the-script-element/module/',
+    {
+      mode: 'no-cors',
+      credentials: 'include',
+    });
+  const windowLoadPromise = new Promise(resolve => {
+    window.addEventListener('load', () => {
+      resolve();
+    });
+  });
+
+  const iframe = document.createElement('iframe');
+  Promise.all([setSameOriginCookiePromise,
+               setCrossOriginCookiePromise,
+               windowLoadPromise]).then(() => {
+    iframe.src = iframe_url;
+    document.body.appendChild(iframe);
+    fetch_tests_from_window(iframe.contentWindow);
+  });
+}
+
+// The functions below are used from tests within the iframe.
+
+let testNumber = 0;
+
+// importFunc and setTimeoutFunc is used to make the active script at the time
+// of import() to be the script elements that call `runTest()`,
+// NOT this script defining runTest().
+
+function runTest(importFunc, origin, expected, source) {
+  let url;
+  let description;
+  if (origin === 'same') {
+    url = "./check-cookie.py";
+    description = "Same-origin dynamic import from " + source;
+  } else {
+    url = "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py";
+    description = "Cross-origin dynamic import from " + source;
+  }
+  promise_test(() => {
+    const id = "test" + testNumber;
+    testNumber += 1;
+    return importFunc(url + "?id=" + id + "&cookieName=" + origin + "&origin=" + location.origin)
+      .then(() => {
+          assert_equals(window[id], expected, "cookie");
+        });
+  }, description);
+}
+
+function setTimeoutWrapper(setTimeoutFunc) {
+  return url => {
+    return new Promise(resolve => {
+      window.resolve = resolve;
+      setTimeoutFunc(`import("${url}").then(window.resolve)`);
+    });
+  };
+}
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html
index 836ece62c5f..88204ef00b7 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html
@@ -1,26 +1,51 @@
 <!DOCTYPE html>
-<script type="module">
-import("./check-cookie.py?id=sameOriginNoneDynamicDescendant&cookieName=same");
-</script>
-<script type="module" crossOrigin="anonymous">
-import("./check-cookie.py?id=sameOriginAnonymousDynamicDescendant&cookieName=same");
-</script>
-<script type="module" crossOrigin="use-credentials">
-import("./check-cookie.py?id=sameOriginUseCredentialsDynamicDescendant&cookieName=same");
-</script>
-<script type="module">
-import("http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginNoneDynamicDescendant&cookieName=cross");
-</script>
-<script type="module" crossOrigin="anonymous">
-import("http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginAnonymousDynamicDescendant&cookieName=cross");
-</script>
-<script type="module" crossOrigin="use-credentials">
-import("http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py?id=crossOriginUseCredentialsDynamicDescendant&cookieName=cross");
+<script src="/resources/testharness.js"></script>
+<script src="dynamic-import-credentials-helper.sub.js"></script>
+
+<!--
+The active script at the time of import() is the script elements below, and
+thus the credentials mode of the fetch options of the script elements below
+are used for dynamic import requests.
+-->
+
+<script>
+runTest(url => import(url),
+  "same", "found", "classic script (crossOrigin not specified)");
+runTest(url => import(url),
+  "cross", "not found", "classic script (crossOrigin not specified)");
 </script>
 
-
-<script type="text/javascript">
-window.addEventListener('load', event => {
-  window.parent.postMessage({}, '*');
-});
+<script crossOrigin="anonymous">
+runTest(url => import(url), "same", "found",
+  "classic script (crossOrigin=anonymous)");
+runTest(url => import(url), "cross", "not found",
+  "classic script (crossOrigin=anonymous)");
+</script>
+
+<script crossOrigin="use-credentials">
+runTest(url => import(url),
+  "same", "found", "classic script (crossOrigin=use-credentials)");
+runTest(url => import(url),
+  "cross", "found", "classic script (crossOrigin=use-credentials)");
+</script>
+
+<script type="module">
+runTest(url => import(url),
+  "same", "found", "module script (crossOrigin not specified)");
+runTest(url => import(url),
+  "cross", "not found", "module script (crossOrigin not specified)");
+</script>
+
+<script type="module" crossOrigin="anonymous">
+runTest(url => import(url), "same", "found",
+  "module script (crossOrigin=anonymous)");
+runTest(url => import(url), "cross", "not found",
+  "module script (crossOrigin=anonymous)");
+</script>
+
+<script type="module" crossOrigin="use-credentials">
+runTest(url => import(url),
+  "same", "found", "module script (crossOrigin=use-credentials)");
+runTest(url => import(url),
+  "cross", "found", "module script (crossOrigin=use-credentials)");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html
new file mode 100644
index 00000000000..ffba1415270
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="dynamic-import-credentials-helper.sub.js"></script>
+
+<!--
+The active script at the time of import() is the classic script created by
+https://html.spec.whatwg.org/multipage/C/#timer-initialisation-steps
+and the active script at the time of setTimeout() is the script elements below,
+thus the credentials mode of the fetch options of the script elements below
+are used for dynamic import requests.
+
+setTimeout() calls below can't be wrapped (e.g. by step_timeout())
+because wrapping setTimeout() would set active scripts differently.
+-->
+
+<script>
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from classic script (crossOrigin not specified)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "not found", "setTimeout(string) from classic script (crossOrigin not specified)");
+</script>
+
+<script crossOrigin="anonymous">
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from classic script (crossOrigin=anonymous)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "not found", "setTimeout(string) from classic script (crossOrigin=anonymous)");
+</script>
+
+<script crossOrigin="use-credentials">
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from classic script (crossOrigin=use-credentials)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "found", "setTimeout(string) from classic script (crossOrigin=use-credentials)");
+</script>
+
+<script type="module">
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from module script (crossOrigin not specified)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "not found", "setTimeout(string) from module script (crossOrigin not specified)");
+</script>
+
+<script type="module" crossOrigin="anonymous">
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from module script (crossOrigin=anonymous)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "not found", "setTimeout(string) from module script (crossOrigin=anonymous)");
+</script>
+
+<script type="module" crossOrigin="use-credentials">
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "same", "found", "setTimeout(string) from module script (crossOrigin=use-credentials)");
+runTest(setTimeoutWrapper(x => setTimeout(x, 0)),
+  "cross", "found", "setTimeout(string) from module script (crossOrigin=use-credentials)");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html
index 14e9a8bc215..c4028e650bf 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html
@@ -10,22 +10,13 @@
   <script>
     setup({allow_uncaught_exception:true});
     var t = async_test();
-    var t_col = async_test(document.title+' (column)');
     var ran = false;
-    var col_value;
     var interval;
-    window.onerror = t.step_func(function(a, b, c, d){
+    window.addEventListener('error', t.step_func(e => {
         clearInterval(interval);
         ran = true;
-        col_value = d;
-        assert_equals(a, 'Script error.', 'first arg');
-        assert_equals(b, '', 'second arg');
-        assert_equals(c, 0, 'third arg');
-    });
-    function col_check() {
-        assert_equals(col_value, 0, 'fourth arg');
-        t_col.done();
-    }
+        assert_equals(e.error.constructor, SyntaxError);
+    }));
     var script = document.createElement('script');
     script.src = location.href.replace('://', '://www1.').replace(/\/[^\/]+$/, '/support/syntax-error-in-setInterval.js');
     document.body.appendChild(script);
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html
index 7c46cc21a3e..1eebf82fbb0 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html
@@ -10,20 +10,11 @@
   <script>
     setup({allow_uncaught_exception:true});
     var t = async_test();
-    var t_col = async_test(document.title+' (column)');
     var ran = false;
-    var col_value;
-    window.onerror = t.step_func(function(a, b, c, d){
+    window.addEventListener('error', t.step_func(e => {
         ran = true;
-        col_value = d;
-        assert_equals(a, 'Script error.', 'first arg');
-        assert_equals(b, '', 'second arg');
-        assert_equals(c, 0, 'third arg');
-    });
-    function col_check() {
-        assert_equals(col_value, 0, 'fourth arg');
-        t_col.done();
-    }
+        assert_equals(e.error.constructor, SyntaxError);
+    }));
     var script = document.createElement('script');
     script.src = location.href.replace('://', '://www1.').replace(/\/[^\/]+$/, '/support/syntax-error-in-setTimeout.js');
     document.body.appendChild(script);
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html
index dd97566d701..8b92f7d148d 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html
@@ -10,22 +10,13 @@
   <script>
     setup({allow_uncaught_exception:true});
     var t = async_test();
-    var t_col = async_test(document.title+' (column)');
     var ran = false;
-    var col_value;
     var interval;
-    window.onerror = t.step_func(function(a, b, c, d){
+    window.addEventListener('error', t.step_func(e => {
         clearInterval(interval);
         ran = true;
-        col_value = d;
-        assert_equals(a, 'Script error.', 'first arg');
-        assert_equals(b, '', 'second arg');
-        assert_equals(c, 0, 'third arg');
-    });
-    function col_check() {
-        assert_equals(col_value, 0, 'fourth arg');
-        t_col.done();
-    }
+        assert_equals(e.error.constructor, ReferenceError);
+    }));
     var script = document.createElement('script');
     script.src = location.href.replace('://', '://www1.').replace(/\/[^\/]+$/, '/support/undefined-variable-in-setInterval.js');
     document.body.appendChild(script);
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html
index 6f9add5c9f5..2e1a9d23151 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html
@@ -10,20 +10,11 @@
   <script>
     setup({allow_uncaught_exception:true});
     var t = async_test();
-    var t_col = async_test(document.title+' (column)');
     var ran = false;
-    var col_value;
-    window.onerror = t.step_func(function(a, b, c, d){
+    window.addEventListener('error', t.step_func(e => {
         ran = true;
-        col_value = d;
-        assert_equals(a, 'Script error.', 'first arg');
-        assert_equals(b, '', 'second arg');
-        assert_equals(c, 0, 'third arg');
-    });
-    function col_check() {
-        assert_equals(col_value, 0, 'fourth arg');
-        t_col.done();
-    }
+        assert_equals(e.error.constructor, ReferenceError);
+    }));
     var script = document.createElement('script');
     script.src = location.href.replace('://', '://www1.').replace(/\/[^\/]+$/, '/support/undefined-variable-in-setTimeout.js');
     document.body.appendChild(script);
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js
index 3b42fd9bc92..afec114458b 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js
@@ -5,5 +5,4 @@ step_timeout(function(){
         assert_true(ran, 'ran');
         t.done();
     });
-    t_col.step(col_check);
 }, 20);
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js
index 84eb4fc4199..427542b42ec 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js
@@ -4,5 +4,4 @@ setTimeout(function(){
         assert_true(ran, 'ran');
         t.done();
     });
-    t_col.step(col_check);
 }, 20);
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js
index 4aa7da8256c..c2a017a2abf 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js
@@ -5,5 +5,4 @@ step_timeout(function(){
         assert_true(ran, 'ran');
         t.done();
     });
-    t_col.step(col_check);
 }, 20);
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js
index 6350ab62ebf..6fa54cda9fb 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js
@@ -4,5 +4,4 @@ setTimeout(function(){
         assert_true(ran, 'ran');
         t.done();
     });
-    t_col.step(col_check);
 }, 20);
diff --git a/tests/wpt/web-platform-tests/resources/test/tox.ini b/tests/wpt/web-platform-tests/resources/test/tox.ini
index c38b9f2749c..266a6e8952e 100644
--- a/tests/wpt/web-platform-tests/resources/test/tox.ini
+++ b/tests/wpt/web-platform-tests/resources/test/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-# Note that only py27 is run in CI.
-envlist = py27,py36
+envlist = py27,py36,py38
 skipsdist=True
 
 [testenv]
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-dynamic.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-dynamic.tentative.html
new file mode 100644
index 00000000000..0722115593c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-dynamic.tentative.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html>
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-at-rule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  #scrollers > div {
+    overflow: scroll;
+    width: 100px;
+    height: 100px;
+  }
+  #scrollers > div > div {
+    height: 200px;
+  }
+  @keyframes expand {
+    from { width: 100px; }
+    to { width: 200px; }
+  }
+  #element {
+    width: 0px;
+    height: 20px;
+    animation-name: expand;
+    animation-duration: 1e10s;
+    animation-timing-function: linear;
+  }
+</style>
+<div id=scrollers>
+  <div id=scroller1><div></div></div>
+  <div id=scroller2><div></div></div>
+</div>
+<div id=container></div>
+<script>
+  // Force layout of scrollers.
+  scroller1.offsetTop;
+  scroller2.offsetTop;
+
+  scroller1.scrollTop = 20;
+  scroller2.scrollTop = 40;
+
+  function insertElement() {
+    let element = document.createElement('div');
+    element.id = 'element';
+    container.append(element);
+    return element;
+  }
+
+  function insertSheet(text) {
+    let style = document.createElement('style');
+    style.textContent = text;
+    container.append(style);
+    return style;
+  }
+
+  // Insert an @scroll-timeline rule given 'options', where each option
+  // has a reasonable default.
+  function insertScrollTimeline(options) {
+    if (typeof(options) == 'undefined')
+      options = {};
+    if (typeof(options.name) == 'undefined')
+      options.name = 'timeline';
+    if (typeof(options.source) == 'undefined')
+      options.source = 'selector(#scroller1)';
+    if (typeof(options.timeRange) == 'undefined')
+      options.timeRange = '1e10s';
+    if (typeof(options.start) == 'undefined')
+      options.start = '0px';
+    if (typeof(options.end) == 'undefined')
+      options.end = '100px';
+    return insertSheet(`
+      @scroll-timeline ${options.name} {
+        source: ${options.source};
+        time-range: ${options.timeRange};
+        start: ${options.start};
+        end: ${options.end};
+      }
+    `);
+  }
+
+  // Runs a test with dynamically added/removed elements or CSS rules.
+  // Each test is instantiated twice: once for the initial style resolve where
+  // the DOM change was effectuated, and once after scrolling.
+  function dynamic_rule_test(func, description) {
+    // assert_width is an async function which verifies that the computed value
+    // of 'width' is as expected.
+    const instantiate = (assert_width, description) => {
+      promise_test(async (t) => {
+        try {
+          await func(t, assert_width);
+        } finally {
+          while (container.firstChild)
+            container.firstChild.remove();
+        }
+      }, description);
+    };
+
+    // Verify that the computed style is as expected immediately after the
+    // rule change took place.
+    instantiate(async (element, expected) => {
+      assert_equals(getComputedStyle(element).width, expected);
+    }, description + ' [immediate]');
+
+    // Verify that the computed style after scrolling a bit.
+    instantiate(async (element, expected) => {
+      scroller1.scrollTop = scroller1.scrollTop + 1;
+      scroller2.scrollTop = scroller2.scrollTop + 1;
+      await waitForNextFrame();
+      scroller1.scrollTop = scroller1.scrollTop - 1;
+      scroller2.scrollTop = scroller2.scrollTop - 1;
+      await waitForNextFrame();
+      assert_equals(getComputedStyle(element).width, expected);
+    }, description + ' [scroll]');
+  }
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+
+    // This element initially has a DocumentTimeline.
+    await assert_width(element, '100px');
+
+    // Switch to scroll timeline.
+    let sheet1 = insertScrollTimeline();
+    let sheet2 = insertSheet('#element { animation-timeline: timeline; }');
+    await assert_width(element, '120px');
+
+    // Switching from ScrollTimeline -> DocumentTimeline should preserve
+    // current time.
+    sheet1.remove();
+    sheet2.remove();
+    await assert_width(element, '120px');
+  }, 'Switching between document and scroll timelines');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+
+    // Note: #scroller1 is at 20%, and #scroller2 is at 40%.
+    insertScrollTimeline({name: 'timeline1', source: 'selector(#scroller1)'});
+    insertScrollTimeline({name: 'timeline2', source: 'selector(#scroller2)'});
+
+    insertSheet(`
+      .tl1 { animation-timeline: timeline1; }
+      .tl2 { animation-timeline: timeline2; }
+    `);
+
+    await assert_width(element, '100px');
+
+    element.classList.add('tl1');
+    await assert_width(element, '120px');
+
+    element.classList.add('tl2');
+    await assert_width(element, '140px');
+
+    element.classList.remove('tl2');
+    await assert_width(element, '120px');
+
+    // Switching from ScrollTimeline -> DocumentTimeline should preserve
+    // current time.
+    element.classList.remove('tl1');
+    await assert_width(element, '120px');
+
+  }, 'Changing computed value of animation-timeline changes effective timeline');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+
+    insertScrollTimeline({source: 'selector(#scroller1)'});
+
+    insertSheet(`
+      .scroll { animation-timeline: timeline; }
+      .none { animation-timeline: none; }
+    `);
+
+    // DocumentTimeline applies by default.
+    await assert_width(element, '100px');
+
+    // DocumentTimeline -> none
+    element.classList.add('none');
+    await assert_width(element, '0px');
+
+    // none -> DocumentTimeline
+    element.classList.remove('none');
+    await assert_width(element, '100px');
+
+    // DocumentTimeline -> ScrollTimeline
+    element.classList.add('scroll');
+    await assert_width(element, '120px');
+
+    // ScrollTimeline -> none
+    element.classList.add('none');
+    await assert_width(element, '0px');
+
+    // none -> ScrollTimeline
+    element.classList.remove('none');
+    await assert_width(element, '120px');
+  }, 'Changing to/from animation-timeline:none');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    insertScrollTimeline({source: 'selector(#scroller1)'});
+    await assert_width(element, '120px');
+
+    insertScrollTimeline({source: 'selector(#scroller2)'});
+    await assert_width(element, '140px');
+  }, 'Changing the source descriptor switches effective timeline');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    insertScrollTimeline({timeRange: '1e10s'});
+    await assert_width(element, '120px');
+
+    insertScrollTimeline({timeRange: '1e9s'});
+    await assert_width(element, '102px');
+  }, 'Changing the time-range descriptor switches effective timeline');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    insertScrollTimeline({start: '0px'});
+    await assert_width(element, '120px');
+
+    insertScrollTimeline({start: '50px'});
+    await assert_width(element, '0px');
+  }, 'Changing the start descriptor switches effective timeline');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    insertScrollTimeline({end: '100px'});
+    await assert_width(element, '120px');
+
+    insertScrollTimeline({end: '10px'});
+    await assert_width(element, '0px');
+  }, 'Changing the end descriptor switches effective timeline');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    let reverse = insertSheet('#element { animation-direction: reverse; }');
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    // Note: #scroller1 is at 20%.
+    insertScrollTimeline({source: 'selector(#scroller1)'});
+    await assert_width(element, '180px');
+
+    // Note: #scroller1 is at 40%.
+    insertScrollTimeline({source: 'selector(#scroller2)'});
+    await assert_width(element, '160px');
+
+    reverse.remove();
+    await assert_width(element, '140px');
+  }, 'Reverse animation direction');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+    insertSheet('#element { animation-timeline: timeline; }');
+
+    await assert_width(element, '0px');
+
+    // Note: #scroller1 is at 20%.
+    insertScrollTimeline({source: 'selector(#scroller1)'});
+    await assert_width(element, '120px');
+
+    let paused = insertSheet('#element { animation-play-state: paused; }');
+
+    // We should still be at the same position after pausing.
+    await assert_width(element, '120px');
+
+    // Note: #scroller1 is at 40%.
+    insertScrollTimeline({source: 'selector(#scroller2)'});
+
+    // Even when switching timelines, we should be at the same position until
+    // we unpause.
+    await assert_width(element, '120px');
+
+    // Unpausing should synchronize to the scroll position.
+    paused.remove();
+    await assert_width(element, '140px');
+  }, 'Switching timelines while paused');
+
+  dynamic_rule_test(async (t, assert_width) => {
+    let element = insertElement();
+
+    // Note: #scroller1 is at 20%.
+    insertScrollTimeline({source: 'selector(#scroller1)'});
+
+    await assert_width(element, '100px');
+
+    insertSheet(`#element {
+      animation-timeline: timeline;
+      animation-play-state: paused;
+    }`);
+
+    // Pausing should happen before the timeline is modified. (Tentative).
+    // https://github.com/w3c/csswg-drafts/issues/5653
+    await assert_width(element, '100px');
+
+    insertSheet('#element { animation-play-state: running; }');
+    await assert_width(element, '120px');
+  }, 'Switching timelines and pausing at the same time');
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
index 884f2ab5ed7..0d591ea3707 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
@@ -77,6 +77,12 @@
     start: selector(#offset_display_none);
     end: auto;
   }
+  @scroll-timeline timeline_null_target {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#no_such_id);
+    end: selector(#no_such_id);
+  }
 
   #container > div {
     width: 0px;
@@ -97,6 +103,7 @@
   #element_50px_end { animation-timeline: timeline_50px_end; }
   #element_outside { animation-timeline: timeline_outside; }
   #element_display_none { animation-timeline: timeline_display_none; }
+  #element_null_target { animation-timeline: timeline_null_target; }
 </style>
 <div id=scroller>
   <div id=contents>
@@ -119,6 +126,7 @@
   <div id=element_50px_end></div>
   <div id=element_outside></div>
   <div id=element_display_none></div>
+  <div id=element_null_target></div>
 </div>
 <script>
 
@@ -238,4 +246,12 @@
   test_width_at_scroll_top(element_display_none, 400, '0px');
   test_width_at_scroll_top(element_display_none, 450, '0px');
 
+  // Target of element-based offset is null (=> no effect value)
+  test_width_at_scroll_top(element_null_target, 0, '0px');
+  test_width_at_scroll_top(element_null_target, 100, '0px');
+  test_width_at_scroll_top(element_null_target, 200, '0px');
+  test_width_at_scroll_top(element_null_target, 300, '0px');
+  test_width_at_scroll_top(element_null_target, 400, '0px');
+  test_width_at_scroll_top(element_null_target, 450, '0px');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-offset-invalidation.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-offset-invalidation.tentative.html
new file mode 100644
index 00000000000..5a560ad004c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-offset-invalidation.tentative.html
@@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<title>@scroll-timeline element offset invalidation</title>
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#typedef-element-offset">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  #scroller {
+    overflow: scroll;
+    width: 100px;
+    height: 100px;
+  }
+  #scroller > div {
+    height: 50px;
+  }
+  @keyframes expand {
+    from { width: 100px; }
+    to { width: 200px; }
+  }
+  @scroll-timeline timeline {
+    source: selector(#scroller);
+    time-range: 1e10s;
+    start: selector(#offset1) end;
+    end: selector(#offset2) end;
+  }
+  #element {
+    width: 0px;
+    height: 20px;
+    animation: expand 1e10s linear;
+    animation-timeline: timeline;
+  }
+  /* Ensure stable expectations if feature is not supported */
+  @supports not (animation-timeline:foo) {
+    #element { animation-play-state: paused; }
+  }
+</style>
+<div id=scroller></div>
+<div id=element></div>
+<p class=sibling1></p>
+<p class=sibling2></p>
+<script>
+
+  function setup() {
+    while (scroller.firstChild)
+      scroller.firstChild.remove();
+    for (let i = 0; i < 10; i++)
+      scroller.append(document.createElement('div'));
+  }
+
+  // The contents of the scroller look like this:
+  //
+  //  +-------+
+  //  | 50px  | div (0)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (1)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (2)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (3)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (4)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (5)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (6)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (7)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (8)
+  //  +-------+
+  //  +-------+
+  //  | 50px  | div (9)
+  //  +-------+
+  //
+  // The height of the scrollport is 100px.
+
+  function invalidation_test(func, description) {
+    promise_test(async (t) => {
+      setup();
+      await func();
+    }, description);
+  }
+
+  function remove(id) {
+    let old_element = document.getElementById(id);
+    if (old_element)
+      old_element.removeAttribute('id');
+  }
+
+  function reassign(id, element) {
+    remove(id);
+    element.setAttribute('id', id);
+  }
+
+  async function assert_element_width_at_scroll(expected_width, scroll) {
+    scroller.scrollTop = scroll;
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(element).width, expected_width);
+  }
+
+  invalidation_test(async () => {
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Offsets missing');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    // [100, 150]
+    reassign('offset1', scroller.children[4]);
+    await assert_element_width_at_scroll('100px', 100);
+  }, 'Change first offset');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    // [50, 250]
+    reassign('offset2', scroller.children[7]);
+    await assert_element_width_at_scroll('125px', 100);
+  }, 'Change second offset');
+
+  invalidation_test(async () => {
+    // [50, 250]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[7]);
+    await assert_element_width_at_scroll('125px', 100);
+
+    // [0, 200]
+    reassign('offset1', scroller.children[2]);
+    reassign('offset2', scroller.children[4]);
+    await assert_element_width_at_scroll('150px', 50);
+  }, 'Change both offsets');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    remove('offset1');
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Remove first offset');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    remove('offset2');
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Remove second offset');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    remove('offset1');
+    remove('offset2');
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Remove both offsets');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    reassign('offset1', document.querySelector('.sibling1'));
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Reassign first offset to sibling of scroller');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    reassign('offset2', document.querySelector('.sibling2'));
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Reassign second offset to sibling of scroller');
+
+  invalidation_test(async () => {
+    // [50, 150]
+    reassign('offset1', scroller.children[3]);
+    reassign('offset2', scroller.children[5]);
+    await assert_element_width_at_scroll('150px', 100);
+
+    reassign('offset1', document.querySelector('.sibling1'));
+    reassign('offset2', document.querySelector('.sibling2'));
+    await assert_element_width_at_scroll('0px', 0);
+  }, 'Reassign both offsets to sibling of scroller');
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
index 9bc49d284b8..345633cb927 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
@@ -5,12 +5,18 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
 <style>
-  #scroller {
+  #scroller_horizontal_tb, #scroller_vertical_lr{
     overflow: scroll;
     width: 100px;
     height: 100px;
   }
-  #contents {
+  #scroller_horizontal_tb {
+    writing-mode: horizontal-tb;
+  }
+  #scroller_vertical_lr {
+    writing-mode: vertical-lr;
+  }
+  .contents {
     height: 300px;
     width: 300px;
   }
@@ -19,35 +25,49 @@
     to { width: 200px; }
   }
   @scroll-timeline timeline_auto {
-    source: selector(#scroller);
+    source: selector(#scroller_horizontal_tb);
     orientation: auto;
     time-range: 10s;
     start: 0px;
     end: 100px;
   }
   @scroll-timeline timeline_vertical {
-    source: selector(#scroller);
+    source: selector(#scroller_horizontal_tb);
     orientation: vertical;
     time-range: 10s;
     start: 0px;
     end: 100px;
   }
   @scroll-timeline timeline_horizontal {
-    source: selector(#scroller);
+    source: selector(#scroller_horizontal_tb);
     orientation: horizontal;
     time-range: 10s;
     start: 0px;
     end: 100px;
   }
-  @scroll-timeline timeline_block {
-    source: selector(#scroller);
+  @scroll-timeline timeline_block_in_horizontal {
+    source: selector(#scroller_horizontal_tb);
     orientation: block;
     time-range: 10s;
     start: 0px;
     end: 100px;
   }
-  @scroll-timeline timeline_inline {
-    source: selector(#scroller);
+  @scroll-timeline timeline_inline_in_horizontal {
+    source: selector(#scroller_horizontal_tb);
+    orientation: inline;
+    time-range: 10s;
+    start: 0px;
+    end: 100px;
+  }
+  @scroll-timeline timeline_block_in_vertical {
+    source: selector(#scroller_vertical_lr);
+    orientation: block;
+    time-range: 10s;
+    start: 0px;
+    end: 100px;
+  }
+  @scroll-timeline timeline_inline_in_vertical {
+    source: selector(#scroller_vertical_lr);
     orientation: inline;
     time-range: 10s;
     start: 0px;
@@ -63,33 +83,36 @@
   @supports not (animation-timeline:foo) {
     #container > div { animation-play-state: paused; }
   }
-  .horizontal { writing-mode: horizontal-tb; }
-  .vertical { writing-mode: vertical-lr; }
   #element_auto { animation-timeline: timeline_auto; }
   #element_vertical { animation-timeline: timeline_vertical; }
   #element_horizontal { animation-timeline: timeline_horizontal; }
-  #element_block_in_horizontal { animation-timeline: timeline_block; }
-  #element_inline_in_horizontal { animation-timeline: timeline_inline; }
-  #element_block_in_vertical { animation-timeline: timeline_block; }
-  #element_inline_in_vertical { animation-timeline: timeline_inline; }
+  #element_block_in_horizontal { animation-timeline: timeline_block_in_horizontal; }
+  #element_inline_in_horizontal { animation-timeline: timeline_inline_in_horizontal; }
+  #element_block_in_vertical { animation-timeline: timeline_block_in_vertical; }
+  #element_inline_in_vertical { animation-timeline: timeline_inline_in_vertical; }
 </style>
-<div id=scroller>
-  <div id=contents></div>
+<div id=scroller_horizontal_tb>
+  <div class=contents></div>
+</div>
+<div id=scroller_vertical_lr>
+  <div class=contents></div>
 </div>
 <div id=container>
   <div id=element_auto></div>
   <div id=element_vertical></div>
   <div id=element_horizontal></div>
-  <div id=element_block_in_horizontal class="horizontal"></div>
-  <div id=element_inline_in_horizontal class="horizontal"></div>
-  <div id=element_block_in_vertical class="vertical"></div>
-  <div id=element_inline_in_vertical class="vertical"></div>
+  <div id=element_block_in_horizontal></div>
+  <div id=element_inline_in_horizontal></div>
+  <div id=element_block_in_vertical></div>
+  <div id=element_inline_in_vertical></div>
 </div>
 <script>
-  // Animations linked to a vertical scroll-timelines are at 75% progress.
-  scroller.scrollTop = 75;
-  // Animations linked to a horizontal scroll-timelines are at 25% progress.
-  scroller.scrollLeft = 25;
+  // Animations linked to vertical scroll-timelines are at 75% progress.
+  scroller_horizontal_tb.scrollTop = 75;
+  scroller_vertical_lr.scrollTop = 75;
+  // Animations linked to horizontal scroll-timelines are at 25% progress.
+  scroller_horizontal_tb.scrollLeft = 25;
+  scroller_vertical_lr.scrollLeft = 25;
 
   promise_test(async (t) => {
     await waitForNextFrame();
@@ -118,13 +141,13 @@
 
   promise_test(async (t) => {
     await waitForNextFrame();
-    assert_equals(getComputedStyle(element_block_in_vertical).writingMode, 'vertical-lr');
+    assert_equals(getComputedStyle(scroller_vertical_lr).writingMode, 'vertical-lr');
     assert_equals(getComputedStyle(element_block_in_vertical).width, '125px');
   }, 'Orientation block behaves as expected in vertical writing-mode');
 
   promise_test(async (t) => {
     await waitForNextFrame();
-    assert_equals(getComputedStyle(element_inline_in_vertical).writingMode, 'vertical-lr');
+    assert_equals(getComputedStyle(scroller_vertical_lr).writingMode, 'vertical-lr');
     assert_equals(getComputedStyle(element_inline_in_vertical).width, '175px');
   }, 'Orientation inline behaves as expected in vertical writing-mode');
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source-invalidation.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source-invalidation.tentative.html
new file mode 100644
index 00000000000..5f9561c4f5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source-invalidation.tentative.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<title>@scroll-timeline source invalidation</title>
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-at-rule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  #scrollers {
+    overflow: hidden;
+    height: 0;
+  }
+  .scroller {
+    overflow: scroll;
+    width: 100px;
+    height: 100px;
+  }
+  .contents {
+    height: 200px;
+  }
+  @keyframes expand {
+    from { width: 100px; }
+    to { width: 200px; }
+  }
+  @scroll-timeline timeline {
+    source: selector(#scroller);
+    time-range: 1e10s;
+    start: 0px;
+    end: 100px;
+  }
+  #element {
+    width: 0px;
+    height: 20px;
+    animation: expand 1e10s linear;
+    animation-timeline: timeline;
+  }
+  /* Ensure stable expectations if feature is not supported */
+  @supports not (animation-timeline:foo) {
+    #element { animation-play-state: paused; }
+  }
+</style>
+<div id=scrollers></div>
+<div id=element></div>
+<script>
+
+  function createScroller() {
+    let scroller = document.createElement('div');
+    let contents = document.createElement('div');
+    scroller.classList.add('scroller');
+    contents.classList.add('contents');
+    scroller.append(contents);
+    return scroller;
+  }
+
+  function wrapInDiv(element) {
+    let div = document.createElement('div');
+    div.append(element);
+    return div;
+  }
+
+  function scrollerAt(n) {
+    return document.querySelectorAll('.scroller')[n];
+  }
+
+  // Resets #scrollers to a state where it has three .scroller children with
+  // scrollTop offsets 10, 20 and 30.
+  function cleanup() {
+    while (scrollers.firstChild)
+      scrollers.firstChild.remove();
+
+    for (let i = 0; i < 3; i++)
+      scrollers.append(createScroller());
+
+    scrollerAt(0).scrollTop = 10;
+    scrollerAt(1).scrollTop = 20;
+    scrollerAt(2).scrollTop = 30;
+  }
+
+  // Do an initial "cleanup" to set up the first test.
+  cleanup();
+
+  function invalidation_test(func, description) {
+    promise_test(async (t) => {
+      t.add_cleanup(cleanup);
+      await func();
+    }, description);
+  }
+
+  invalidation_test(() => {
+    assert_equals(getComputedStyle(element).width, '0px');
+  }, 'Nonexistent source');
+
+  invalidation_test(() => {
+    assert_equals(getComputedStyle(element).width, '0px');
+    scrollerAt(0).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '110px');
+    scrollerAt(1).setAttribute('id', 'scroller'); // No effect
+    assert_equals(getComputedStyle(element).width, '110px');
+    scrollerAt(2).setAttribute('id', 'scroller'); // No effect
+    assert_equals(getComputedStyle(element).width, '110px');
+  }, 'Setting id attribute');
+
+  invalidation_test(() => {
+    assert_equals(getComputedStyle(element).width, '0px');
+    scrollerAt(0).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '110px');
+    scrollerAt(0).removeAttribute('id');
+    assert_equals(getComputedStyle(element).width, '0px');
+  }, 'Removing id attribute');
+
+  invalidation_test(() => {
+    assert_equals(getComputedStyle(element).width, '0px');
+    scrollerAt(2).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '130px');
+    scrollerAt(1).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '120px');
+    scrollerAt(0).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '110px');
+  }, 'Setting id attribute earlier in the tree');
+
+  invalidation_test(async () => {
+    assert_equals(getComputedStyle(element).width, '0px');
+
+    // Appending a new element with id 'scroller' already set before
+    // insertion into the tree.
+    let scroller = createScroller();
+    scroller.setAttribute('id', 'scroller');
+    scrollers.append(scroller);
+
+    // Make sure |scroller| has a layout box.
+    //
+    // https://drafts.csswg.org/scroll-animations-1/#avoiding-cycles
+    //
+    // TODO: Depending on the outcome of Issue 5261, the call to offsetTop
+    // might be unnecessary.
+    // https://github.com/w3c/csswg-drafts/issues/5261
+    scroller.offsetTop;
+    await waitForNextFrame();
+
+    assert_equals(getComputedStyle(element).width, '100px');
+  }, 'Appending a new element');
+
+  invalidation_test(async () => {
+    assert_equals(getComputedStyle(element).width, '0px');
+
+    let scroller = createScroller();
+    scroller.setAttribute('id', 'scroller');
+    scrollers.append(wrapInDiv(wrapInDiv(scroller)));
+    await waitForNextFrame();
+
+    assert_equals(getComputedStyle(element).width, '100px');
+  }, 'Inserting a subtree with #scroller descendant');
+
+  invalidation_test(() => {
+    assert_equals(getComputedStyle(element).width, '0px');
+
+    scrollerAt(0).setAttribute('id', 'scroller');
+    scrollerAt(1).setAttribute('id', 'scroller');
+    scrollerAt(2).setAttribute('id', 'scroller');
+    assert_equals(getComputedStyle(element).width, '110px');
+
+    scrollerAt(0).remove();
+    assert_equals(getComputedStyle(element).width, '120px');
+
+    scrollerAt(0).remove();
+    assert_equals(getComputedStyle(element).width, '130px');
+
+    scrollerAt(0).remove();
+    assert_equals(getComputedStyle(element).width, '0px');
+  }, 'Removing source element');
+
+  invalidation_test(async () => {
+    assert_equals(getComputedStyle(element).width, '0px');
+
+    // Create a chain: #scrollers -> div -> div -> #scroller
+    let scroller = createScroller();
+    let div = wrapInDiv(wrapInDiv(scroller));
+    scrollers.append(div);
+    scroller.setAttribute('id', 'scroller');
+    scroller.scrollTop = 50;
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(element).width, '150px');
+
+    div.remove();
+    assert_equals(getComputedStyle(element).width, '0px');
+  }, 'Removing ancestor of source element');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml b/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
index 4fa69e871bc..578b769455b 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
@@ -515,9 +515,9 @@ tasks:
         run-job:
           - wpt_integration
 
-  - resources/ tests:
+  - resources/ tests (Python 2):
       description: >-
-        Tests for testharness.js and other files in resources/
+        Tests for testharness.js and other files in resources/ under Python 2.7
       use:
         - wpt-base
         - trigger-pr
@@ -531,6 +531,46 @@ tasks:
       schedule-if:
         run-job:
           - resources_unittest
+  
+  - resources/ tests (Python 3.6):
+      description: >-
+        Tests for testharness.js and other files in resources/ under Python 3.6
+      use:
+        - wpt-base
+        - trigger-pr
+        - tox-python3
+      command: ./tools/ci/ci_resources_unittest.sh
+      install:
+        - libnss3-tools
+        - python3.6
+        - python3.6-dev
+      options:
+        browser:
+          - firefox
+        xvfb: true
+        hosts: true
+      schedule-if:
+        run-job:
+          - resources_unittest
+
+  - resources/ tests (Python 3.8):
+      description: >-
+        Tests for testharness.js and other files in resources/ under Python 3.8
+      use:
+        - wpt-base
+        - trigger-pr
+        - tox-python38
+      command: ./tools/ci/ci_resources_unittest.sh
+      install:
+        - libnss3-tools
+      options:
+        browser:
+          - firefox
+        xvfb: true
+        hosts: true
+      schedule-if:
+        run-job:
+          - resources_unittest
 
   - infrastructure/ tests:
       description: >-
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py b/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
index 472f83f86a0..4f6bcc2f0a8 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
@@ -136,7 +136,9 @@ def test_verify_payload():
       'tools/ integration tests (Python 2)',
       'tools/ integration tests (Python 3.6)',
       'tools/ integration tests (Python 3.8)',
-      'resources/ tests',
+      'resources/ tests (Python 2)',
+      'resources/ tests (Python 3.6)',
+      'resources/ tests (Python 3.8)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'infrastructure/ tests (Python 3)',
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
index 7567e81ada5..4893d7bd628 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
@@ -5,6 +5,6 @@ mozdebug==0.2
 # Pillow 7 requires Python 3
 pillow==6.2.2; python_version <= '2.7'  # pyup: <7.0
 pillow==8.0.1; python_version >= '3.0'
-urllib3[secure]==1.25.10
+urllib3[secure]==1.25.11
 requests==2.24.0
 six==1.15.0
diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html b/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html
index db662bd9289..5277fbba92f 100644
--- a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html
+++ b/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html
@@ -2,7 +2,6 @@
 <html>
 <title>Test that video.rVFC callbacks started before an XRSession work.</title>
 <body>
-    <canvas/>
 </body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html
index af1898cac2e..87f7556007d 100644
--- a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html
+++ b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html
index a2f43878181..686eacf8487 100644
--- a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html
+++ b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html
index 1625538d754..dd03be0ad5b 100644
--- a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html
+++ b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html
index d3cc4c72dd2..6eb6bc76e64 100644
--- a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html
+++ b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html
index 1872cf527b8..83695498529 100644
--- a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html
+++ b/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html b/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html
index 1be56dd60ec..9984ee589d7 100644
--- a/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html
+++ b/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="../resources/webxr_util.js"></script>
   <script src="../resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
     xr_session_promise_test(
       "Tests requestSession accepts immersive-ar mode",
diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html b/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html
index 28f31da7827..beff66586c7 100644
--- a/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html
+++ b/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="../resources/webxr_util.js"></script>
   <script src="../resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
     xr_session_promise_test(
       "Tests environmentBlendMode for an AR device",
diff --git a/tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html b/tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html
index ecb4b022bf0..f7ef86c2732 100644
--- a/tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Input sources are re-created when handedness or target ray mode changes";
diff --git a/tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html b/tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html
index 7c784c34479..b2a17d4e17a 100644
--- a/tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Transient input sources fire events in the right order";
diff --git a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html b/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html
index 9643bf61c87..d12d8f77379 100644
--- a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html
@@ -3,7 +3,6 @@
 <script src=/resources/testharnessreport.js></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let immersiveTestName = "XRSession resetpose from a device properly fires off " +
diff --git a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html b/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html
index b3abcc817bd..a445886a52d 100644
--- a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html
@@ -3,7 +3,6 @@
 <script src=/resources/testharnessreport.js></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let nonImmersiveTestName = "XRSession resetpose from a device properly fires off " +
diff --git a/tests/wpt/web-platform-tests/webxr/events_session_select.https.html b/tests/wpt/web-platform-tests/webxr/events_session_select.https.html
index f83d3c4f854..9b7402d2b65 100644
--- a/tests/wpt/web-platform-tests/webxr/events_session_select.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_session_select.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRInputSources primary input presses properly fires off the "
diff --git a/tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html b/tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html
index 96fa11713dd..b7615c3d0b4 100644
--- a/tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Ensures that an XRInputSources primary input being pressed and "
diff --git a/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html b/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html
index 101f1dc7c88..122fe340a27 100644
--- a/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html
+++ b/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRInputSources primary input presses properly fires off the "
diff --git a/tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html b/tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html
index f76847a8769..c1c52f03746 100644
--- a/tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let immersiveTestName = "XRSession requestAnimationFrame must fail if the session has "
@@ -21,7 +20,6 @@ let testFunction = (session, controller, t, sessionObjects) => new Promise((reso
   session.updateRenderState({
     baseLayer: null
   });
-  let webglCanvas = document.getElementsByTagName('canvas')[0];
   let gl = sessionObjects.gl;
 
   // Session must have a baseLayer or frame requests will be ignored.
diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html b/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html
index f69f943b5b5..bd69649d443 100644
--- a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html
+++ b/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="../resources/webxr_util.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "WebXR InputSource's gamepad gets disconnected when the input source is removed";
diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html b/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html
index 1ff9dcf3b40..28f30846711 100644
--- a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html
+++ b/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="../resources/webxr_util.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "WebXR InputSource's gamepad properly registers input";
diff --git a/tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html b/tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html
index c5c13fd08f4..9dbaf3b629d 100644
--- a/tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html
+++ b/tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html b/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
index 30dbe4c5304..302dc399eee 100644
--- a/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html b/tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html
index acba79136a2..7bffaf51a5f 100644
--- a/tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html
+++ b/tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
index 66f22b1f0c4..5e7381df02d 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
index d419055ab26..dcd1d717883 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html
index f1c223ae749..465e1611039 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html
index 0678ff55cef..9f5513fd1e7 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html
index accd4bbf70f..e8a83a62a60 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
index e38e9c601b3..04df1324066 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
@@ -5,7 +5,6 @@
 <script src="../resources/webxr_test_asserts.js"></script>
 <script src="../resources/webxr_test_constants.js"></script>
 <script src="../resources/webxr_test_constants_fake_world.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html
index 56cd65c4e42..2c3ea541a97 100644
--- a/tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Navigator.xr meets [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/render_state_update.https.html b/tests/wpt/web-platform-tests/webxr/render_state_update.https.html
index 2f28d442ec9..3801a42947a 100644
--- a/tests/wpt/web-platform-tests/webxr/render_state_update.https.html
+++ b/tests/wpt/web-platform-tests/webxr/render_state_update.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let fakeDeviceInitParams = TRACKED_IMMERSIVE_DEVICE;
diff --git a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html b/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html
index 485438cabf6..c09cd7c174d 100644
--- a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html
+++ b/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let testName = "inlineVerticalFieldOfView is set appropriately on immersively sessions";
diff --git a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html b/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html
index 8bf384f4f15..3b33fb15c31 100644
--- a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html
+++ b/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let testName = "inlineVerticalFieldOfView is set appropriately on inline sessions";
diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
index aa45e257db6..fc4ca7d0d37 100644
--- a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
+++ b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
@@ -13,7 +13,7 @@
 // override this.
 var xr_debug = function(name, msg) {};
 
-function xr_promise_test(name, func, properties) {
+function xr_promise_test(name, func, properties, glContextType, glContextProperties) {
   promise_test(async (t) => {
     // Perform any required test setup:
     xr_debug(name, 'setup');
@@ -49,6 +49,14 @@ function xr_promise_test(name, func, properties) {
     // we can hopefully provide a clearer indication of what went wrong.
     assert_implements(navigator.xr.test, 'missing navigator.xr.test, even after attempted load');
 
+    let gl = null;
+    let canvas = null;
+    if (glContextType) {
+      canvas = document.createElement('canvas');
+      document.body.appendChild(canvas);
+      gl = canvas.getContext(glContextType, glContextProperties);
+    }
+
     // Ensure that any devices are disconnected when done. If this were done in
     // a .then() for the success case, a test that expected failure would
     // already be marked done at the time that runs and the shutdown would
@@ -60,7 +68,7 @@ function xr_promise_test(name, func, properties) {
     });
 
     xr_debug(name, 'main');
-    return func(t);
+    return func(t, gl);
   }, name, properties);
 }
 
@@ -79,80 +87,80 @@ function requestSkipAnimationFrame(session, callback) {
 // A test function which runs through the common steps of requesting a session.
 // Calls the passed in test function with the session, the controller for the
 // device, and the test object.
-// Requires a webglCanvas on the page.
 function xr_session_promise_test(
     name, func, fakeDeviceInit, sessionMode, sessionInit, properties, glcontextPropertiesParam, gllayerPropertiesParam) {
-  let testDeviceController;
-  let testSession;
-  let sessionObjects = {};
   const glcontextProperties = (glcontextPropertiesParam) ? glcontextPropertiesParam : {};
   const gllayerProperties = (gllayerPropertiesParam) ? gllayerPropertiesParam : {};
 
-  const webglCanvas = document.getElementsByTagName('canvas')[0];
-  // We can't use assert_true here because it causes the wpt testharness to treat
-  // this as a test page and not as a test.
-  if (!webglCanvas) {
-    promise_test(async (t) => {
-      Promise.reject('xr_session_promise_test requires a canvas on the page!');
-    }, name, properties);
+  function runTest(t, glContext) {
+    let testSession;
+    let testDeviceController;
+    let sessionObjects = {gl: glContext};
+
+    // Ensure that any pending sessions are ended when done. This needs to
+    // use a cleanup function to ensure proper sequencing. If this were
+    // done in a .then() for the success case, a test that expected
+    // failure would already be marked done at the time that runs, and the
+    // shutdown would interfere with the next test which may have started.
+    t.add_cleanup(async () => {
+      // If a session was created, end it.
+      if (testSession) {
+        await testSession.end().catch(() => {});
+      }
+    });
+
+    return navigator.xr.test.simulateDeviceConnection(fakeDeviceInit)
+        .then((controller) => {
+          testDeviceController = controller;
+          return sessionObjects.gl.makeXRCompatible();
+        })
+        .then(() => new Promise((resolve, reject) => {
+                // Perform the session request in a user gesture.
+                xr_debug(name, 'simulateUserActivation');
+                navigator.xr.test.simulateUserActivation(() => {
+                  xr_debug(name, 'document.hasFocus()=' + document.hasFocus());
+                  navigator.xr.requestSession(sessionMode, sessionInit || {})
+                      .then((session) => {
+                        xr_debug(name, 'session start');
+                        testSession = session;
+                        session.mode = sessionMode;
+                        let glLayer = new XRWebGLLayer(session, sessionObjects.gl, gllayerProperties);
+                        glLayer.context = sessionObjects.gl;
+                        // Session must have a baseLayer or frame requests
+                        // will be ignored.
+                        session.updateRenderState({
+                            baseLayer: glLayer
+                        });
+                        sessionObjects.glLayer = glLayer;
+                        xr_debug(name, 'session.visibilityState=' + session.visibilityState);
+                        resolve(func(session, testDeviceController, t, sessionObjects));
+                      })
+                      .catch((err) => {
+                        xr_debug(name, 'error: ' + err);
+                        reject(
+                            'Session with params ' +
+                            JSON.stringify(sessionMode) +
+                            ' was rejected on device ' +
+                            JSON.stringify(fakeDeviceInit) +
+                            ' with error: ' + err);
+                      });
+                });
+        }));
   }
-  let gl = webglCanvas.getContext('webgl', {alpha: false, antialias: false, ...glcontextProperties});
-  sessionObjects.gl = gl;
 
   xr_promise_test(
-      name,
-      (t) => {
-          // Ensure that any pending sessions are ended when done. This needs to
-          // use a cleanup function to ensure proper sequencing. If this were
-          // done in a .then() for the success case, a test that expected
-          // failure would already be marked done at the time that runs, and the
-          // shutdown would interfere with the next test which may have started.
-          t.add_cleanup(async () => {
-            // If a session was created, end it.
-            if (testSession) {
-              await testSession.end().catch(() => {});
-            }
-          });
-
-          return navigator.xr.test.simulateDeviceConnection(fakeDeviceInit)
-              .then((controller) => {
-                testDeviceController = controller;
-                return gl.makeXRCompatible();
-              })
-              .then(() => new Promise((resolve, reject) => {
-                      // Perform the session request in a user gesture.
-                      xr_debug(name, 'simulateUserActivation');
-                      navigator.xr.test.simulateUserActivation(() => {
-                        xr_debug(name, 'document.hasFocus()=' + document.hasFocus());
-                        navigator.xr.requestSession(sessionMode, sessionInit || {})
-                            .then((session) => {
-                              xr_debug(name, 'session start');
-                              testSession = session;
-                              session.mode = sessionMode;
-                              let glLayer = new XRWebGLLayer(session, gl, gllayerProperties);
-                              glLayer.context = gl;
-                              // Session must have a baseLayer or frame requests
-                              // will be ignored.
-                              session.updateRenderState({
-                                  baseLayer: glLayer
-                              });
-                              sessionObjects.glLayer = glLayer;
-                              xr_debug(name, 'session.visibilityState=' + session.visibilityState);
-                              resolve(func(session, testDeviceController, t, sessionObjects));
-                            })
-                            .catch((err) => {
-                              xr_debug(name, 'error: ' + err);
-                              reject(
-                                  'Session with params ' +
-                                  JSON.stringify(sessionMode) +
-                                  ' was rejected on device ' +
-                                  JSON.stringify(fakeDeviceInit) +
-                                  ' with error: ' + err);
-                            });
-                      });
-              }));
-      },
-      properties);
+    name + ' - webgl',
+    runTest,
+    properties,
+    'webgl',
+    {alpha: false, antialias: false, ...glcontextProperties}
+    );
+  xr_promise_test(
+    name + ' - webgl2',
+    runTest,
+    properties,
+    'webgl2',
+    {alpha: false, antialias: false, ...glcontextProperties});
 }
 
 
diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
index 2b3a1fccc45..e3e83a50eee 100644
--- a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
+++ b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
@@ -4,36 +4,49 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas id="webgl-canvas"></canvas>
   <script>
-    xr_promise_test("Creating a webglCanvasContext with no device",
-      (t) => {
-        let webglCanvas = document.createElement('canvas');
-        let gl = webglCanvas.getContext('webgl');
 
-        assert_false(gl.getContextAttributes().xrCompatible);
-        return promise_rejects_dom(t, "InvalidStateError", gl.makeXRCompatible());
+    function testNoDevice(t, gl) {
+      assert_false(gl.getContextAttributes().xrCompatible);
+      return promise_rejects_dom(t, "InvalidStateError", gl.makeXRCompatible());
+    }
+
+    xr_promise_test("Creating a webgl context with no device",
+      testNoDevice, null, 'webgl');
+
+    xr_promise_test("Creating a webgl2 context with no device",
+      testNoDevice, null, 'webgl2');
+
+    function testXrCompatible(t, gl) {
+      let offscreenGl = null;
+      let offscreenGl2 = null;
+      return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
+        .then( (controller) => {
+          return gl.makeXRCompatible();
+        }).then( () => {
+          assert_true(gl.getContextAttributes().xrCompatible);
+
+          // Check that an offscreen webgl context behaves no different.
+          let offscreenCanvas = document.createElement('canvas');
+          offscreenGl = offscreenCanvas.getContext('webgl');
+          return offscreenGl.makeXRCompatible();
+        }).then( () => {
+          assert_true(offscreenGl.getContextAttributes().xrCompatible);
+
+          // Check that an offscreen webgl2 context behaves no different.
+          let offscreenCanvas = document.createElement('canvas');
+          offscreenGl2 = offscreenCanvas.getContext('webgl2');
+          return offscreenGl2.makeXRCompatible();
+      }).then( () => {
+          assert_true(offscreenGl2.getContextAttributes().xrCompatible);
       });
+    }
 
-    xr_promise_test("An XR-compatible webglCanvasContext can be created",
-      (t) => {
-        let gl = null;
-        let offscreenGl = null;
-        return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
-          .then( (controller) => {
-            let webglCanvas = document.getElementById('webgl-canvas');
-            gl = webglCanvas.getContext('webgl');
-            return gl.makeXRCompatible();
-          }).then( () => {
-            assert_true(gl.getContextAttributes().xrCompatible);
+    xr_promise_test("An XR-compatible webgl context can be created",
+      testXrCompatible, null, 'webgl');
+
+    xr_promise_test("An XR-compatible webgl2 context can be created",
+      testXrCompatible, null, 'webgl2');
 
-            // Check that an offscreen context behaves no different.
-            let offscreenCanvas = document.createElement('canvas');
-            offscreenGl = offscreenCanvas.getContext('webgl');
-            return offscreenGl.makeXRCompatible();
-          }).then( () => {
-            assert_true(offscreenGl.getContextAttributes().xrCompatible);
-          });
-      });
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html
index 0e59807cb4c..354c6147927 100644
--- a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html
+++ b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html
@@ -4,22 +4,25 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas id="webgl-canvas"></canvas>
   <script>
 
-    xr_promise_test(
-      "A lost webglCanvasContext should not be able to set xr compatibility",
-     (t) => {
+    function testContextLost(t, gl) {
       return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
         .then( (controller) => {
-          webglCanvas = document.getElementById('webgl-canvas');
-          gl = webglCanvas.getContext('webgl');
           return gl.makeXRCompatible();
         }).then( () => {
           gl.getExtension('WEBGL_lose_context').loseContext();
           return promise_rejects_dom(t, 'InvalidStateError', gl.makeXRCompatible());
         });
-    });
+    }
+
+    xr_promise_test(
+      "A lost webgl context should not be able to set xr compatibility",
+      testContextLost, null, 'webgl');
+
+    xr_promise_test(
+      "A lost webgl2 context should not be able to set xr compatibility",
+      testContextLost, null, 'webgl2');
 
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html
index f412c6fb2e0..f54a878d45d 100644
--- a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html
+++ b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html
@@ -5,11 +5,8 @@
 <script src="resources/webxr_util.js"></script>
 <script>
 
-xr_promise_test(
-  "Verify promise from a non-reentrant to makeXRCompatible() is resolved",
-  (t) => {
-    var gl = document.createElement('canvas').getContext('webgl');
-    return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
+function testNonReentrant(t, gl) {
+  return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
       .then((controller) => {
         assert_false(gl.getContextAttributes().xrCompatible);
         return gl.makeXRCompatible();
@@ -19,13 +16,17 @@ xr_promise_test(
       }).then(() => {
         assert_true(gl.getContextAttributes().xrCompatible);
       });
-  });
+}
 
 xr_promise_test(
-  "Verify promises from reentrant calls to makeXRCompatible() are resolved",
-  (t) => {
-    var gl = document.createElement('canvas').getContext('webgl');
-    return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
+  "Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl",
+  testNonReentrant, null, 'webgl');
+xr_promise_test(
+  "Verify promise from a non-reentrant call to makeXRCompatible() is resolved for webgl2",
+  testNonReentrant, null, 'webgl2');
+
+function testReentrant(t, gl) {
+  return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
       .then((controller) => {
         assert_false(gl.getContextAttributes().xrCompatible);
 
@@ -35,6 +36,13 @@ xr_promise_test(
       }).then(() => {
         assert_true(gl.getContextAttributes().xrCompatible);
       });
-  });
+}
+
+xr_promise_test(
+  "Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl",
+  testReentrant, null, 'webgl');
+xr_promise_test(
+  "Verify promises from reentrant calls to makeXRCompatible() are resolved for webgl2",
+  testReentrant, null, 'webgl2');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html b/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
index bb4cb2c4c4c..c5f9b7f325a 100644
--- a/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 let testName =
diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html b/tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html
index ace64e8f412..644a4d68e43 100644
--- a/tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     const testName = "Immersive session ends when device is disconnected";
diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html b/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html
index be0bb32995b..6ff88216708 100644
--- a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
     xr_session_promise_test(
       "Tests requestSession resolves when supported",
diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html b/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html
index 0071b81e828..f7737624a6f 100644
--- a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
     xr_session_promise_test(
       "Tests requestSession accepts XRSessionInit dictionary",
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
index 1f3e3765df4..9cd7922f64f 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html
index 7d26983fc96..05cbf785237 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html
@@ -5,7 +5,6 @@
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
   <script src="resources/webxr_test_asserts.js"></script>
-  <canvas></canvas>
 
   <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
index 7c71f0af3dd..e457ef020fd 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     let immersiveTestName = "XRFrame methods throw exceptions outside of the " +
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html
index cbbef68713b..d1d4beb1647 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRFrame.session meets [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html b/tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html
index 7764017910d..00253311982 100644
--- a/tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html b/tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html
index 2bc21ffe6c3..8a4aec48a84 100644
--- a/tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html b/tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html
index f55e682b675..de70c9058fe 100644
--- a/tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "WebXR InputSource's profiles list can be set";
diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html
index 305e5f9e0fc..999b4d82b6f 100644
--- a/tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRInputSource attributes meet [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html
index 8e2239cff16..9ea07fcd3bf 100644
--- a/tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRPose.transform meets [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
index f6929f27af0..d93f696a2da 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Updating XRReferenceSpace origin offset updates view and input matrices.";
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
index 7ce4acafd35..e0373536062 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
index 5cd0f027266..8a9fb344a38 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Creating XRReferenceSpace origin offset off of `viewer` space works.";
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html
index f97ca6639f7..5b680fb8618 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html
@@ -5,7 +5,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 <script>
 let testName =
   "Bounded space, viewer space, local and local-floor space have correct poses w.r.t. each other";
diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html
index 5e055efc41b..fbea1c1ccb3 100644
--- a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 <script>
 
 let testName = "XRRigidTransform constructor works";
diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html
index 79acca9ae1a..cd5b34583b3 100644
--- a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
 <script>
 
 let testName = "XRRigidTransform inverse works";
diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html
index 57c7ef1853e..8ff4f5c258b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 <script>
 
 let testName = "XRRigidTransform position and orientation meet [SameObject] requirements";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html
index 6a294f21f06..2b3403fe461 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     let immersiveTestName = "XRSession requestAnimationFrame callbacks can be "
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html
index 51a639b956c..f036e3080fc 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
     let immersiveTestName = "XRSession cancelAnimationFrame does not have unexpected "
       + "behavior when given invalid handles on immersive testSession";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_end.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_end.https.html
index e8c078ead9b..dccc550be58 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_end.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_end.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     const immersivetestName = "end event fires when immersive session ends";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html
index 636562dd6ec..b7f64617eef 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Calling end during an input callback stops processing at the right time";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html
index 98231c8e9e7..ee29b8794a7 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     let immersiveTestName = "XRSession requestAnimationFrame calls the " +
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
index 760ff3dd657..812c79c1d58 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     const testName = "RequestAnimationFrame resolves with good data";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
index 1b54f5f6ec1..68ad344320e 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
@@ -5,7 +5,6 @@
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
   <script src="resources/webxr_test_asserts.js"></script>
-  <canvas></canvas>
 
   <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html
index 32638894470..ee6bb494320 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 const TEN_SECONDS = 10000; // 10k ms in ten seconds
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
index b141d6d14d5..b8765fd060f 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
 
     let immersiveTestName =
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html
index bdfd8c79cfa..a20223fca3b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
   <script>
 
     let makeSpaceTest = (space_type) => {
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html
index 2ab6cb7fbb5..38133b616ad 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
     function testFunctionGenerator(createSessionFromEventCallback) {
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html
index 66aeef81c50..1795ee7a727 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRSession attributes meet [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
index fd6082bc346..0098d4d918d 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
@@ -4,7 +4,6 @@
   <script src=/resources/testharnessreport.js></script>
   <script src="resources/webxr_util.js"></script>
   <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
 
   <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html
index 2311792d0fd..12655f4be0b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "Ensures that the XRSession's visibilityState is correctly "
diff --git a/tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html b/tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html
index 967291609c0..f1e907d6bbe 100644
--- a/tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 let immersiveTestName = "'floor-level' XRStationaryReferenceSpace updates properly when " +
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html b/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
index 956edba9836..ac017cd8009 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_match.https.html b/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
index 4bb48826ae0..2ef430734d6 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html b/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
index 6671721e4c5..6c50f6f0c9d 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html
index 1213bcb1f11..2defa722060 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRView attributes meet [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html
index ec1ee6964f0..af64111d824 100644
--- a/tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas id="webgl-canvas"></canvas>
 
 <script>
 let testName = "XRViewerPose.views meets [SameObject] requirement";
diff --git a/tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html b/tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html
index 1b7d982d596..4588a3fbc2b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let testName = "XRViewport attributes are valid";
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html
index e5b2335c235..5796e1e0ef3 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html
@@ -3,18 +3,10 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
-xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate errors",
-  (t) => {
-  let webglCanvas = document.getElementsByTagName('canvas')[0];
-  let glAttributes = {
-    alpha: false,
-    antialias: false,
-    xrCompatible: false,
-  };
-  let gl = webglCanvas.getContext('webgl', glAttributes);
+
+function testConstructor(t, gl) {
   return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
     .then(() => {
       return navigator.xr.requestSession('inline')
@@ -52,7 +44,7 @@ xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate error
 
             let lose_context_ext = gl.getExtension('WEBGL_lose_context');
 
-            webglCanvas.addEventListener('webglcontextlost', (ev) => {
+            gl.canvas.addEventListener('webglcontextlost', (ev) => {
               ev.preventDefault();
 
               try {
@@ -64,7 +56,7 @@ xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate error
               }
             });
 
-            webglCanvas.addEventListener('webglcontextrestored', (ev) => {
+            gl.canvas.addEventListener('webglcontextrestored', (ev) => {
               resolve(xrSession.end().then(() => {
                 try {
                   let webglLayerBadSession = new XRWebGLLayer(xrSession, gl);
@@ -80,6 +72,11 @@ xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate error
         });
       });
     });
-});
+}
+xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl",
+  testConstructor, null, 'webgl');
+
+xr_promise_test("Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl2",
+  testConstructor, null, 'webgl2');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html
index dd40865e445..eb797cf93ae 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html
index b0f637863b6..75efc626d69 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html
index 3faab3bf6bc..065fc3df4e4 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html
index 4d27a9155e6..f0d63de5015 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let immersiveTestName = "Ensure that the framebuffer given by the WebGL layer" +
@@ -49,25 +48,29 @@ let testFunction =
   assert_equals(xrFramebuffer, boundFramebuffer);
   assert_equals(gl.getError(), gl.NO_ERROR);
 
-  // Ensure the framebuffer attachment properties cannot be inspected.
-  let attachments = [
-    gl.COLOR_ATTACHMENT0,
-    gl.DEPTH_ATTACHMENT,
-    gl.STENCIL_ATTACHMENT,
-  ];
+  // WebGL 2 does not throw an error and instead returns 0 when there are no
+  // attachments
+  if (gl.getParameter(gl.VERSION).includes("WebGL 1.0")) {
+    // Ensure the framebuffer attachment properties cannot be inspected.
+    let attachments = [
+      gl.COLOR_ATTACHMENT0,
+      gl.DEPTH_ATTACHMENT,
+      gl.STENCIL_ATTACHMENT,
+    ];
 
-  let parameters = [
-    gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
-    gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME,
-    gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL,
-    gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE,
-  ];
+    let parameters = [
+      gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+      gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME,
+      gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL,
+      gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE,
+    ];
 
-  for (let attachment of attachments) {
-    for (let parameter of parameters) {
-      let value = gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, attachment, parameter);
-      assert_equals(value, null);
-      assert_equals(gl.getError(), gl.INVALID_OPERATION);
+    for (let attachment of attachments) {
+      for (let parameter of parameters) {
+        let value = gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, attachment, parameter);
+        assert_equals(value, null);
+        assert_equals(gl.getError(), gl.INVALID_OPERATION);
+      }
     }
   }
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html
index 8e3e60cca05..7eadd005ecf 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_constants.js"></script>
-<canvas />
 
 <script>
 let immersiveTestName = "Ensure that the framebuffer given by the WebGL layer" +
@@ -43,7 +42,7 @@ let testFunction =
   const gl = sessionObjects.gl;
   const webglLayer = sessionObjects.glLayer;
   const xrFramebuffer = webglLayer.framebuffer;
-  const webglCanvas = document.getElementsByTagName('canvas')[0];
+  const webglCanvas = sessionObjects.gl.canvas;
 
   session.requestAnimationFrame((time, xrFrame) => {
     t.step(() => {
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html
index 94a23dcdb42..74cc86f231b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html b/tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html
index baff125705f..86e6f40005f 100644
--- a/tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html
@@ -4,7 +4,6 @@
 <script src="resources/webxr_test_constants.js"></script>
 <script src="resources/webxr_util.js"></script>
 <script src="resources/webxr_test_asserts.js"></script>
-<canvas></canvas>
 
 <script>
 
diff --git a/tests/wpt/web-platform-tests/xhr/cookies.http.html b/tests/wpt/web-platform-tests/xhr/cookies.http.html
new file mode 100644
index 00000000000..0ab71dd168a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/xhr/cookies.http.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<p>Derived from historical testcase for <a href="http://bugs.webkit.org/show_bug.cgi?id=3420">WebKit bug 3420</a>:
+XMLHttpRequest does not handle set-cookie headers.</p>
+
+<script>
+    function clearCookies()
+    {
+      return new Promise(resolve => {
+        var req = new XMLHttpRequest;
+        req.open("POST", "resources/get-set-cookie.py?clear=1");
+        req.onload = () => resolve();
+        req.send("");
+      });
+    }
+    function getAndSetCookies()
+    {
+      return new Promise(resolve => {
+        var req = new XMLHttpRequest;
+        req.open("POST", "resources/get-set-cookie.py");
+        req.onload = () => resolve(req.responseText);
+        req.send("");
+      });
+    }
+
+    promise_test(async function(t) {
+      await clearCookies();
+      var response = await getAndSetCookies();
+      assert_equals(response.match(/.*WK-test=1.*/), null,
+                    "The cookie must not be present after clear. clearCookies() failed.  Must be a bug in the test!");
+      var response = await getAndSetCookies();
+      assert_equals(response.match(/.*WK-test-secure=1.*/), null,
+                    "a secure cookie was sent via HTTP");
+      assert_regexp_match(response, /.*WK-test=1.*/, "an insecure cookie was sent");
+      await clearCookies();
+    }, "Basic non-cross-site cookie handling in XHR");
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/xhr/resources/get-set-cookie.py b/tests/wpt/web-platform-tests/xhr/resources/get-set-cookie.py
new file mode 100644
index 00000000000..cdba642fca9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/xhr/resources/get-set-cookie.py
@@ -0,0 +1,18 @@
+import datetime
+
+def main(request, response):
+    response.headers.set(b"Content-type", b"text/plain")
+
+    # By default use a session cookie.
+    expiration = None
+    if request.GET.get(b"clear"):
+        # If deleting, expire yesterday.
+        expiration = -datetime.timedelta(days=1)
+
+    response.set_cookie(b"WK-test", b"1", expires=expiration);
+    response.set_cookie(b"WK-test-secure", b"1", secure=True,
+                        expires=expiration);
+    content = ""
+    for cookie in request.cookies:
+        content = content + b" " + cookie + b"=" + request.cookies.get(cookie).value
+    response.content = content