diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini
new file mode 100644
index 00000000000..c2a1d9ba1e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini
@@ -0,0 +1,34 @@
+[flex-item-compressible-001.html]
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-002.html.ini
new file mode 100644
index 00000000000..22fa2b06bdc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-002.html.ini
@@ -0,0 +1,46 @@
+[flex-item-compressible-002.html]
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-014.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-014.html.ini
new file mode 100644
index 00000000000..eff59a639d5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-014.html.ini
@@ -0,0 +1,2 @@
+[hyphens-none-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-015.html.ini
new file mode 100644
index 00000000000..32de3ee1ec4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-none-015.html.ini
@@ -0,0 +1,2 @@
+[hyphens-none-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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 c131078eace..23c61ede1a1 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,3 +17,6 @@
   [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-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    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
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
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 aa40c09da67..31bf58db11a 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,21 +309,21 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     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 aa6eb8f6085..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'NosniFF']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini
new file mode 100644
index 00000000000..be78bbd71e7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini
@@ -0,0 +1,4 @@
+[location-non-configurable-toString-valueOf.html]
+  ['valueOf' redefinition with accessor fails]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini
new file mode 100644
index 00000000000..95ea0b1fc02
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini
@@ -0,0 +1,7 @@
+[location-prevent-extensions.html]
+  [Object.preventExtensions throws a TypeError]
+    expected: FAIL
+
+  [Reflect.preventExtensions returns false]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini
new file mode 100644
index 00000000000..08bae1c39e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini
@@ -0,0 +1,7 @@
+[windowproxy-prevent-extensions.html]
+  [Object.preventExtensions throws a TypeError]
+    expected: FAIL
+
+  [Reflect.preventExtensions returns false]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2b6af33d8..f29162631b3 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener of discarded nested browsing context]
     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-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [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: FAIL
+    expected: TIMEOUT
 
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 450c88bd32b..dbec6f2c2ff 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,6 +3,3 @@
   [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/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 5ddb9bfeff6..a1effd5f801 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -16,5 +15,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    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 cc5f51b7218..40fbb9f7887 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
@@ -440,3 +440,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\]\t7.1456260066795075e+35\t9.3139332532882690e-1\t7.1456260066795075e+35\t7.6719746774615935e+35\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 7.1456260066795075e+35 at index of 28696.\n\tMax RelError of 7.6719746774615935e+35 at index of 28696.\n]
     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\]\t9.9598656070693683e+18\t9.3139332532882690e-1\t9.9598656070693683e+18\t1.0693511899017587e+19\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.9598656070693683e+18 at index of 28696.\n\tMax RelError of 1.0693511899017587e+19 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-336.53098362261886 dB) is not greater than or equal to 65.737. Got -336.53098362261886.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/Worker-terminate-forever-during-evaluation.html.ini b/tests/wpt/metadata-layout-2020/workers/Worker-terminate-forever-during-evaluation.html.ini
new file mode 100644
index 00000000000..c97e9bd7644
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/Worker-terminate-forever-during-evaluation.html.ini
@@ -0,0 +1,4 @@
+[Worker-terminate-forever-during-evaluation.html]
+  [Worker is terminated during top-level await]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0503cbae62f..30b04f58b7d 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -182848,6 +182848,32 @@
         {}
        ]
       ],
+      "hyphens-none-014.html": [
+       "9f5c6880ea3379c9c28d47c1403f311a77a21131",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "hyphens-none-015.html": [
+       "10c90b119e722cb636397a7fe96dbd1c4311859d",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-200px-square.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "hyphens-out-of-flow-001.html": [
        "844071126b02d01a68ab2f5df098b653dcf00541",
        [
@@ -258652,7 +258678,7 @@
    },
    "BackgroundSync": {
     "META.yml": [
-     "e5e6a2361f0d0716a27e5e7c5bf63a5527ea5ca8",
+     "9569c076aa49024c8ae088b61d8c863b686e096d",
      []
     ],
     "service_workers": {
@@ -261694,7 +261720,7 @@
    },
    "client-hints": {
     "META.yml": [
-     "e3a5edae1c7f9541c6309181f274ff2a4c4e2f80",
+     "68cbc4d4faf8956ff961c29a27d220681c0f4f08",
      []
     ],
     "accept-ch-answers.sub.https.html.headers": [
@@ -262452,7 +262478,7 @@
    },
    "compression": {
     "META.yml": [
-     "19a0bfaed3f0aa1b498c275ac43100dbcb23010b",
+     "0afbe29a53e8071333a5d6b6ef790284d63a156a",
      []
     ],
     "resources": {
@@ -280603,6 +280629,10 @@
     ]
    },
    "contacts": {
+    "META.yml": [
+     "aa55f896ee3710eb22a9bd511efbfab0a2a37ef9",
+     []
+    ],
     "resources": {
      "helpers.js": [
       "c67d684652884c99dce7c29c6121952941743641",
@@ -280724,6 +280754,10 @@
      }
     },
     "embedded-enforcement": {
+     "META.yml": [
+      "1cdc709f21e2e435b69af943ae2d2e9c0731540f",
+      []
+     ],
      "support": {
       "echo-allow-csp-from.py": [
        "b9422f3e415e5f3a0744d8d8f5543dde0aab12b9",
@@ -315325,7 +315359,7 @@
     },
     "css-inline": {
      "META.yml": [
-      "7253eabf54e56013ac64d69078789797d000df33",
+      "42e669d316d4f470cf4d339fce632a6a69c583ca",
       []
      ]
     },
@@ -317411,7 +317445,7 @@
     },
     "css-overscroll-behavior": {
      "META.yml": [
-      "97705c2df87277d9e5af97d53e453305449c94b8",
+      "8b83e50d1e465786f6466548b58d4df031a855f2",
       []
      ]
     },
@@ -317771,7 +317805,7 @@
     },
     "css-parser-api": {
      "META.yml": [
-      "8ff8db251f893a3672b27e57362d1d1e7e4f8b81",
+      "f9e2feff806a6568b86365c1f0def04932fcc3f4",
       []
      ]
     },
@@ -336492,7 +336526,7 @@
    },
    "event-timing": {
     "META.yml": [
-     "aa27fb61c310d91b629ff0d7b19cd01ce469e645",
+     "e38d492da0a2c22c30bdc799b6b06c224bfec136",
      []
     ],
     "resources": {
@@ -337611,7 +337645,7 @@
     },
     "metadata": {
      "META.yml": [
-      "8d9fc0058ec13f7b14d24586e5225b844f5bc97e",
+      "85f0a7d2ee12616aa7a5698b346954829d8a8bb0",
       []
      ],
      "README.md": [
@@ -337880,17 +337914,33 @@
       "08f2c3f7ae2b1205158d1ce1f4c70c6742e9c330",
       []
      ],
+     "focus-restoration-in-different-site-iframes-inner-window.html": [
+      "a5c75f496bd788c1c6ae389f308d0f2902ef71e4",
+      []
+     ],
      "focus-restoration-in-different-site-iframes-inner.html": [
-      "903b0c02858520dd1d3af7f95b82033fc5509585",
+      "d0765790177cb75928c253ab1230cade5e07c968",
       []
      ],
      "focus-restoration-in-different-site-iframes-other.html": [
       "b302b90938789e2090b99bb0c223080c68962e37",
       []
      ],
+     "focus-restoration-in-different-site-iframes-outer-window.sub.html": [
+      "ac611323c49669ced56b91b02355ed390a244865",
+      []
+     ],
      "focus-restoration-in-different-site-iframes-outer.sub.html": [
       "fa32c67173db76be29bd26dc37338b9999597b0f",
       []
+     ],
+     "focus-restoration-in-same-site-iframes-inner-window.html": [
+      "a5c75f496bd788c1c6ae389f308d0f2902ef71e4",
+      []
+     ],
+     "focus-restoration-in-same-site-iframes-outer-window.html": [
+      "4ccba143d3ac9e89e768e252d05abd4892b8e5cf",
+      []
      ]
     }
    },
@@ -338868,7 +338918,7 @@
      []
     ],
     "META.yml": [
-     "836a47ba4d10540c70abde7960abe31a34488d3c",
+     "939d6d076043a414d3e8dccbfc9c57830dd913be",
      []
     ]
    },
@@ -350950,7 +351000,7 @@
    },
    "idle-detection": {
     "META.yml": [
-     "7e5836bc3701366fba535a67a0ffc4032776b104",
+     "adbdc7bd93d71cee1fb318dfd36a8bd5cd305892",
      []
     ],
     "idle-detection-allowed-by-feature-policy.https.sub.html.headers": [
@@ -351224,7 +351274,7 @@
    },
    "import-maps": {
     "META.yml": [
-     "bc6d40ec352178bbc4bf1cacb3753d6b7a10741a",
+     "dbcc70edabb911db5b8063e3d85506c4e5e0e79c",
      []
     ],
     "acquiring": {
@@ -351840,7 +351890,7 @@
    },
    "input-device-capabilities": {
     "META.yml": [
-     "f7b8c74fa40203b5778f23cfde71f74a435e308d",
+     "6925e118ae2bd9fca52ca25783f8c40156c3542b",
      []
     ]
    },
@@ -352708,7 +352758,7 @@
    },
    "keyboard-lock": {
     "META.yml": [
-     "e805a9d6658a2e731f625dc4567313aef7134643",
+     "06c48b4045842b82905c1a3498f1ef5620f5a526",
      []
     ],
     "resources": {
@@ -352772,7 +352822,7 @@
    },
    "lifecycle": {
     "META.yml": [
-     "c1fcbca4c1f8366da1dd9eb91bc9427edeef1153",
+     "abd5e0f6ed6cc07042968abb4465f1c84d0e83d4",
      []
     ],
     "resources": {
@@ -353852,7 +353902,7 @@
    },
    "media-capabilities": {
     "META.yml": [
-     "fc70ffb18538bfb3c1fd4e637ac6a00df9bab74a",
+     "2bd00efb9a764e29f895af7b4761f70e93fa1d02",
      []
     ],
     "README.md": [
@@ -354192,7 +354242,7 @@
    },
    "mediasession": {
     "META.yml": [
-     "bca9602ca31d3702f7055d893f650a682c7fc0a2",
+     "8eb7fa026148269686e0a13554d28062f49725f4",
      []
     ],
     "README.md": [
@@ -355930,7 +355980,7 @@
    },
    "picture-in-picture": {
     "META.yml": [
-     "b878dd547b8267196db6563b0009035af3d4f52a",
+     "8df9be5e5b1961296346b4c98a295acbe0fd97c0",
      []
     ],
     "resources": {
@@ -359066,7 +359116,7 @@
    },
    "scroll-animations": {
     "META.yml": [
-     "c53f1f432fe1ec2887e30af396a1f1574b76b95d",
+     "77e1d50542bbefed5498024dd6ae8edc7e70de33",
      []
     ],
     "animation-ref.html": [
@@ -359094,7 +359144,7 @@
    },
    "scroll-to-text-fragment": {
     "META.yml": [
-     "13225f6f18fb909faa65d1d6f83af2f06f9e5d7f",
+     "118ab130dbd48b1b300e0552e47c2ad4b40e2158",
      []
     ],
     "client-redirect.html": [
@@ -362060,7 +362110,7 @@
    },
    "speech-api": {
     "META.yml": [
-     "88f1837f96f6e140990eb2de9981f7901596a32f",
+     "2b7a03e245ab82310d4637d3a2a4e1dbe3df38db",
      []
     ],
     "webspeech.js": [
@@ -362100,7 +362150,7 @@
    },
    "storage-access-api": {
     "META.yml": [
-     "83f078575380df8a1f368eaa09c7e93c7e1a1712",
+     "d3949fb19a4e155296021fade5a8a27d3564e727",
      []
     ],
     "helpers.js": [
@@ -363164,7 +363214,7 @@
    ],
    "timing-entrytypes-registry": {
     "META.yml": [
-     "bfb0e0f1f67a9c6aa2e7e921b09e85f8d970b290",
+     "85b7e0ec16df437a321e410d5e49a363a53ffd0b",
      []
     ],
     "resources": {
@@ -363439,7 +363489,7 @@
       ]
      },
      "website_build.sh": [
-      "f6b26310aabce200fc0d77844f5f3ad28de0bb7f",
+      "fc255ae83f2219d3e32a859f0d63745ed682b436",
       []
      ]
     },
@@ -363991,7 +364041,7 @@
       []
      ],
      "serve.py": [
-      "8fdbdc6bc671090107a5e6479cf16ebda076d084",
+      "fe0d34b371d2244c1afece8d002d83d7a2b5fb9c",
       []
      ],
      "test_functional.py": [
@@ -371301,11 +371351,11 @@
         []
        ],
        "firefox.py": [
-        "9104fedb5f9f45b6c8e9640159315a62e93a37c7",
+        "b8f1c7d8286fdef935ce8dbf3e2ed513f202d04f",
         []
        ],
        "firefox_android.py": [
-        "ca6ea96013b67ed548f5487520253ca61e0ae32c",
+        "5e9de564963f63e013a3fb63fdede1a97a1f7386",
         []
        ],
        "ie.py": [
@@ -371356,7 +371406,7 @@
        []
       ],
       "environment.py": [
-       "2527d26d391d99683779392c035ceffa30fe5bc2",
+       "d98e1203930cab51ab7468037a0665b85126e1e5",
        []
       ],
       "executors": {
@@ -371369,7 +371419,7 @@
         []
        ],
        "base.py": [
-        "51d752cdebc61976066a15c5dd9e778f9378ff00",
+        "539c791fbd9c9d1db4598246ff460742e514974a",
         []
        ],
        "executorchrome.py": [
@@ -371389,7 +371439,7 @@
         []
        ],
        "executormarionette.py": [
-        "dc9e3e164e40251b9e0b91b900e2ae6651776447",
+        "e5d7683facd7880d13a7d30451230b23833c3cee",
         []
        ],
        "executoropera.py": [
@@ -371401,7 +371451,7 @@
         []
        ],
        "executorselenium.py": [
-        "0228922134a704afdde5f37e4edec31dc540fc2f",
+        "6070007b21a7af0dd4b83cae283f853eecde576f",
         []
        ],
        "executorservo.py": [
@@ -371409,11 +371459,11 @@
         []
        ],
        "executorservodriver.py": [
-        "2cd1dbf3ad06f41b9555dad64d6d0c0a86537260",
+        "039bcd14e2be57680089e785e60c74cddee285b4",
         []
        ],
        "executorwebdriver.py": [
-        "43fc910c5151554df38d2a11608040442754d962",
+        "e6c5f9f1a206cb4f9f4d4fc3d2b72f5dd20e1fbc",
         []
        ],
        "executorwebkit.py": [
@@ -371519,6 +371569,10 @@
        "ab8d4740f3fcc2b186a68d57758d46db47ad97ab",
        []
       ],
+      "mpcontext.py": [
+       "2a84e188d39f1300046d9ab07992d679ebab9003",
+       []
+      ],
       "print_reftest_runner.html": [
        "3ce18d4dd823e042e986ce94f2f858977a0ddb19",
        []
@@ -371560,11 +371614,11 @@
        []
       ],
       "testloader.py": [
-       "4a3fa4273654a8a86d5224ef6b0a9daed73b01d7",
+       "e57619b45fefda53305b43ff3001cdd4b078b47a",
        []
       ],
       "testrunner.py": [
-       "e5d7042c73b30d8d6280c2e231d9d81b9d0d8975",
+       "8dd93418dd8f37fc220306f7a4e6d85e7fb9b55a",
        []
       ],
       "tests": {
@@ -371666,7 +371720,7 @@
        []
       ],
       "wptcommandline.py": [
-       "15d2322494dbe5c281cb77db7a1c0dd754e7db2a",
+       "bfd6491b2d66693e225d91b84846b5c0a38e1aba",
        []
       ],
       "wptlogging.py": [
@@ -371736,7 +371790,7 @@
        }
       },
       "wptrunner.py": [
-       "b02805ff7e3df6645722e63fbc2d9715959c1ce6",
+       "3fc9e397a92a0927ac2c85ca27453754f78e0771",
        []
       ],
       "wpttest.py": [
@@ -372036,7 +372090,7 @@
        []
       ],
       "test_stash.py": [
-       "31af1558b0cc5c046843e0e96569db42c467cf22",
+       "f688ac6016c0a0d41b9bf85bb2b9c2ed68f2ad07",
        []
       ]
      },
@@ -372108,7 +372162,7 @@
        ]
       },
       "stash.py": [
-       "6b351847491bfee1f8e17a42127c88be97a62923",
+       "535355a828796196ee6be950c5ef9a0802236826",
        []
       ],
       "utils.py": [
@@ -372702,7 +372756,7 @@
    },
    "video-rvfc": {
     "META.yml": [
-     "51048591d0a6fbb6fba70812d87685ba0e752038",
+     "5e581f4234ad39c819e371a532cd41642060a7c4",
      []
     ],
     "README.md": [
@@ -372768,6 +372822,10 @@
      []
     ],
     "jsapi": {
+     "META.yml": [
+      "cf5525ae1157f7e5d3fe57b3856735b15c91c5d1",
+      []
+     ],
      "assertions.js": [
       "f00303f6aa5054d3264bdebe78d00ef5426b28d0",
       []
@@ -372964,6 +373022,10 @@
      }
     },
     "webapi": {
+     "META.yml": [
+      "69715cd7c8dcf53d95af41fdd5396e4ea34dc2ce",
+      []
+     ],
      "status.py": [
       "9f056678c125a9334d2c151fb5a2b82d7ecccdf7",
       []
@@ -373729,6 +373791,10 @@
     }
    },
    "webcodecs": {
+    "META.yml": [
+     "2c510e2a7cad389be9b70df7f24f59f4928d0d88",
+     []
+    ],
     "h264.mp4": [
      "e21fcba32c125fba820ffa2269013c612d2b78fc",
      []
@@ -374500,7 +374566,7 @@
    },
    "webrtc-identity": {
     "META.yml": [
-     "940144cee1da5f2f0f2bdd27a8dfc8f5bfcc6a1d",
+     "fb919db954b1fe92428c7291a4001641d08f7c8f",
      []
     ],
     "identity-helper.sub.js": [
@@ -376856,9 +376922,21 @@
    },
    "webxr": {
     "META.yml": [
-     "520afec2000721d04aae9ed89bca49297fa31d4b",
+     "13c5d7b595c62394e4593bd0dca142bcd7a21068",
      []
     ],
+    "dom-overlay": {
+     "META.yml": [
+      "be2b6e613a1457ca3c14dc854005353636ea23af",
+      []
+     ]
+    },
+    "layers": {
+     "META.yml": [
+      "117c1adf021812164c4941a8321c9fc0661f1b67",
+      []
+     ]
+    },
     "resources": {
      "webxr_check.html": [
       "2d8e5b387dc88588921ccfa49dd14db58009900c",
@@ -377826,6 +377904,10 @@
       "aae86a0b055346f8439cbec4f98df8d08d472368",
       []
      ],
+     "Worker-run-forever-during-top-level-await.js": [
+      "a1c8b32b619753941999c7f41e9169816c396d36",
+      []
+     ],
      "Worker-run-forever.js": [
       "2d822d407f4c83fe7321cbd4cb1168626de05eea",
       []
@@ -378891,10 +378973,12 @@
       ]
      ],
      "send-file-form-iso-2022-jp.tentative.html": [
-      "421de301298ba55a70124290066eaf66e6416394",
+      "659af3bde85852d6f244cb51558a14c6ebef2830",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ],
      "send-file-form-punctuation.tentative.html": [
@@ -406888,6 +406972,20 @@
        {}
       ]
      ],
+     "flex-item-compressible-001.html": [
+      "9725512cd8027b8b8fe4bd966f96db1b5242456e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "flex-item-compressible-002.html": [
+      "d1a14b9bfe3cbb05f598dee987ccd41ec5d4013e",
+      [
+       null,
+       {}
+      ]
+     ],
      "flex-item-contains-strict.html": [
       "25849cc64b2f10cf2d319e1a2f750f32d64359b5",
       [
@@ -428767,7 +428865,7 @@
       ]
      ],
      "focus-visible-006.html": [
-      "4b034b2e27962810bd9357ff88e5fe4587e56d25",
+      "12643e6cd442eb1814411037e5700b3883e15761",
       [
        null,
        {
@@ -457870,8 +457968,22 @@
       {}
      ]
     ],
+    "focus-restoration-in-different-site-iframes-window.html": [
+     "61e604b3c77010866e54507211b6c57d84bc781a",
+     [
+      null,
+      {}
+     ]
+    ],
     "focus-restoration-in-different-site-iframes.html": [
-     "3de05455651aef8e37e99aa33877c4e5905103ac",
+     "3861347fe630e972e16941785d322cd6a5e0c425",
+     [
+      null,
+      {}
+     ]
+    ],
+    "focus-restoration-in-same-site-iframes-window.html": [
+     "46be5eb600146f1e882c2e7e9c8bddd6e752d264",
      [
       null,
       {}
@@ -459985,6 +460097,13 @@
          {}
         ]
        ],
+       "location-non-configurable-toString-valueOf.html": [
+        "80760ac9e44e2513017b583329e1a9cddeccdb60",
+        [
+         null,
+         {}
+        ]
+       ],
        "location-origin-idna.sub.window.js": [
         "83b030f88651aeb66998b724ffcec31ad72801bc",
         [
@@ -459999,6 +460118,13 @@
          {}
         ]
        ],
+       "location-prevent-extensions.html": [
+        "a8c777aded82c384e8106db824b2b175bfe15774",
+        [
+         null,
+         {}
+        ]
+       ],
        "location-protocol-setter-non-broken-weird.html": [
         "78ba5f6e401dadf43034c772118bba466e678131",
         [
@@ -460027,6 +460153,13 @@
          {}
         ]
        ],
+       "location-prototype-no-toString-valueOf.html": [
+        "56316320af59dd1531c661fb854643736cf3ef6e",
+        [
+         null,
+         {}
+        ]
+       ],
        "location-prototype-setting-cross-origin-domain.sub.html": [
         "1e677b03653a7d391653865a02ab45096fcff4e9",
         [
@@ -460407,7 +460540,7 @@
         ]
        ],
        "cross-origin-objects.html": [
-        "3b7c7832d7e7f215ccc810ae583f8cfdf925d497",
+        "577129502426989888a1791f78df46b6ed23c55e",
         [
          null,
          {
@@ -461087,6 +461220,13 @@
       ]
      },
      "the-windowproxy-exotic-object": {
+      "windowproxy-prevent-extensions.html": [
+       "97a156290a1c5ad15a36f24b0009d9f599c8be3e",
+       [
+        null,
+        {}
+       ]
+      ],
       "windowproxy-prototype-setting-cross-origin-domain.sub.html": [
        "a5ae78cc87dc8698e819b5132fb1514ac4f25860",
        [
@@ -538113,6 +538253,13 @@
        {}
       ]
      ],
+     "animateMotion-base.html": [
+      "e69b121a06be5ac23798b6b9babb0ddfca032e25",
+      [
+       null,
+       {}
+      ]
+     ],
      "animateMotion-circle.html": [
       "3cf713f904849108efda2c1f2423a701c9fd4fa7",
       [
@@ -561009,7 +561156,7 @@
      ]
     ],
     "Worker-terminate-forever-during-evaluation.html": [
-     "4513c5b53790d11b4e26b0fd38a4e9bee9f1c9ad",
+     "ab66f29289f21d6821a3edccdec9ff3512f86919",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-001.html.ini
new file mode 100644
index 00000000000..c2a1d9ba1e1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-001.html.ini
@@ -0,0 +1,34 @@
+[flex-item-compressible-001.html]
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-002.html.ini
new file mode 100644
index 00000000000..22fa2b06bdc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flex-item-compressible-002.html.ini
@@ -0,0 +1,46 @@
+[flex-item-compressible-002.html]
+  [.flexbox 14]
+    expected: FAIL
+
+  [.flexbox 15]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 13]
+    expected: FAIL
+
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 11]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
+  [.flexbox 7]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 8]
+    expected: FAIL
+
+  [.flexbox 9]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-014.html.ini b/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-014.html.ini
new file mode 100644
index 00000000000..eff59a639d5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-014.html.ini
@@ -0,0 +1,2 @@
+[hyphens-none-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-015.html.ini b/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-015.html.ini
new file mode 100644
index 00000000000..32de3ee1ec4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/hyphens/hyphens-none-015.html.ini
@@ -0,0 +1,2 @@
+[hyphens-none-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [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-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    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
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
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 e5e95f1e751..fe1c02ce748 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,21 +309,21 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     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 aa6eb8f6085..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'NosniFF']
-    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
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini
new file mode 100644
index 00000000000..be78bbd71e7
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html.ini
@@ -0,0 +1,4 @@
+[location-non-configurable-toString-valueOf.html]
+  ['valueOf' redefinition with accessor fails]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini
new file mode 100644
index 00000000000..95ea0b1fc02
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prevent-extensions.html.ini
@@ -0,0 +1,7 @@
+[location-prevent-extensions.html]
+  [Object.preventExtensions throws a TypeError]
+    expected: FAIL
+
+  [Reflect.preventExtensions returns false]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini
new file mode 100644
index 00000000000..08bae1c39e4
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html.ini
@@ -0,0 +1,7 @@
+[windowproxy-prevent-extensions.html]
+  [Object.preventExtensions throws a TypeError]
+    expected: FAIL
+
+  [Reflect.preventExtensions returns false]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index fd369192a02..c757b400205 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener and "removed" embedded documents]
     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-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [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: FAIL
+    expected: TIMEOUT
 
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 01f7b72cbe7..0cef5158fae 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,6 +4,3 @@
   [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/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 5ddb9bfeff6..a1effd5f801 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -16,5 +15,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    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 09b1e3dc0bd..46a6fdf1ade 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
@@ -668,3 +668,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\]\t7.1456260066795075e+35\t9.3139332532882690e-1\t7.1456260066795075e+35\t7.6719746774615935e+35\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 7.1456260066795075e+35 at index of 28696.\n\tMax RelError of 7.6719746774615935e+35 at index of 28696.\n]
     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\]\t9.9598656070693683e+18\t9.3139332532882690e-1\t9.9598656070693683e+18\t1.0693511899017587e+19\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.9598656070693683e+18 at index of 28696.\n\tMax RelError of 1.0693511899017587e+19 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-336.53098362261886 dB) is not greater than or equal to 65.737. Got -336.53098362261886.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/Worker-terminate-forever-during-evaluation.html.ini b/tests/wpt/metadata/workers/Worker-terminate-forever-during-evaluation.html.ini
new file mode 100644
index 00000000000..c97e9bd7644
--- /dev/null
+++ b/tests/wpt/metadata/workers/Worker-terminate-forever-during-evaluation.html.ini
@@ -0,0 +1,4 @@
+[Worker-terminate-forever-during-evaluation.html]
+  [Worker is terminated during top-level await]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/META.yml b/tests/wpt/web-platform-tests/BackgroundSync/META.yml
index e5e6a2361f0..9569c076aa4 100644
--- a/tests/wpt/web-platform-tests/BackgroundSync/META.yml
+++ b/tests/wpt/web-platform-tests/BackgroundSync/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/BackgroundSync/spec/
+spec: https://wicg.github.io/background-sync/spec/
 suggested_reviewers:
   - beverloo
diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.tentative.html b/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.tentative.html
index 421de301298..659af3bde85 100644
--- a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.tentative.html
+++ b/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.tentative.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<meta name=timeout content=long>
 <title>Upload files in ISO-2022-JP form (tentative)</title>
 <!--
     NOTE: This test is tentative because encoding for filename
diff --git a/tests/wpt/web-platform-tests/client-hints/META.yml b/tests/wpt/web-platform-tests/client-hints/META.yml
index e3a5edae1c7..68cbc4d4faf 100644
--- a/tests/wpt/web-platform-tests/client-hints/META.yml
+++ b/tests/wpt/web-platform-tests/client-hints/META.yml
@@ -1,3 +1,4 @@
+spec: https://wicg.github.io/client-hints-infrastructure/
 suggested_reviewers:
   - igrigorik
   - yoavweiss
diff --git a/tests/wpt/web-platform-tests/compression/META.yml b/tests/wpt/web-platform-tests/compression/META.yml
index 19a0bfaed3f..0afbe29a53e 100644
--- a/tests/wpt/web-platform-tests/compression/META.yml
+++ b/tests/wpt/web-platform-tests/compression/META.yml
@@ -1,3 +1,3 @@
-spec: https://ricea.github.io/compression/
+spec: https://wicg.github.io/compression/
 suggested_reviewers:
   - ricea
diff --git a/tests/wpt/web-platform-tests/contacts/META.yml b/tests/wpt/web-platform-tests/contacts/META.yml
new file mode 100644
index 00000000000..aa55f896ee3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/contacts/META.yml
@@ -0,0 +1 @@
+spec: https://wicg.github.io/contact-api/spec/
diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/META.yml b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/META.yml
new file mode 100644
index 00000000000..1cdc709f21e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/META.yml
@@ -0,0 +1 @@
+spec: https://w3c.github.io/webappsec-cspee/
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-001.html
new file mode 100644
index 00000000000..9725512cd80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-001.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Flexbox Test: Testing automatic minimun size of &lt;input&gt; flex items in a row flex container</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#min-size-auto">
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#replaced-percentage-min-contribution">
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+  <link rel="stylesheet" href="/fonts/ahem.css">
+  <meta name="assert" content="This test verifies that an <input> flex item should resolve its percentage part of main size to zero when computing specified size suggestion.">
+
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/check-layout-th.js"></script>
+
+  <style>
+  .flexbox {
+    display: flex;
+    width: 300px;
+    height: 40px;
+    border: 1px solid black;
+    margin-bottom: 5px;
+  }
+  .spacer {
+    /* Just to occupy some space, so that the flex algorithm will try to shrink
+       the <input> element below its percentage specified width. */
+    flex: 0 0 200px;
+    background: lightgray;
+  }
+  input {
+    font: 20px/1 Ahem;
+    background: lightblue;
+    /* Get rid of native theming and UA default styles. */
+    appearance: none;
+    border: 0;
+    padding: 0;
+    margin: 0;
+  }
+  .test1 {
+    width: 100%;
+  }
+  .test2 {
+    width: calc(100%);
+  }
+  .test3 {
+    width: calc(140px + 100%);
+  }
+  </style>
+
+  <body onload="checkLayout('.flexbox')">
+    <p>Test1: "width: 100%"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test1" data-expected-width="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test1" data-expected-width="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test1" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test1" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test1" data-expected-width="140">
+    </div>
+
+    <p>Test2: "width: calc(100%)"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test2" data-expected-width="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test2" data-expected-width="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test2" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test2" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test2" data-expected-width="140">
+    </div>
+
+    <p>Test3: "width: calc(140px + 100%)"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test3" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test3" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test3" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test3" data-expected-width="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test3" data-expected-width="140">
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-002.html
new file mode 100644
index 00000000000..d1a14b9bfe3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-002.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Flexbox Test: Testing automatic minimun size of &lt;input&gt; flex items in a column flex container</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#min-size-auto">
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#replaced-percentage-min-contribution">
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+  <link rel="stylesheet" href="/fonts/ahem.css">
+  <meta name="assert" content="This test verifies that an <input> flex item should resolve its percentage part of main size to zero when computing specified size suggestion.">
+
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/check-layout-th.js"></script>
+
+  <style>
+  .flexbox {
+    display: inline-flex;
+    flex-direction: column;
+    width: 40px;
+    height: 300px;
+    border: 1px solid black;
+    margin-bottom: 40px;
+  }
+  .spacer {
+    /* Just to occupy some space, so that the flex algorithm will try to shrink
+       the <input> element below its percentage specified height. */
+    flex: 0 0 200px;
+    background: lightgray;
+  }
+  input {
+    writing-mode: vertical-lr;
+    font: 20px/1 Ahem;
+    background: lightblue;
+    /* Get rid of native theming and UA default styles. */
+    appearance: none;
+    border: 0;
+    padding: 0;
+    margin: 0;
+  }
+  .test1 {
+    height: 100%;
+  }
+  .test2 {
+    height: calc(100%);
+  }
+  .test3 {
+    height: calc(140px + 100%);
+  }
+  </style>
+
+  <body onload="checkLayout('.flexbox')">
+    <p>Test1: "height: 100%"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test1" data-expected-height="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test1" data-expected-height="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test1" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test1" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test1" data-expected-height="140">
+    </div>
+
+    <p>Test2: "height: calc(100%)"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test2" data-expected-height="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test2" data-expected-height="100">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test2" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test2" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test2" data-expected-height="140">
+    </div>
+
+    <p>Test3: "height: calc(140px + 100%)"</p>
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="text"
+             class="test3" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="range"
+             class="test3" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="button" value="XXXXXXX"
+             class="test3" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="submit" value="XXXXXXX"
+             class="test3" data-expected-height="140">
+    </div>
+
+    <div class="flexbox">
+      <div class="spacer"></div>
+      <input type="reset" value="XXXXXXX"
+             class="test3" data-expected-height="140">
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/META.yml b/tests/wpt/web-platform-tests/css/css-inline/META.yml
index 7253eabf54e..42e669d316d 100644
--- a/tests/wpt/web-platform-tests/css/css-inline/META.yml
+++ b/tests/wpt/web-platform-tests/css/css-inline/META.yml
@@ -1,4 +1,4 @@
-spec: https://drafts.csswg.org/css-fonts/
+spec: https://drafts.csswg.org/css-inline/
 suggested_reviewers:
   - dauwhe
   - fantasai
diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml b/tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml
index 97705c2df87..8b83e50d1e4 100644
--- a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml
+++ b/tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml
@@ -1,4 +1,4 @@
-spec: https://drafts.csswg.org/css-overscroll-behavior/
+spec: https://drafts.csswg.org/css-overscroll/
 suggested_reviewers:
   - majido
   - theres-waldo
diff --git a/tests/wpt/web-platform-tests/css/css-parser-api/META.yml b/tests/wpt/web-platform-tests/css/css-parser-api/META.yml
index 8ff8db251f8..f9e2feff806 100644
--- a/tests/wpt/web-platform-tests/css/css-parser-api/META.yml
+++ b/tests/wpt/web-platform-tests/css/css-parser-api/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/CSS-Parser-API/
+spec: https://wicg.github.io/css-parser-api/
 suggested_reviewers:
   - tabatkins
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-014.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-014.html
new file mode 100644
index 00000000000..9f5c6880ea3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-014.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Line breaking with floats and disabled hyphenation </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" title="5.4. Hyphenation: the hyphens property" href="https://drafts.csswg.org/css-text-3/#hyphenation">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-none">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="A span with hypens 'none' is wrapped based on the available space left by a float image.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div { font: 20px/1 Ahem; }
+img { float:right; }
+.test {
+    max-width: 100px;
+    color: green;
+}
+span { hyphens: none; }
+.ref {
+    position: absolute;
+    background: green linear-gradient(red, red) 2ch 0/3ch 3ch no-repeat;
+    color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="ref">XX<br>X</br></div>
+<div class="test">
+  <img src="/css/support/60x60-green.png" alt="">
+  <span>XX X</span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-015.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-015.html
new file mode 100644
index 00000000000..10c90b119e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-015.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Line breaking with floats and disabled hyphenation </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" title="5.4. Hyphenation: the hyphens property" href="https://drafts.csswg.org/css-text-3/#hyphenation">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-hyphens-manual">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<meta name="assert" content="A span with hypens 'none' is wrapped in multiple lines based on the available space left by a float image.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div { font: 20px/1 Ahem; }
+img { float:right; }
+.test {
+    max-width: 200px;
+    color: green;
+}
+span { hyphens: none; }
+.ref {
+    position: absolute;
+    background: green linear-gradient(red, red) 7ch 0/3ch 3ch no-repeat;
+    color: red;
+    width: 200px;
+    height: 200px;
+    z-index: -1;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="ref">XX X<br>XXX</br>XXXX XX<br>XXX</div>
+<div class="test">
+  <img src="/css/support/60x60-green.png" alt="">
+  <span>XX X XXX XXXX XX XXX</span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
index 4b034b2e279..12643e6cd44 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
@@ -40,13 +40,15 @@
     <span id="el" contenteditable>Focus me</span>
   </div>
   <script>
+    var actions_promise;
     async_test(function(t) {
       el.addEventListener("focus", t.step_func(function() {
         assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)");
-        t.done();
+        // Make sure the test finishes after all the input actions are completed.
+        actions_promise.then( () => t.done() );
       }));
 
-      test_driver.click(el);
+      actions_promise = test_driver.click(el);
     }, "Focus should always match :focus-visible on content editable divs");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/event-timing/META.yml b/tests/wpt/web-platform-tests/event-timing/META.yml
index aa27fb61c31..e38d492da0a 100644
--- a/tests/wpt/web-platform-tests/event-timing/META.yml
+++ b/tests/wpt/web-platform-tests/event-timing/META.yml
@@ -1,3 +1,3 @@
-spec: https://github.com/WICG/event-timing
+spec: https://wicg.github.io/event-timing/
 suggested_reviewers:
   - npm1
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/META.yml b/tests/wpt/web-platform-tests/fetch/metadata/META.yml
index 8d9fc0058ec..85f0a7d2ee1 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/META.yml
+++ b/tests/wpt/web-platform-tests/fetch/metadata/META.yml
@@ -1,3 +1,4 @@
+spec: https://w3c.github.io/webappsec-fetch-metadata/
 suggested_reviewers:
   - mikewest
   - iVanlIsh
diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes-window.html b/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes-window.html
new file mode 100644
index 00000000000..61e604b3c77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes-window.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test focus restoration</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    test(function() {
+        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,windowblur,windowfocus,", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/focus-restoration-in-different-site-iframes-outer-window.sub.html");
+</script>
diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html b/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html
index 3de05455651..3861347fe63 100644
--- a/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html
+++ b/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html
@@ -7,7 +7,7 @@
 setup({explicit_done:true});
 window.onmessage = function(e) {
     test(function() {
-        assert_equals(e.data, "outerlog:log:bodyfocus,inputfocus,inputblur,bodyblur,bodyfocus,inputfocus,", 'Check log');
+        assert_equals(e.data, "outerlog:log:willfocusinput,bodyfocus,inputfocus,didfocusinput,inputblur,bodyblur,bodyfocus,inputfocus,", 'Check log');
     }, "Check result");
     w.close();
     done();
diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-same-site-iframes-window.html b/tests/wpt/web-platform-tests/focus/focus-restoration-in-same-site-iframes-window.html
new file mode 100644
index 00000000000..46be5eb6001
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/focus-restoration-in-same-site-iframes-window.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test focus restoration</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    test(function() {
+        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,windowblur,windowfocus,", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/focus-restoration-in-same-site-iframes-outer-window.html");
+</script>
diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html
new file mode 100644
index 00000000000..a5c75f496bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Inner document</title>
+</head>
+<body>
+<h1>Inner</h1>
+<script>
+window.onmessage = function(e) {
+    if (e.data == "getlog") {
+        parent.postMessage(log, "*");
+    }
+};
+
+let log = "log:";
+window.onfocus = function() {
+    log += "windowfocus,"
+}
+window.onblur = function() {
+    log += "windowblur,"
+}
+window.onload = function() {
+    log += "willfocuswindow,"
+    window.focus();
+    log += "didfocuswindow,"
+    parent.postMessage("start", "*");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html
index 903b0c02858..d0765790177 100644
--- a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html
+++ b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html
@@ -29,7 +29,9 @@ document.body.onblur = function() {
     log += "bodyblur,"
 }
 window.onload = function() {
+    log += "willfocusinput,"
     input.focus();
+    log += "didfocusinput,"
     parent.postMessage("start", "*");
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html
new file mode 100644
index 00000000000..ac611323c49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus restoration outer</title>
+<script>
+let other = null;
+let log = "outerlog:";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    if (e.data == "start") {
+        other = window.open("focus-restoration-in-different-site-iframes-other.html", "otherwindow", "resizable=yes");
+    } else if (e.data == "other") {
+        other.close();
+        opener.step_timeout(function() {
+            document.getElementsByTagName("iframe")[0].contentWindow.postMessage("getlog", "*");
+        }, 2000);
+    } else {
+        opener.step_timeout(function() {
+            opener.postMessage(getLog() + e.data, "*");
+        }, 1500);
+    }
+};
+window.onload = function() {
+    document.getElementsByTagName("iframe")[0].onfocus = function() {
+        log += "iframefocus,";
+    }
+    document.getElementsByTagName("iframe")[0].onblur = function() {
+        log += "iframeblur,";
+    }
+    document.body.onfocus = function() {
+        log += "bodyfocus,";
+    }
+    document.body.onblur = function() {
+        log += "bodyblur,";
+    }
+}
+</script>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/focus-restoration-in-different-site-iframes-inner-window.html">
diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html
new file mode 100644
index 00000000000..a5c75f496bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Inner document</title>
+</head>
+<body>
+<h1>Inner</h1>
+<script>
+window.onmessage = function(e) {
+    if (e.data == "getlog") {
+        parent.postMessage(log, "*");
+    }
+};
+
+let log = "log:";
+window.onfocus = function() {
+    log += "windowfocus,"
+}
+window.onblur = function() {
+    log += "windowblur,"
+}
+window.onload = function() {
+    log += "willfocuswindow,"
+    window.focus();
+    log += "didfocuswindow,"
+    parent.postMessage("start", "*");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html
new file mode 100644
index 00000000000..4ccba143d3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus restoration outer</title>
+<script>
+let other = null;
+let log = "outerlog:";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    if (e.data == "start") {
+        other = window.open("focus-restoration-in-different-site-iframes-other.html", "otherwindow", "resizable=yes");
+    } else if (e.data == "other") {
+        other.close();
+        opener.step_timeout(function() {
+            document.getElementsByTagName("iframe")[0].contentWindow.postMessage("getlog", "*");
+        }, 2000);
+    } else {
+        opener.step_timeout(function() {
+            opener.postMessage(getLog() + e.data, "*");
+        }, 1500);
+    }
+};
+window.onload = function() {
+    document.getElementsByTagName("iframe")[0].onfocus = function() {
+        log += "iframefocus,";
+    }
+    document.getElementsByTagName("iframe")[0].onblur = function() {
+        log += "iframeblur,";
+    }
+    document.body.onfocus = function() {
+        log += "bodyfocus,";
+    }
+    document.body.onblur = function() {
+        log += "bodyblur,";
+    }
+}
+</script>
+<iframe src="focus-restoration-in-same-site-iframes-inner-window.html">
diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/META.yml b/tests/wpt/web-platform-tests/geolocation-sensor/META.yml
index 836a47ba4d1..939d6d07604 100644
--- a/tests/wpt/web-platform-tests/geolocation-sensor/META.yml
+++ b/tests/wpt/web-platform-tests/geolocation-sensor/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/geolocation-sensor/
+spec: https://w3c.github.io/geolocation-sensor/
 suggested_reviewers:
   - anssiko
   - Honry
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html
new file mode 100644
index 00000000000..80760ac9e44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Same-origin Location objects have non-configurable "toString" and "valueOf" properties</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/history.html#location-defineownproperty">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(() => {
+  assert_own_property(location, "toString");
+  const origToString = location.toString;
+
+  assert_throws_js(TypeError, () => {
+    Object.defineProperty(location, "toString", {
+      get() {},
+      set(_v) {},
+      enumerable: true,
+      configurable: true,
+    });
+  });
+
+  assert_equals(location.toString, origToString);
+}, "'toString' redefinition with accessor fails");
+
+test(() => {
+  assert_own_property(location, "valueOf");
+  const origValueOf = location.valueOf;
+
+  assert_throws_js(TypeError, () => {
+    Object.defineProperty(location, "valueOf", {
+      get() {},
+      enumerable: false,
+      configurable: true,
+    });
+  });
+
+  assert_equals(location.valueOf, origValueOf);
+}, "'valueOf' redefinition with accessor fails");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prevent-extensions.html b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prevent-extensions.html
new file mode 100644
index 00000000000..a8c777aded8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prevent-extensions.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>[[PreventExtensions]] on a Location object should return false</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/history.html#location-preventextensions">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(() => {
+  assert_throws_js(TypeError, () => {
+    Object.preventExtensions(location);
+  });
+}, "Object.preventExtensions throws a TypeError");
+
+test(() => {
+  assert_false(Reflect.preventExtensions(location));
+}, "Reflect.preventExtensions returns false");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html
new file mode 100644
index 00000000000..56316320af5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Location.prototype objects don't have own "toString" and "valueOf" properties</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(t => {
+  assert_not_own_property(Location.prototype, "toString");
+  t.add_cleanup(() => { delete Location.prototype.toString; });
+
+  let val;
+  Object.defineProperty(Location.prototype, "toString", {
+    get: () => val,
+    set: newVal => { val = newVal; },
+    enumerable: false,
+    configurable: true,
+  });
+
+  Location.prototype.toString = 2;
+  assert_equals(Location.prototype.toString, 2);
+}, "'toString' accessor property is defined");
+
+test(t => {
+  assert_not_own_property(Location.prototype, "toString");
+  t.add_cleanup(() => { delete Location.prototype.toString; });
+
+  Location.prototype.toString = 4;
+  assert_equals(Location.prototype.toString, 4);
+}, "'toString' data property is created via [[Set]]");
+
+test(t => {
+  assert_not_own_property(Location.prototype, "valueOf");
+  t.add_cleanup(() => { delete Location.prototype.valueOf; });
+
+  Object.defineProperty(Location.prototype, "valueOf", {
+    get: () => 6,
+    enumerable: true,
+    configurable: true,
+  });
+
+  assert_equals(Location.prototype.valueOf, 6);
+}, "'valueOf' accessor property is defined");
+
+test(t => {
+  assert_not_own_property(Location.prototype, "valueOf");
+  t.add_cleanup(() => { delete Location.prototype.valueOf; });
+
+  Location.prototype.valueOf = 8;
+  assert_equals(Object.getOwnPropertyDescriptor(Location.prototype, "valueOf").value, 8);
+}, "'valueOf' data property is created via [[Set]]");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html b/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
index 3b7c7832d7e..57712950242 100644
--- a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
@@ -379,7 +379,11 @@ addTest(function(win) {
                    "preventExtensions on cross-origin Window should throw");
   assert_throws_js(TypeError, function() { Object.preventExtensions(win.location) },
                    "preventExtensions on cross-origin Location should throw");
-}, "[[PreventExtensions]] should throw for cross-origin objects");
+  assert_false(Reflect.preventExtensions(win),
+              "Reflect.preventExtensions on cross-origin Window");
+  assert_false(Reflect.preventExtensions(win.location),
+              "Reflect.preventExtensions on cross-origin Location");
+}, "[[PreventExtensions]] should return false cross-origin objects");
 
 /*
  * [[GetOwnProperty]]
diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html b/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html
new file mode 100644
index 00000000000..97a156290a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>[[PreventExtensions]] on a WindowProxy object should return false</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/window-object.html#windowproxy-preventextensions">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(() => {
+  assert_throws_js(TypeError, () => {
+    Object.preventExtensions(window);
+  });
+}, "Object.preventExtensions throws a TypeError");
+
+test(() => {
+  assert_false(Reflect.preventExtensions(window));
+}, "Reflect.preventExtensions returns false");
+</script>
diff --git a/tests/wpt/web-platform-tests/idle-detection/META.yml b/tests/wpt/web-platform-tests/idle-detection/META.yml
index 7e5836bc370..adbdc7bd93d 100644
--- a/tests/wpt/web-platform-tests/idle-detection/META.yml
+++ b/tests/wpt/web-platform-tests/idle-detection/META.yml
@@ -1,4 +1,4 @@
-spec: https://github.com/inexorabletash/idle-detection
+spec: https://wicg.github.io/idle-detection/
 suggested_reviewers:
   - goto
   - jsbell
diff --git a/tests/wpt/web-platform-tests/import-maps/META.yml b/tests/wpt/web-platform-tests/import-maps/META.yml
index bc6d40ec352..dbcc70edabb 100644
--- a/tests/wpt/web-platform-tests/import-maps/META.yml
+++ b/tests/wpt/web-platform-tests/import-maps/META.yml
@@ -1,4 +1,4 @@
-spec: https://github.com/WICG/import-maps
+spec: https://wicg.github.io/import-maps/
 suggested_reviewers:
   - domenic
   - hiroshige-g
diff --git a/tests/wpt/web-platform-tests/input-device-capabilities/META.yml b/tests/wpt/web-platform-tests/input-device-capabilities/META.yml
index f7b8c74fa40..6925e118ae2 100644
--- a/tests/wpt/web-platform-tests/input-device-capabilities/META.yml
+++ b/tests/wpt/web-platform-tests/input-device-capabilities/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/InputDeviceCapabilities/
+spec: https://wicg.github.io/input-device-capabilities/
 suggested_reviewers:
   - SummerLW
   - NavidZ
diff --git a/tests/wpt/web-platform-tests/keyboard-lock/META.yml b/tests/wpt/web-platform-tests/keyboard-lock/META.yml
index e805a9d6658..06c48b40458 100644
--- a/tests/wpt/web-platform-tests/keyboard-lock/META.yml
+++ b/tests/wpt/web-platform-tests/keyboard-lock/META.yml
@@ -1,4 +1,4 @@
-spec: https://w3c.github.io/keyboard-lock/
+spec: https://wicg.github.io/keyboard-lock/
 suggested_reviewers:
   - garykac
   - joedow-42
diff --git a/tests/wpt/web-platform-tests/lifecycle/META.yml b/tests/wpt/web-platform-tests/lifecycle/META.yml
index c1fcbca4c1f..abd5e0f6ed6 100644
--- a/tests/wpt/web-platform-tests/lifecycle/META.yml
+++ b/tests/wpt/web-platform-tests/lifecycle/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/page-lifecycle/spec.html
+spec: https://wicg.github.io/page-lifecycle/
 suggested_reviewers:
   - fmeawad
diff --git a/tests/wpt/web-platform-tests/media-capabilities/META.yml b/tests/wpt/web-platform-tests/media-capabilities/META.yml
index fc70ffb1853..2bd00efb9a7 100644
--- a/tests/wpt/web-platform-tests/media-capabilities/META.yml
+++ b/tests/wpt/web-platform-tests/media-capabilities/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/media-capabilities/
+spec: https://w3c.github.io/media-capabilities/
 suggested_reviewers:
   - mounirlamouri
diff --git a/tests/wpt/web-platform-tests/mediasession/META.yml b/tests/wpt/web-platform-tests/mediasession/META.yml
index bca9602ca31..8eb7fa02614 100644
--- a/tests/wpt/web-platform-tests/mediasession/META.yml
+++ b/tests/wpt/web-platform-tests/mediasession/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/mediasession/
+spec: https://w3c.github.io/mediasession/
 suggested_reviewers:
   - mounirlamouri
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/META.yml b/tests/wpt/web-platform-tests/picture-in-picture/META.yml
index b878dd547b8..8df9be5e5b1 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/META.yml
+++ b/tests/wpt/web-platform-tests/picture-in-picture/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/picture-in-picture/
+spec: https://w3c.github.io/picture-in-picture/
 suggested_reviewers:
   - beaufortfrancois
   - mounirlamouri
diff --git a/tests/wpt/web-platform-tests/scroll-animations/META.yml b/tests/wpt/web-platform-tests/scroll-animations/META.yml
index c53f1f432fe..77e1d50542b 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/META.yml
+++ b/tests/wpt/web-platform-tests/scroll-animations/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/scroll-animations/
+spec: https://drafts.csswg.org/scroll-animations/
 suggested_reviewers:
   - birtles
   - graouts
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml b/tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml
index 13225f6f18f..118ab130dbd 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/ScrollToTextFragment/
+spec: https://wicg.github.io/scroll-to-text-fragment/
 suggested_reviewers:
   - nburris
   - bokan
diff --git a/tests/wpt/web-platform-tests/speech-api/META.yml b/tests/wpt/web-platform-tests/speech-api/META.yml
index 88f1837f96f..2b7a03e245a 100644
--- a/tests/wpt/web-platform-tests/speech-api/META.yml
+++ b/tests/wpt/web-platform-tests/speech-api/META.yml
@@ -1,4 +1,4 @@
-spec: https://w3c.github.io/speech-api/
+spec: https://wicg.github.io/speech-api/
 suggested_reviewers:
   - andrenatal
   - foolip
diff --git a/tests/wpt/web-platform-tests/storage-access-api/META.yml b/tests/wpt/web-platform-tests/storage-access-api/META.yml
index 83f07857538..d3949fb19a4 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/META.yml
+++ b/tests/wpt/web-platform-tests/storage-access-api/META.yml
@@ -1,4 +1,4 @@
-spec: https://github.com/whatwg/html/issues/3338
+spec: https://privacycg.github.io/storage-access/
 suggested_reviewers:
   - Brandr0id
   - ehsan
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-base.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-base.html
new file mode 100644
index 00000000000..e69b121a06b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-base.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<head>
+<base href="/">
+</head>
+<html>
+<title>Test for checking position of the svg element when there is a <base> attribute</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<svg>
+  <line id="line" x2="100" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#line"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 50, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 100, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[0];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml b/tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml
index bfb0e0f1f67..85b7e0ec16d 100644
--- a/tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml
+++ b/tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml
@@ -1,4 +1,4 @@
-spec: https://w3c.github.io/navigation-timing/
+spec: https://w3c.github.io/timing-entrytypes-registry/
 suggested_reviewers:
   - plehegar
   - igrigorik
diff --git a/tests/wpt/web-platform-tests/tools/ci/website_build.sh b/tests/wpt/web-platform-tests/tools/ci/website_build.sh
index f6b26310aab..fc255ae83f2 100755
--- a/tests/wpt/web-platform-tests/tools/ci/website_build.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/website_build.sh
@@ -14,7 +14,7 @@ remote_url=https://${DEPLOY_TOKEN}@github.com/web-platform-tests/wpt.git
 
 function json_property {
   cat ${1} | \
-    python -c "import json, sys; print json.load(sys.stdin).get(\"${2}\", \"\")"
+    python -c "import json, sys; print(json.load(sys.stdin).get(\"${2}\", \"\"))"
 }
 
 function is_pull_request {
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 8fdbdc6bc67..fe0d34b371d 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -19,7 +19,6 @@ from six.moves import urllib
 import uuid
 from collections import defaultdict, OrderedDict
 from itertools import chain, product
-from multiprocessing import Process, Event
 
 from localpaths import repo_root
 from six.moves import reload_module
@@ -407,18 +406,19 @@ def get_route_builder(aliases, config=None):
 
 
 class ServerProc(object):
-    def __init__(self, scheme=None):
+    def __init__(self, mp_context, scheme=None):
         self.proc = None
         self.daemon = None
-        self.stop = Event()
+        self.mp_context = mp_context
+        self.stop = mp_context.Event()
         self.scheme = scheme
 
     def start(self, init_func, host, port, paths, routes, bind_address, config, **kwargs):
-        self.proc = Process(target=self.create_daemon,
-                            args=(init_func, host, port, paths, routes, bind_address,
-                                  config),
-                            name='%s on port %s' % (self.scheme, port),
-                            kwargs=kwargs)
+        self.proc = self.mp_context.Process(target=self.create_daemon,
+                                            args=(init_func, host, port, paths, routes, bind_address,
+                                                  config),
+                                            name='%s on port %s' % (self.scheme, port),
+                                            kwargs=kwargs)
         self.proc.daemon = True
         self.proc.start()
 
@@ -470,7 +470,7 @@ class ServerProc(object):
         return self.proc.is_alive()
 
 
-def check_subdomains(config, routes):
+def check_subdomains(config, routes, mp_context):
     paths = config.paths
     bind_address = config.bind_address
 
@@ -478,7 +478,7 @@ def check_subdomains(config, routes):
     port = get_port()
     logger.debug("Going to use port %d to check subdomains" % port)
 
-    wrapper = ServerProc()
+    wrapper = ServerProc(mp_context)
     wrapper.start(start_http_server, host, port, paths, routes,
                   bind_address, config)
 
@@ -530,7 +530,8 @@ def make_hosts_file(config, host):
     return "".join(rv)
 
 
-def start_servers(host, ports, paths, routes, bind_address, config, **kwargs):
+def start_servers(host, ports, paths, routes, bind_address, config,
+                  mp_context, **kwargs):
     servers = defaultdict(list)
     for scheme, ports in ports.items():
         assert len(ports) == {"http": 2, "https": 2}.get(scheme, 1)
@@ -551,7 +552,7 @@ def start_servers(host, ports, paths, routes, bind_address, config, **kwargs):
                          "wss": start_wss_server,
                          "quic-transport": start_quic_transport_server}[scheme]
 
-            server_proc = ServerProc(scheme=scheme)
+            server_proc = ServerProc(mp_context, scheme=scheme)
             server_proc.start(init_func, host, port, paths, routes, bind_address,
                               config, **kwargs)
             servers[scheme].append((port, server_proc))
@@ -781,7 +782,7 @@ def start_quic_transport_server(host, port, paths, routes, bind_address, config,
         startup_failed(log=False)
 
 
-def start(config, routes, **kwargs):
+def start(config, routes, mp_context, **kwargs):
     host = config["server_host"]
     ports = config.ports
     paths = config.paths
@@ -789,7 +790,7 @@ def start(config, routes, **kwargs):
 
     logger.debug("Using ports: %r" % ports)
 
-    servers = start_servers(host, ports, paths, routes, bind_address, config, **kwargs)
+    servers = start_servers(host, ports, paths, routes, bind_address, config, mp_context, **kwargs)
 
     return servers
 
@@ -966,9 +967,12 @@ def get_parser():
     return parser
 
 
-def run(config_cls=ConfigBuilder, route_builder=None, **kwargs):
+def run(config_cls=ConfigBuilder, route_builder=None, mp_context=None, **kwargs):
     received_signal = threading.Event()
 
+    if mp_context is None:
+        import multiprocessing as mp_context
+
     with build_config(os.path.join(repo_root, "config.json"),
                       config_cls=config_cls,
                       **kwargs) as config:
@@ -998,7 +1002,7 @@ def run(config_cls=ConfigBuilder, route_builder=None, **kwargs):
         routes = route_builder(config.aliases, config).get_routes()
 
         if config["check_subdomains"]:
-            check_subdomains(config, routes)
+            check_subdomains(config, routes, mp_context)
 
         stash_address = None
         if bind_address:
@@ -1006,7 +1010,7 @@ def run(config_cls=ConfigBuilder, route_builder=None, **kwargs):
             logger.debug("Going to use port %d for stash" % stash_address[1])
 
         with stash.StashServer(stash_address, authkey=str(uuid.uuid4())):
-            servers = start(config, routes, **kwargs)
+            servers = start(config, routes, mp_context, **kwargs)
             signal.signal(signal.SIGTERM, handle_signal)
             signal.signal(signal.SIGINT, handle_signal)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 9104fedb5f9..b8f1c7d8286 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -139,15 +139,18 @@ def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_da
             options["prefs"].update({pref: Preferences.cast(value)})
         capabilities["moz:firefoxOptions"] = options
 
-        environ = get_environ(logger,
-                              kwargs["binary"],
-                              kwargs["debug_info"],
-                              kwargs["stylo_threads"],
-                              kwargs["headless"],
-                              kwargs["enable_webrender"],
-                              kwargs["chaos_mode_flags"])
+        # This gets reused for firefox_android, but the environment setup
+        # isn't required in that case
+        if kwargs["binary"]:
+            environ = get_environ(logger,
+                                  kwargs["binary"],
+                                  kwargs["debug_info"],
+                                  kwargs["stylo_threads"],
+                                  kwargs["headless"],
+                                  kwargs["enable_webrender"],
+                                  kwargs["chaos_mode_flags"])
 
-        executor_kwargs["environ"] = environ
+            executor_kwargs["environ"] = environ
     if kwargs["certutil_binary"] is None:
         capabilities["acceptInsecureCerts"] = True
     if capabilities:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index ca6ea96013b..5e9de564963 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -39,7 +39,8 @@ def check_args(**kwargs):
 
 
 def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
-    return {"package_name": kwargs["package_name"],
+    return {"adb_binary": kwargs["adb_binary"],
+            "package_name": kwargs["package_name"],
             "device_serial": kwargs["device_serial"],
             "prefs_root": kwargs["prefs_root"],
             "extra_prefs": kwargs["extra_prefs"],
@@ -128,7 +129,8 @@ class FirefoxAndroidBrowser(Browser):
                  ca_certificate_path=None, e10s=False, enable_webrender=False, stackfix_dir=None,
                  binary_args=None, timeout_multiplier=None, leak_check=False, asan=False,
                  stylo_threads=1, chaos_mode_flags=None, config=None, browser_channel="nightly",
-                 install_fonts=False, tests_root=None, specialpowers_path=None, **kwargs):
+                 install_fonts=False, tests_root=None, specialpowers_path=None, adb_binary=None,
+                 **kwargs):
 
         super(FirefoxAndroidBrowser, self).__init__(logger)
         self.prefs_root = prefs_root
@@ -154,6 +156,7 @@ class FirefoxAndroidBrowser(Browser):
         self.install_fonts = install_fonts
         self.tests_root = tests_root
         self.specialpowers_path = specialpowers_path
+        self.adb_binary = adb_binary
 
         self.profile_creator = ProfileCreator(logger,
                                               prefs_root,
@@ -222,7 +225,9 @@ class FirefoxAndroidBrowser(Browser):
                                            symbols_path=self.symbols_path,
                                            serial=self.device_serial,
                                            # TODO - choose appropriate log dir
-                                           logdir=os.getcwd())
+                                           logdir=os.getcwd(),
+                                           adb_path=self.adb_binary,
+                                           explicit_cleanup=True)
 
         self.logger.debug("Starting %s" % self.package_name)
         # connect to a running emulator
@@ -254,7 +259,7 @@ class FirefoxAndroidBrowser(Browser):
                     self.logger.warning("Failed to remove forwarded or reversed ports: %s" % e)
             # We assume that stopping the runner prompts the
             # browser to shut down.
-            self.runner.stop()
+            self.runner.cleanup()
         self.logger.debug("stopped")
 
     def pid(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
index 2527d26d391..d98e1203930 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
@@ -1,6 +1,6 @@
 import json
 import os
-import multiprocessing
+
 import signal
 import socket
 import sys
@@ -9,6 +9,7 @@ from six import iteritems
 
 from mozlog import get_default_logger, handlers, proxy
 
+from . import mpcontext
 from .wptlogging import LogLevelRewriter
 
 here = os.path.dirname(__file__)
@@ -66,8 +67,9 @@ class TestEnvironment(object):
         self.debug_info = debug_info
         self.options = options if options is not None else {}
 
-        self.cache_manager = multiprocessing.Manager()
-        self.stash = serve.stash.StashServer()
+        mp_context = mpcontext.get_context()
+        self.cache_manager = mp_context.Manager()
+        self.stash = serve.stash.StashServer(mp_context=mp_context)
         self.env_extras = env_extras
         self.env_extras_cms = None
         self.ssl_config = ssl_config
@@ -95,7 +97,8 @@ class TestEnvironment(object):
             self.env_extras_cms.append(cm)
 
         self.servers = serve.start(self.config,
-                                   self.get_routes())
+                                   self.get_routes(),
+                                   mp_context=mpcontext.get_context())
 
         if self.options.get("supports_debugger") and self.debug_info and self.debug_info.interactive:
             self.ignore_interrupts()
@@ -168,7 +171,8 @@ class TestEnvironment(object):
         log_filter = LogLevelRewriter(log_filter, ["error"], "warning")
         server_logger.component_filter = log_filter
 
-        server_logger = proxy.QueuedProxyLogger(server_logger)
+        server_logger = proxy.QueuedProxyLogger(server_logger,
+                                                mpcontext.get_context())
 
         try:
             # Set as the default logger for wptserve
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 51d752cdebc..539c791fbd9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -12,13 +12,13 @@ from six import text_type
 from six.moves.http_client import HTTPConnection
 from six.moves.urllib.parse import urljoin, urlsplit, urlunsplit
 
-from ..testrunner import Stop
 from .actions import actions
 from .protocol import Protocol, BaseProtocolPart
 
 here = os.path.dirname(__file__)
 
 
+
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     timeout_multiplier = kwargs["timeout_multiplier"]
@@ -180,11 +180,11 @@ class TimedRunner(object):
         self.result_flag = threading.Event()
 
     def run(self):
-        if self.set_timeout() is Stop:
-            return Stop
-
-        if self.before_run() is Stop:
-            return Stop
+        for setup_fn in [self.set_timeout, self.before_run]:
+            err = setup_fn()
+            if err:
+                self.result = (False, err)
+                return self.result
 
         executor = threading.Thread(target=self.run_func)
         executor.start()
@@ -296,9 +296,6 @@ class TestExecutor(object):
             self.logger.warning(exception_string)
             result = self.result_from_exception(test, e, exception_string)
 
-        if result is Stop:
-            return result
-
         # log result of parent test
         if result[0].status == "ERROR":
             self.logger.debug(result[0].message)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index dc9e3e164e4..e5d7683facd 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -41,7 +41,6 @@ from .protocol import (ActionSequenceProtocolPart,
                        VirtualAuthenticatorProtocolPart,
                        SetPermissionProtocolPart,
                        PrintProtocolPart)
-from ..testrunner import Stop
 from ..webdriver_server import GeckoDriverServer
 
 
@@ -727,8 +726,9 @@ class ExecuteAsyncScriptRun(TimedRunner):
                 # timeout is set too high. This works at least.
                 self.protocol.base.set_timeout(2**28 - 1)
         except IOError:
-            self.logger.error("Lost marionette connection before starting test")
-            return Stop
+            msg = "Lost marionette connection before starting test"
+            self.logger.error(msg)
+            return ("INTERNAL-ERROR", msg)
 
     def before_run(self):
         index = self.url.rfind("/storage/")
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index 0228922134a..6070007b21a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -23,7 +23,6 @@ from .protocol import (BaseProtocolPart,
                        SendKeysProtocolPart,
                        ActionSequenceProtocolPart,
                        TestDriverProtocolPart)
-from ..testrunner import Stop
 
 here = os.path.dirname(__file__)
 
@@ -278,8 +277,9 @@ class SeleniumRun(TimedRunner):
         try:
             self.protocol.base.set_timeout(timeout + self.extra_timeout)
         except exceptions.ErrorInResponseException:
-            self.logger.error("Lost WebDriver connection")
-            return Stop
+            msg = "Lost WebDriver connection"
+            self.logger.error(msg)
+            return ("INTERNAL-ERROR", msg)
 
     def run_func(self):
         try:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
index 2cd1dbf3ad0..039bcd14e2b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
@@ -10,7 +10,6 @@ from .base import (Protocol,
                    TestharnessExecutor,
                    TimedRunner,
                    strip_server)
-from ..testrunner import Stop
 from ..webdriver_server import wait_for_service
 
 webdriver = None
@@ -184,8 +183,9 @@ class ServoWebDriverTestharnessExecutor(TestharnessExecutor):
                 self.protocol.session.timeouts.script = timeout
                 self.timeout = timeout
             except IOError:
-                self.logger.error("Lost webdriver connection")
-                return Stop
+                msg = "Lost WebDriver connection"
+                self.logger.error(msg)
+                return ("INTERNAL-ERROR", msg)
 
         success, data = ServoWebDriverRun(self.logger,
                                           self.do_testharness,
@@ -276,8 +276,9 @@ class ServoWebDriverRefTestExecutor(RefTestExecutor):
                 self.protocol.session.timeouts.script = timeout
                 self.timeout = timeout
             except IOError:
-                self.logger.error("Lost webdriver connection")
-                return Stop
+                msg = "Lost webdriver connection"
+                self.logger.error(msg)
+                return ("INTERNAL-ERROR", msg)
 
         return ServoWebDriverRun(self.logger,
                                  self._screenshot,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 43fc910c515..e6c5f9f1a20 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -27,7 +27,6 @@ from .protocol import (BaseProtocolPart,
                        GenerateTestReportProtocolPart,
                        SetPermissionProtocolPart,
                        VirtualAuthenticatorProtocolPart)
-from ..testrunner import Stop
 
 import webdriver as client
 from webdriver import error
@@ -355,8 +354,9 @@ class WebDriverRun(TimedRunner):
         try:
             self.protocol.base.set_timeout(self.timeout + self.extra_timeout)
         except client.UnknownErrorException:
-            self.logger.error("Lost WebDriver connection")
-            return Stop
+            msg = "Lost WebDriver connection"
+            self.logger.error(msg)
+            return ("INTERNAL-ERROR", msg)
 
     def run_func(self):
         try:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/mpcontext.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/mpcontext.py
new file mode 100644
index 00000000000..2a84e188d39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/mpcontext.py
@@ -0,0 +1,16 @@
+import multiprocessing
+
+import six
+
+_context = None
+
+
+def get_context():
+    global _context
+
+    if six.PY2:
+        return multiprocessing
+
+    if _context is None:
+        _context = multiprocessing.get_context("spawn")
+    return _context
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index 4a3fa427365..e57619b45fe 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -5,12 +5,12 @@ from six.moves.urllib.parse import urlsplit
 from abc import ABCMeta, abstractmethod
 from six.moves.queue import Empty
 from collections import defaultdict, deque
-from multiprocessing import Queue
 from six import ensure_binary, iteritems
 from six.moves import range
 
 from . import manifestinclude
 from . import manifestexpected
+from . import mpcontext
 from . import wpttest
 from mozlog import structured
 
@@ -390,7 +390,8 @@ class GroupedSource(TestSource):
 
     @classmethod
     def make_queue(cls, tests, **kwargs):
-        test_queue = Queue()
+        mp = mpcontext.get_context()
+        test_queue = mp.Queue()
         groups = []
 
         state = {}
@@ -423,7 +424,8 @@ class GroupedSource(TestSource):
 class SingleTestSource(TestSource):
     @classmethod
     def make_queue(cls, tests, **kwargs):
-        test_queue = Queue()
+        mp = mpcontext.get_context()
+        test_queue = mp.Queue()
         processes = kwargs["processes"]
         queues = [deque([]) for _ in range(processes)]
         metadatas = [cls.group_metadata(None) for _ in range(processes)]
@@ -467,7 +469,8 @@ class GroupFileTestSource(TestSource):
 
         ids_to_tests = {test.id: test for test in tests}
 
-        test_queue = Queue()
+        mp = mpcontext.get_context()
+        test_queue = mp.Queue()
 
         for group_name, test_ids in iteritems(tests_by_group):
             group_metadata = {"scope": group_name}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index e5d7042c73b..8dd93418dd8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -1,14 +1,14 @@
 from __future__ import unicode_literals
 
-import multiprocessing
 import threading
 import traceback
 from six.moves.queue import Empty
 from collections import namedtuple
-from multiprocessing import Process, current_process, Queue
 
 from mozlog import structuredlog, capture
 
+from . import mpcontext
+
 # Special value used as a sentinal in various commands
 Stop = object()
 
@@ -68,7 +68,7 @@ class TestRunner(object):
         self.result_queue = result_queue
 
         self.executor = executor
-        self.name = current_process().name
+        self.name = mpcontext.get_context().current_process().name
         self.logger = logger
 
     def __enter__(self):
@@ -311,9 +311,11 @@ class TestRunnerManager(threading.Thread):
         self.executor_cls = executor_cls
         self.executor_kwargs = executor_kwargs
 
+        mp = mpcontext.get_context()
+
         # Flags used to shut down this thread if we get a sigint
         self.parent_stop_flag = stop_flag
-        self.child_stop_flag = multiprocessing.Event()
+        self.child_stop_flag = mp.Event()
 
         self.rerun = rerun
         self.run_count = 0
@@ -326,8 +328,8 @@ class TestRunnerManager(threading.Thread):
         assert recording is not None
         self.recording = recording
 
-        self.command_queue = Queue()
-        self.remote_queue = Queue()
+        self.command_queue = mp.Queue()
+        self.remote_queue = mp.Queue()
 
         self.test_runner_proc = None
 
@@ -519,9 +521,11 @@ class TestRunnerManager(threading.Thread):
                 executor_browser_kwargs,
                 self.capture_stdio,
                 self.child_stop_flag)
-        self.test_runner_proc = Process(target=start_runner,
-                                        args=args,
-                                        name="TestRunner-%i" % self.manager_number)
+
+        mp = mpcontext.get_context()
+        self.test_runner_proc = mp.Process(target=start_runner,
+                                           args=args,
+                                           name="TestRunner-%i" % self.manager_number)
         self.test_runner_proc.start()
         self.logger.debug("Test runner started")
         # Now we wait for either an init_succeeded event or an init_failed event
@@ -766,6 +770,7 @@ class TestRunnerManager(threading.Thread):
         self.logger.debug("waiting for runner process to end")
         self.test_runner_proc.join(10)
         self.logger.debug("After join")
+        mp = mpcontext.get_context()
         if self.test_runner_proc.is_alive():
             # This might leak a file handle from the queue
             self.logger.warning("Forcibly terminating runner process")
@@ -777,9 +782,9 @@ class TestRunnerManager(threading.Thread):
             # (subsequent attempts to retrieve items may block indefinitely).
             # Discard the potentially-corrupted queue and create a new one.
             self.command_queue.close()
-            self.command_queue = Queue()
+            self.command_queue = mp.Queue()
             self.remote_queue.close()
-            self.remote_queue = Queue()
+            self.remote_queue = mp.Queue()
         else:
             self.logger.debug("Runner process exited with code %i" % self.test_runner_proc.exitcode)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 15d2322494d..bfd6491b2d6 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -196,6 +196,8 @@ scheme host and port.""")
     config_group.add_argument('--webdriver-arg',
                               default=[], action="append", dest="webdriver_args",
                               help="Extra argument for the WebDriver binary")
+    config_group.add_argument("--adb-binary", action="store",
+                              help="Path to adb binary to use")
     config_group.add_argument("--package-name", action="store",
                               help="Android package name to run tests against")
     config_group.add_argument("--device-serial", action="store",
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index b02805ff7e3..3fc9e397a92 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -3,6 +3,7 @@ from __future__ import print_function, unicode_literals
 import json
 import os
 import sys
+
 from six import iteritems, itervalues
 
 import wptserve
@@ -10,6 +11,7 @@ from wptserve import sslutils
 
 from . import environment as env
 from . import instruments
+from . import mpcontext
 from . import products
 from . import testloader
 from . import wptcommandline
@@ -151,11 +153,14 @@ def get_pause_after_test(test_loader, **kwargs):
 def run_tests(config, test_paths, product, **kwargs):
     """Set up the test environment, load the list of tests to be executed, and
     invoke the remainder of the code to execute tests"""
+    mp = mpcontext.get_context()
     if kwargs["instrument_to_file"] is None:
         recorder = instruments.NullInstrument()
     else:
         recorder = instruments.Instrument(kwargs["instrument_to_file"])
-    with recorder as recording, capture.CaptureIO(logger, not kwargs["no_capture_stdio"]):
+    with recorder as recording, capture.CaptureIO(logger,
+                                                  not kwargs["no_capture_stdio"],
+                                                  mp_context=mp):
         recording.set(["startup"])
         env.do_delayed_imports(logger, test_paths)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
index 31af1558b0c..f688ac6016c 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
@@ -1,10 +1,8 @@
 import multiprocessing
-import sys
 import threading
 from multiprocessing.managers import BaseManager
 
 import pytest
-from six import PY3
 
 Stash = pytest.importorskip("wptserve.stash").Stash
 
@@ -20,6 +18,7 @@ def add_cleanup():
     for fn in fns:
         fn()
 
+
 def run(process_queue, request_lock, response_lock):
     """Create two Stash instances in parallel threads. Use the provided locks
     to ensure the first thread is actively establishing an interprocess
@@ -58,16 +57,16 @@ def run(process_queue, request_lock, response_lock):
     process_queue.put(thread_queue.get())
 
 
-@pytest.mark.xfail(sys.platform == "win32" or
-                   PY3 and multiprocessing.get_start_method() == "spawn",
-                   reason="https://github.com/web-platform-tests/wpt/issues/16938")
+class SlowLock(BaseManager):
+    # This can only be used in test_delayed_lock since that test modifies the
+    # class body, but it has to be a global for multiprocessing
+    pass
+
+
 def test_delayed_lock(add_cleanup):
     """Ensure that delays in proxied Lock retrieval do not interfere with
     initialization in parallel threads."""
 
-    class SlowLock(BaseManager):
-        pass
-
     request_lock = multiprocessing.Lock()
     response_lock = multiprocessing.Lock()
 
@@ -98,16 +97,16 @@ def test_delayed_lock(add_cleanup):
         "both instances had valid locks")
 
 
-@pytest.mark.xfail(sys.platform == "win32" or
-                   PY3 and multiprocessing.get_start_method() == "spawn",
-                   reason="https://github.com/web-platform-tests/wpt/issues/16938")
+class SlowDict(BaseManager):
+    # This can only be used in test_delayed_dict since that test modifies the
+    # class body, but it has to be a global for multiprocessing
+    pass
+
+
 def test_delayed_dict(add_cleanup):
     """Ensure that delays in proxied `dict` retrieval do not interfere with
     initialization in parallel threads."""
 
-    class SlowDict(BaseManager):
-        pass
-
     request_lock = multiprocessing.Lock()
     response_lock = multiprocessing.Lock()
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py
index 6b351847491..535355a8287 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py
@@ -1,8 +1,10 @@
 import base64
 import json
 import os
-import uuid
+import six
 import threading
+import uuid
+
 from multiprocessing.managers import AcquirerProxy, BaseManager, DictProxy
 from six import text_type, binary_type
 
@@ -32,13 +34,16 @@ ClientDictManager.register("Lock")
 
 
 class StashServer(object):
-    def __init__(self, address=None, authkey=None):
+    def __init__(self, address=None, authkey=None, mp_context=None):
         self.address = address
         self.authkey = authkey
         self.manager = None
+        self.mp_context = mp_context
 
     def __enter__(self):
-        self.manager, self.address, self.authkey = start_server(self.address, self.authkey)
+        self.manager, self.address, self.authkey = start_server(self.address,
+                                                                self.authkey,
+                                                                self.mp_context)
         store_env_config(self.address, self.authkey)
 
     def __exit__(self, *args, **kwargs):
@@ -61,10 +66,13 @@ def store_env_config(address, authkey):
     os.environ["WPT_STASH_CONFIG"] = json.dumps((address, authkey.decode("ascii")))
 
 
-def start_server(address=None, authkey=None):
+def start_server(address=None, authkey=None, mp_context=None):
     if isinstance(authkey, text_type):
         authkey = authkey.encode("ascii")
-    manager = ServerDictManager(address, authkey)
+    kwargs = {}
+    if six.PY3 and mp_context is not None:
+        kwargs["ctx"] = mp_context
+    manager = ServerDictManager(address, authkey, **kwargs)
     manager.start()
 
     return (manager, manager._address, manager._authkey)
diff --git a/tests/wpt/web-platform-tests/video-rvfc/META.yml b/tests/wpt/web-platform-tests/video-rvfc/META.yml
index 51048591d0a..5e581f4234a 100644
--- a/tests/wpt/web-platform-tests/video-rvfc/META.yml
+++ b/tests/wpt/web-platform-tests/video-rvfc/META.yml
@@ -1,3 +1,3 @@
-spec: https://wicg.github.io/video-rvfc
+spec: https://wicg.github.io/video-rvfc/
 suggested_reviewers:
   - tguilbert
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/META.yml b/tests/wpt/web-platform-tests/wasm/jsapi/META.yml
new file mode 100644
index 00000000000..cf5525ae115
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/META.yml
@@ -0,0 +1 @@
+spec: https://webassembly.github.io/spec/js-api/
diff --git a/tests/wpt/web-platform-tests/wasm/webapi/META.yml b/tests/wpt/web-platform-tests/wasm/webapi/META.yml
new file mode 100644
index 00000000000..69715cd7c8d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/webapi/META.yml
@@ -0,0 +1 @@
+spec: https://webassembly.github.io/spec/web-api/
diff --git a/tests/wpt/web-platform-tests/webcodecs/META.yml b/tests/wpt/web-platform-tests/webcodecs/META.yml
new file mode 100644
index 00000000000..2c510e2a7ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/META.yml
@@ -0,0 +1 @@
+spec: https://wicg.github.io/web-codecs/
diff --git a/tests/wpt/web-platform-tests/webrtc-identity/META.yml b/tests/wpt/web-platform-tests/webrtc-identity/META.yml
index 940144cee1d..fb919db954b 100644
--- a/tests/wpt/web-platform-tests/webrtc-identity/META.yml
+++ b/tests/wpt/web-platform-tests/webrtc-identity/META.yml
@@ -1,4 +1,4 @@
-spec: https://github.com/w3c/webrtc-identity
+spec: https://w3c.github.io/webrtc-identity/identity.html
 suggested_reviewers:
   - martinthomson
   - jan-ivar
diff --git a/tests/wpt/web-platform-tests/webxr/META.yml b/tests/wpt/web-platform-tests/webxr/META.yml
index 520afec2000..13c5d7b595c 100644
--- a/tests/wpt/web-platform-tests/webxr/META.yml
+++ b/tests/wpt/web-platform-tests/webxr/META.yml
@@ -1,3 +1,3 @@
-spec: https://immersive-web.github.io/webxr/spec/latest/
+spec: https://immersive-web.github.io/webxr/
 suggested_reviewers:
   - klausw
diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/META.yml b/tests/wpt/web-platform-tests/webxr/dom-overlay/META.yml
new file mode 100644
index 00000000000..be2b6e613a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/dom-overlay/META.yml
@@ -0,0 +1 @@
+spec: https://immersive-web.github.io/dom-overlays/
diff --git a/tests/wpt/web-platform-tests/webxr/layers/META.yml b/tests/wpt/web-platform-tests/webxr/layers/META.yml
new file mode 100644
index 00000000000..117c1adf021
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/layers/META.yml
@@ -0,0 +1 @@
+spec: https://immersive-web.github.io/layers/
diff --git a/tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html b/tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html
index 4513c5b5379..ab66f29289f 100644
--- a/tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html
+++ b/tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html
@@ -38,6 +38,11 @@ for (const test of [
     url: 'support/Worker-run-forever-during-dynamic-import.js',
     options: {type: 'module'},
     description: 'Worker is terminated during dynamic import() (module)'
+  },
+  {
+    url: 'support/Worker-run-forever-during-top-level-await.js',
+    options: {type: 'module'},
+    description: 'Worker is terminated during top-level await'
   }
 ]) {
   async_test((t) => {
diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-top-level-await.js b/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-top-level-await.js
new file mode 100644
index 00000000000..a1c8b32b619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-top-level-await.js
@@ -0,0 +1,4 @@
+await 1;
+postMessage('start');
+onerror = () => postMessage('onerror');
+while(1);