diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini
new file mode 100644
index 00000000000..46ab4a4ee81
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini
@@ -0,0 +1,2 @@
+[perspective-containing-block-dynamic-1b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini
new file mode 100644
index 00000000000..f7dd637e965
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini
@@ -0,0 +1,2 @@
+[perspective-untransformable-no-stacking-context.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-containing-block-dynamic-1b.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-containing-block-dynamic-1b.html.ini
new file mode 100644
index 00000000000..0d84cc1a788
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-containing-block-dynamic-1b.html.ini
@@ -0,0 +1,2 @@
+[transform-containing-block-dynamic-1b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 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/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 7ef1040edb9..4b2c91acad2 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,24 +309,21 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 30e1b851fd4..70efd28ddfc 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,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini
new file mode 100644
index 00000000000..f6f0b54a8c3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini
@@ -0,0 +1,4 @@
+[pageload-image-in-popup.html]
+  [The document for a standalone media file should have one child in the body.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index 51f8272a6de..75d75b4cda2 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_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/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index b91c29e0274..9a85a905394 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
@@ -2,3 +2,6 @@
   [opener of discarded nested browsing context]
     expected: FAIL
 
+  [opener of discarded auxiliary browsing context]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
index d8dc617a176..2980c16c24d 100644
--- a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
@@ -1648,16 +1648,16 @@
   [Window interface: window must inherit property "originIsolated" with the proper type]
     expected: FAIL
 
-  [Window interface: attribute isSecureContext]
-    expected: FAIL
-
   [Window interface: attribute originIsolated]
     expected: FAIL
 
   [Window interface: attribute crossOriginIsolated]
     expected: FAIL
 
-  [Window interface: window must inherit property "isSecureContext" with the proper type]
+  [Window interface: window must inherit property "originAgentCluster" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute originAgentCluster]
     expected: FAIL
 
 
@@ -2223,9 +2223,6 @@
   [HTMLMarqueeElement interface: document.createElement("marquee") must inherit property "vspace" with the proper type]
     expected: FAIL
 
-  [HTMLLinkElement interface: attribute referrerPolicy]
-    expected: FAIL
-
   [HTMLInputElement interface: createInput("image") must inherit property "width" with the proper type]
     expected: FAIL
 
@@ -2433,12 +2430,6 @@
   [HTMLInputElement interface: createInput("hidden") must inherit property "autocomplete" with the proper type]
     expected: FAIL
 
-  [HTMLScriptElement interface: attribute referrerPolicy]
-    expected: FAIL
-
-  [HTMLLinkElement interface: document.createElement("link") must inherit property "referrerPolicy" with the proper type]
-    expected: FAIL
-
   [HTMLMediaElement interface: document.createElement("video") must inherit property "getStartDate()" with the proper type]
     expected: FAIL
 
@@ -2625,9 +2616,6 @@
   [HTMLObjectElement interface: attribute height]
     expected: FAIL
 
-  [HTMLScriptElement interface: document.createElement("script") must inherit property "referrerPolicy" with the proper type]
-    expected: FAIL
-
   [HTMLAreaElement interface: document.createElement("area") must inherit property "hash" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f45aaafe1c5..4e69eb752b6 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,15 +1,16 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_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/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    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/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 7efd2056c76..aaf45e314d7 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
@@ -404,3 +404,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\]\t-4.3575523383884062e+28\t9.3139332532882690e-1\t4.3575523383884062e+28\t4.6785307773705376e+28\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 4.3575523383884062e+28 at index of 28696.\n\tMax RelError of 4.6785307773705376e+28 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\]\t-2.5797221022028362e+21\t9.3139332532882690e-1\t2.5797221022028362e+21\t2.7697451034363701e+21\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 2.5797221022028362e+21 at index of 28696.\n\tMax RelError of 2.7697451034363701e+21 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-384.7973725474673 dB) is not greater than or equal to 65.737. Got -384.7973725474673.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-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/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ee0945fa2c2..643a30ffb4b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -26,6 +26,13 @@
         null,
         {}
        ]
+      ],
+      "clearance-containing-fragmented-float-crash.html": [
+       "3e62a52c30a41066fc0ccc35b713db9eb37b6973",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "linebox": {
@@ -393,7 +400,7 @@
        {}
       ]
      ],
-     "file-selector-button-display-toggle-crash.tentative.html": [
+     "file-selector-button-display-toggle-crash.html": [
       "bc9f24ae0194fc3b59a1f0da7e8c2e13cf9eb9c5",
       [
        null,
@@ -131794,6 +131801,578 @@
        ],
        {}
       ]
+     ],
+     "css-supports-001.xht": [
+      "3f8782580168132c64e831d55dd959d5b7a9c65d",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-002.xht": [
+      "48326acb7eedc08991128d176626c2141da47880",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-003.xht": [
+      "4e01f53699440aa9e34167ae676148842ee4fc85",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-004.xht": [
+      "7c4ad818b4f74b1852d9032e543a444b0827ec50",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-005.xht": [
+      "c184d70df7c084381b14d3cad1bd6fc4ccae535a",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-006.xht": [
+      "faf8f68f64332860b2a663d0e8682402f846b3b2",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-007.xht": [
+      "716b15232b98a0256eae81d988119a096295aeb8",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-008.xht": [
+      "80596a9d466ba6c28bc6758fa4efb52aa435d874",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-009.xht": [
+      "31fffbe7146d7c84716a84aee299cd7dd9ffd47a",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-010.xht": [
+      "17b8810f14099c302218a99a91670997b6dec226",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-011.xht": [
+      "d70cc00542332c01da8febdcf1986de3cb8dba2f",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-012.xht": [
+      "c9ff483a51dfaf14b5a88c89fd5b25684b70e3c2",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-013.xht": [
+      "2c0b62e616409922f3269ea6fd2a2852aba62246",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-014.xht": [
+      "90c3bb4e33e07b08987ae9a340bff9334ee9d1e6",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-015.xht": [
+      "66c7edbe5d3148509919caf4d135d59254f402c8",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-016.xht": [
+      "bad6053133ae100c0bceba4fba04ad642e9080ec",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-017.xht": [
+      "92b8d04e7f24bbacf653cb0946c59cb7038977b2",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-018.xht": [
+      "2019a2a7cb1bcd8845f584aa5140ec0e7415605b",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-019.xht": [
+      "109c8528ba54da05ee43ad4215b2195ceac825cb",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-020.xht": [
+      "e6d5a1111d22cf74ddf4d7e0bb4014b5bd9facfd",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-021.xht": [
+      "df98d12068eebc54e948b66ce53c7ca1dd42ff01",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-022.xht": [
+      "b2fb5ed278766147f5e450efa7a9f98b585d75b2",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-023.xht": [
+      "e01f018427b62c8d332ac33ac8d204fdde97f945",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-024.xht": [
+      "de2baf3953fefbc831b578cc2f04b6ec3f6222b9",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-025.xht": [
+      "7a766146e5567cf8c34166a2e4a154be41ed2fec",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-026.xht": [
+      "920143e7976643aeffae4cca6c52d1d6044f626a",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-029.xht": [
+      "0d1bb589afc40428d5f86d38cd2fcdd24501914e",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-030.xht": [
+      "6c087b8b0ac644aa2c000c2b1238d3790b075745",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-031.xht": [
+      "9ff7c14c416f4d175ddbc5f3699c9a1dbd875b56",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-032.xht": [
+      "baae565768852a82394440cb76f0afcc26a201d6",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-033.xht": [
+      "c6c0c39f3a5f632a85e3782d962ac155a321497a",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-034.xht": [
+      "c6c0c39f3a5f632a85e3782d962ac155a321497a",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-035.xht": [
+      "471a715131837de25abd9606725d0b700a4ca467",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-036.xht": [
+      "c18ba6629435e7efb1c273a5cb0d256a66a31ac3",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-037.xht": [
+      "137be1b598ecbdcd34c352eba2a845cd8443cfad",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-038.xht": [
+      "f6974a9b04bdca3fea17d96518e4238160f80ae8",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-039.xht": [
+      "1032263b1c49bb60932a30ec6e7aaebc6455f169",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-040.xht": [
+      "cda404996888e7aaf4c2d5fb6bd3c1b674c3cc1b",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-041.xht": [
+      "c49c66abda12bff4b4a95f9d294a42080dde1c35",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-042.xht": [
+      "2b0f104d600b12a6dad0c808b3d81b2530885203",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-043.xht": [
+      "3ec6f8ec2a27f012f5e6dca5da3972847ab26517",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-044.xht": [
+      "f79e25d18b8d12bf80df313cd57fa47f1850ad94",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-045.xht": [
+      "e7bb2d46c9303444749da4facb77e5f8cfb785eb",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "css-supports-046.xht": [
+      "3cd5900598ab1adcf410b7b72287c6b29f04b334",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/support/pass.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-contain": {
@@ -160350,7 +160929,7 @@
       ]
      ],
      "counter-set-002.html": [
-      "a4792599826cf13bb40a70c36d850e6593fbce55",
+      "6978a63efaffd10e932a386b824dca20ce6c51b6",
       [
        null,
        [
@@ -171602,7 +172181,7 @@
        {}
       ]
      ],
-     "file-selector-button-001.tentative.html": [
+     "file-selector-button-001.html": [
       "48b2852de820f61ce5344584ab1ff3aa2313adcf",
       [
        null,
@@ -174903,6 +175482,19 @@
        ],
        {}
       ]
+     ],
+     "part-nested-pseudo.html": [
+      "f1753de7752840cd2841cb8002c10ac08038cf18",
+      [
+       null,
+       [
+        [
+         "/css/css-shadow-parts/part-nested-pseudo-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-shapes": {
@@ -177899,6 +178491,19 @@
         {}
        ]
       ],
+      "abspos-016.html": [
+       "dc520b972b41e6289a82c41dd7db6b76077da341",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "auto-margins-001.html": [
        "9e89ab6ca7f5220ea030aa537bcb3b64f156043d",
        [
@@ -179303,6 +179908,32 @@
         {}
        ]
       ],
+      "replaced-element-029.html": [
+       "e8d106a88fa4d40f003b121476b205b86ab5cf7a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-030.html": [
+       "97aac0fde500e003ce090284219107d6d82d2df7",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "zero-or-infinity-001.html": [
        "760635c40e8fde8f3514761c77e83385592861b0",
        [
@@ -180164,6 +180795,19 @@
        {}
       ]
      ],
+     "intrinsic-percent-replaced-009.html": [
+      "03407dc2b9900c8d5e1274a7f71a674349af70cb",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/intrinsic-percent-replaced-009-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "intrinsic-percent-replaced-dynamic-001.html": [
       "1128ffa1759f26011c0639d8b5f498322c6396ac",
       [
@@ -198994,6 +199638,32 @@
        ]
       ]
      },
+     "perspective-containing-block-dynamic-1a.html": [
+      "51e76745b5a41320058aa3669499afa85ec41e72",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/containing-block-dynamic-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "perspective-containing-block-dynamic-1b.html": [
+      "a417bd482ebf71e4b53f62c792dc35383b37575f",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/containing-block-dynamic-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "perspective-origin-001.html": [
       "108dd64e126e537184ab045ef2e4fd6685e6ca93",
       [
@@ -199166,6 +199836,45 @@
        {}
       ]
      ],
+     "perspective-untransformable-no-stacking-context.html": [
+      "8916a39bbb55fc18194761694ce2b9b925258901",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "perspective-zero-2.html": [
+      "59565ff3cd279f38c5968b117fb984d83e98178b",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/perspective-zero-2-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "perspective-zero.html": [
+      "f0044ad0010c5af53bcac1e448bcba46c2ed6042",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/reference/green.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "preserve3d-button.html": [
       "544bb2496638a52915f7c97a238ccb053b4e884e",
       [
@@ -201125,6 +201834,32 @@
        {}
       ]
      ],
+     "transform-containing-block-dynamic-1a.html": [
+      "7e6a10dda1c24e86f7635bd202efec48e6089fbd",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/containing-block-dynamic-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "transform-containing-block-dynamic-1b.html": [
+      "61266f02e265ebc0db1aa742aff74b8f70cbe30f",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/containing-block-dynamic-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "transform-descendant-001.html": [
       "7fef84180e7ad7c1bdb1f2e24b57fd761f28714d",
       [
@@ -229952,580 +230687,6 @@
          ]
         ]
        },
-       "conditional3": {
-        "css-supports-001.xht": [
-         "3f8782580168132c64e831d55dd959d5b7a9c65d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-002.xht": [
-         "48326acb7eedc08991128d176626c2141da47880",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-003.xht": [
-         "4e01f53699440aa9e34167ae676148842ee4fc85",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-004.xht": [
-         "7c4ad818b4f74b1852d9032e543a444b0827ec50",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-005.xht": [
-         "c184d70df7c084381b14d3cad1bd6fc4ccae535a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-006.xht": [
-         "faf8f68f64332860b2a663d0e8682402f846b3b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-007.xht": [
-         "716b15232b98a0256eae81d988119a096295aeb8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-008.xht": [
-         "80596a9d466ba6c28bc6758fa4efb52aa435d874",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-009.xht": [
-         "31fffbe7146d7c84716a84aee299cd7dd9ffd47a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-010.xht": [
-         "17b8810f14099c302218a99a91670997b6dec226",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-011.xht": [
-         "d70cc00542332c01da8febdcf1986de3cb8dba2f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-012.xht": [
-         "c9ff483a51dfaf14b5a88c89fd5b25684b70e3c2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-013.xht": [
-         "2c0b62e616409922f3269ea6fd2a2852aba62246",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-014.xht": [
-         "90c3bb4e33e07b08987ae9a340bff9334ee9d1e6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-015.xht": [
-         "66c7edbe5d3148509919caf4d135d59254f402c8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-016.xht": [
-         "bad6053133ae100c0bceba4fba04ad642e9080ec",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-017.xht": [
-         "92b8d04e7f24bbacf653cb0946c59cb7038977b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-018.xht": [
-         "2019a2a7cb1bcd8845f584aa5140ec0e7415605b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-019.xht": [
-         "109c8528ba54da05ee43ad4215b2195ceac825cb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-020.xht": [
-         "e6d5a1111d22cf74ddf4d7e0bb4014b5bd9facfd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-021.xht": [
-         "df98d12068eebc54e948b66ce53c7ca1dd42ff01",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-022.xht": [
-         "b2fb5ed278766147f5e450efa7a9f98b585d75b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-023.xht": [
-         "e01f018427b62c8d332ac33ac8d204fdde97f945",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-024.xht": [
-         "de2baf3953fefbc831b578cc2f04b6ec3f6222b9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-025.xht": [
-         "7a766146e5567cf8c34166a2e4a154be41ed2fec",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-026.xht": [
-         "920143e7976643aeffae4cca6c52d1d6044f626a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-029.xht": [
-         "0d1bb589afc40428d5f86d38cd2fcdd24501914e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-030.xht": [
-         "6c087b8b0ac644aa2c000c2b1238d3790b075745",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-031.xht": [
-         "9ff7c14c416f4d175ddbc5f3699c9a1dbd875b56",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-032.xht": [
-         "baae565768852a82394440cb76f0afcc26a201d6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-033.xht": [
-         "c6c0c39f3a5f632a85e3782d962ac155a321497a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-034.xht": [
-         "c6c0c39f3a5f632a85e3782d962ac155a321497a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-035.xht": [
-         "471a715131837de25abd9606725d0b700a4ca467",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-036.xht": [
-         "c18ba6629435e7efb1c273a5cb0d256a66a31ac3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-037.xht": [
-         "137be1b598ecbdcd34c352eba2a845cd8443cfad",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-038.xht": [
-         "f6974a9b04bdca3fea17d96518e4238160f80ae8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-039.xht": [
-         "1032263b1c49bb60932a30ec6e7aaebc6455f169",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-040.xht": [
-         "cda404996888e7aaf4c2d5fb6bd3c1b674c3cc1b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-041.xht": [
-         "c49c66abda12bff4b4a95f9d294a42080dde1c35",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-042.xht": [
-         "2b0f104d600b12a6dad0c808b3d81b2530885203",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-043.xht": [
-         "3ec6f8ec2a27f012f5e6dca5da3972847ab26517",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-044.xht": [
-         "f79e25d18b8d12bf80df313cd57fa47f1850ad94",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-045.xht": [
-         "e7bb2d46c9303444749da4facb77e5f8cfb785eb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "css-supports-046.xht": [
-         "3cd5900598ab1adcf410b7b72287c6b29f04b334",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "contain": {
         "contain-layout-containing-block-absolute-001.html": [
          "036cf7d8dd6f6de18e5aa4cf9f1df25799b10094",
@@ -238757,99 +238918,6 @@
          ]
         ]
        },
-       "transforms": {
-        "perspective-containing-block-dynamic-1a.html": [
-         "51e76745b5a41320058aa3669499afa85ec41e72",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "perspective-containing-block-dynamic-1b.html": [
-         "a417bd482ebf71e4b53f62c792dc35383b37575f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "perspective-untransformable-no-stacking-context.html": [
-         "8916a39bbb55fc18194761694ce2b9b925258901",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-untransformable-no-stacking-context-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "perspective-zero-2.html": [
-         "59565ff3cd279f38c5968b117fb984d83e98178b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero-2-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "perspective-zero.html": [
-         "f0044ad0010c5af53bcac1e448bcba46c2ed6042",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reference/green.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "transform-containing-block-dynamic-1a.html": [
-         "7e6a10dda1c24e86f7635bd202efec48e6089fbd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "transform-containing-block-dynamic-1b.html": [
-         "61266f02e265ebc0db1aa742aff74b8f70cbe30f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "ui3": {
         "box-sizing-border-box-001.xht": [
          "3118bc40b54435384c2566b999225c21293b15b8",
@@ -280581,19 +280649,19 @@
        "afdcc7c011b18e372a4e8b4b9e383d85c3b0327f",
        []
       ],
-      "worker-importscripts.js": [
-       "0ae53e7877a6d1d218ba67bb66849294a3912fa8",
+      "worker-with-script-src-none-importscripts.js": [
+       "d2b6691b8aa4baae4048acfdb8d0a2f4aa9d7884",
        []
       ],
-      "worker-importscripts.js.sub.headers": [
+      "worker-with-script-src-none-importscripts.js.sub.headers": [
        "57616b1fc2dbdcd6399152a03cd13a248ef66313",
        []
       ],
-      "worker-set-timeout.js": [
-       "a16827eddfc8b214f674614de1cc2b9d10009141",
+      "worker-with-script-src-none-set-timeout.js": [
+       "c4241c97d0b4aa37baf50a7a5f8312aabb4e50d6",
        []
       ],
-      "worker-set-timeout.js.sub.headers": [
+      "worker-with-script-src-none-set-timeout.js.sub.headers": [
        "57616b1fc2dbdcd6399152a03cd13a248ef66313",
        []
       ]
@@ -280805,7 +280873,7 @@
       []
      ],
      "testharness-helper.js": [
-      "291af74037aa25d99597538327b0a3cf1900d897",
+      "5c36e286da2b0ad68da22f7c0e9f68e29ea7857b",
       []
      ],
      "var-a.js": [
@@ -303023,6 +303091,12 @@
        "fcb243c7fb1f72c5cf1f995e0a3d9771ec5d71fd",
        []
       ]
+     },
+     "support": {
+      "pass.xht": [
+       "24dc3107e8b05ba65f7f418b5d078fee2db9ba86",
+       []
+      ]
      }
     },
     "css-contain": {
@@ -314833,7 +314907,7 @@
       []
      ],
      "counter-set-002-ref.html": [
-      "5ee2e30a9dda7c1ee5f468d6df994e9e8c971355",
+      "26d11b32f64a170f65a37d572950fe37e78594bc",
       []
      ],
      "inline-block-list-marker-ref.html": [
@@ -318064,6 +318138,10 @@
       "11943c229a0ea76893039b1306bb38402c71f6ad",
       []
      ],
+     "part-nested-pseudo-ref.html": [
+      "8eee65a27045ae97d10ed22050126d94fa69ed9b",
+      []
+     ],
      "support": {
       "shadow-helper.js": [
        "94accd6b1f9b095fda0079f7b86b866d88ffee01",
@@ -318900,6 +318978,10 @@
         "b98ca0ba0a03c580ac339e4a3653539cfa8edc71",
         []
        ],
+       "200x200-green.png": [
+        "1dcc392a6ef71e55302c40d41a547cf3f75a8f24",
+        []
+       ],
        "20x50-green.png": [
         "f7f6e67feee0079f21791cf050baffd87b67f8ab",
         []
@@ -319074,6 +319156,10 @@
       "38f480c0acdbf4ca9605831e9e48a9998b1bcdd3",
       []
      ],
+     "intrinsic-percent-replaced-009-ref.html": [
+      "df854d75fcaa381ad51912f3c282b179db478fbf",
+      []
+     ],
      "max-content-input-001-ref.html": [
       "c01e46550a7f0b5b92321d5893a8fe2a1ea0c9ac",
       []
@@ -322960,6 +323046,10 @@
       "ebd2d860cec74ba0d535637934aca8dadf90571d",
       []
      ],
+     "containing-block-dynamic-1-ref.html": [
+      "34b66abdb143f3566cadba64d3fd8f66511528f3",
+      []
+     ],
      "css-rotate-2d-3d-001-ref.html": [
       "54940566cd107ba443d3183dccecb505a811d14e",
       []
@@ -323108,6 +323198,14 @@
       "a4fc022382c957fe130905f5935cd33736117b03",
       []
      ],
+     "perspective-untransformable-no-stacking-context-ref.html": [
+      "31be3d081e802857c40bc8cef2664f140169ba36",
+      []
+     ],
+     "perspective-zero-2-ref.html": [
+      "64969c4b7a196cc585bd4ef99e6372d3c73c9610",
+      []
+     ],
      "preserve3d-button-ref.html": [
       "e5e3c1ebfcdd7c832a211d17ac2f1ed6f4116252",
       []
@@ -323161,6 +323259,10 @@
        "2d09498f3b6f1290468ec886c8db01dee41e5455",
        []
       ],
+      "green.html": [
+       "f7714d2b8bdfa95c88d0fc4139cfb3ad7f78fcad",
+       []
+      ],
       "perspective-origin-reftest.html": [
        "c39661796a4129cb514cd632c5742177825fde2f",
        []
@@ -330944,18 +331046,6 @@
          []
         ]
        },
-       "conditional3": {
-        "reftest.list": [
-         "f10bede79fa9b2e95d82c36c3aa32de5bb7a2e00",
-         []
-        ],
-        "support": {
-         "pass.xht": [
-          "24dc3107e8b05ba65f7f418b5d078fee2db9ba86",
-          []
-         ]
-        }
-       },
        "contain": {
         "contain-layout-formatting-context-margin-001-ref.html": [
          "5a6d653862417ff7c1a6817434da2b2025a347ad",
@@ -331452,12 +331542,6 @@
          []
         ]
        },
-       "flexbox": {
-        "reftest.list": [
-         "8e2c24584021a59b4e6292537ef44a80a721d191",
-         []
-        ]
-       },
        "fonts3": {
         "font-size-zero-1-notref.html": [
          "9e95ca66ec75caeaa104b7f9eea14ace52f7f46b",
@@ -332047,7 +332131,7 @@
         }
        },
        "reftest.list": [
-        "a0e7a924c2a216499287dd6d822f6d162ea80546",
+        "3bf278e19892b4e8cb16b47ba6db9c10f373d9d7",
         []
        ],
        "ruby": {
@@ -332612,30 +332696,6 @@
          []
         ]
        },
-       "transforms": {
-        "containing-block-dynamic-1-ref.html": [
-         "34b66abdb143f3566cadba64d3fd8f66511528f3",
-         []
-        ],
-        "perspective-untransformable-no-stacking-context-ref.html": [
-         "31be3d081e802857c40bc8cef2664f140169ba36",
-         []
-        ],
-        "perspective-zero-2-ref.html": [
-         "64969c4b7a196cc585bd4ef99e6372d3c73c9610",
-         []
-        ],
-        "reference": {
-         "green.html": [
-          "f7714d2b8bdfa95c88d0fc4139cfb3ad7f78fcad",
-          []
-         ]
-        },
-        "reftest.list": [
-         "e4777148d4ba3ab83c4db9b2ae99a27db54b3041",
-         []
-        ]
-       },
        "ui3": {
         "box-sizing-border-box-001-ref.xht": [
          "e886a0f05e3afb7c2a43c66649def5287383de35",
@@ -351388,7 +351448,7 @@
      []
     ],
     "html.idl": [
-     "7a900255780ba3849d9184186efe68cf9b916f79",
+     "dfe4e1e586b5a2b5c5ba070f3c73bc55061e999d",
      []
     ],
     "idle-detection.tentative.idl": [
@@ -351472,7 +351532,7 @@
      []
     ],
     "mediasession.idl": [
-     "c2b2e0589e1c217a2e108f8b12c25ae2f2ad3998",
+     "3dd0cd75270bddebf310fc027c5ef1d31c417a13",
      []
     ],
     "mediastream-recording.idl": [
@@ -352047,7 +352107,7 @@
     ]
    },
    "lint.ignore": [
-    "814007b02ee63cfbab5d10d2785c5e5c7a4692f4",
+    "b11dd75219223f82eb448453330de56c533a7f07",
     []
    ],
    "loading": {
@@ -362425,11 +362485,11 @@
       []
      ],
      "cacert.key": [
-      "1c1ca2bc110002bb5ad5f2315b8953a37a2592d9",
+      "1df8d73c3b2c1f8302383d54bdc69ea28a533ad1",
       []
      ],
      "cacert.pem": [
-      "a9383d0cf00bb59ccf7341a8639d9cc646312e1b",
+      "b30adfa419bee9e697e4b0e8ca2e582a12abbddf",
       []
      ],
      "config.json": [
@@ -362437,11 +362497,11 @@
       []
      ],
      "web-platform.test.key": [
-      "4e557404ab2bf093d93fae5c37446cc0e309cfe5",
+      "492fa9fd0492796bf8d654e89ada6a87fdcdd2cf",
       []
      ],
      "web-platform.test.pem": [
-      "7c58aa67f0a40337c133906289b586fc7c9c97c7",
+      "51df91094a343f3386cc244d21934c517b9868cb",
       []
      ]
     },
@@ -362573,7 +362633,7 @@
       []
      ],
      "pr_preview.py": [
-      "5bd2365164b98ba1a8c90a8d1a987fbaf8c97c73",
+      "c7107334d4fc9107b313134540d641c03ad21a5f",
       []
      ],
      "regen_certs.py": [
@@ -362662,7 +362722,7 @@
        []
       ],
       "test_pr_preview.py": [
-       "87478727d3e20528fea165f0634df7d299d5a6ea",
+       "a268383ed0b121863623cca9469aaa0c00ba266a",
        []
       ]
      },
@@ -369369,7 +369429,7 @@
         []
        ],
        "chrome_spki_certs.py": [
-        "071d53e9e4eea9b458681e4697610a8539fb114c",
+        "ef67c0c52279dc096e783e795f3147c448b148f3",
         []
        ],
        "edge.py": [
@@ -397867,8 +397927,8 @@
        {}
       ]
      ],
-     "worker-importscripts-blocked.sub.html": [
-      "28906138069e255d671d5d25db75d15082647ea2",
+     "worker-importscripts.sub.html": [
+      "0d7490d350ee413b5ddaef81bfabf50c6e809f4f",
       [
        null,
        {}
@@ -397881,8 +397941,8 @@
        {}
       ]
      ],
-     "worker-set-timeout-blocked.sub.html": [
-      "5f93433416b1a40efe7fa38389dc5a54a587add4",
+     "worker-set-timeout.sub.html": [
+      "68d7a56a186774b627ae7e8644eb5ef1ed36620a",
       [
        null,
        {}
@@ -504096,7 +504156,7 @@
    },
    "native-io": {
     "close_async.tentative.https.any.js": [
-     "fb53e3d4ca646ea57ef9b4b4d3510cddf0d9c299",
+     "1a7c680084cebea00be6910306dc276378ac2050",
      [
       "native-io/close_async.tentative.https.any.html",
       {
@@ -504112,8 +504172,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504131,8 +504196,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504150,8 +504220,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504169,8 +504244,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ]
     ],
@@ -504384,7 +504464,7 @@
       ]
      ],
      "concurrent_io_read_async.tentative.https.any.js": [
-      "0cc4ad3e930bbe9de379af308939ad329a2af75e",
+      "fb98fed67ca15e6c852931b6f49e677cb6ab0a9d",
       [
        "native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.html",
        {
@@ -504404,8 +504484,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504427,8 +504512,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504450,8 +504540,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504473,13 +504568,18 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ]
      ],
      "concurrent_io_setLength_async.tentative.https.any.js": [
-      "abff5d89dd06564c123a67a14cf20f2deacf1f12",
+      "2d7617d011c001fad6988c859257d643900ff07d",
       [
        "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.html",
        {
@@ -504499,8 +504599,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504522,8 +504627,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504545,8 +504655,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504568,13 +504683,18 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ]
      ],
      "concurrent_io_write_async.tentative.https.any.js": [
-      "0deb7652ee7f0a17693310443265b3a2d8d3a9b4",
+      "729bee3a08371f57a5ab73b7f6d641e63b22bb0c",
       [
        "native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.html",
        {
@@ -504594,8 +504714,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504617,8 +504742,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504640,8 +504770,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ],
       [
@@ -504663,8 +504798,13 @@
          [
           "script",
           "../resources/support.js"
+         ],
+         [
+          "timeout",
+          "long"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ]
      ]
@@ -504751,7 +504891,7 @@
      ]
     ],
     "flush_async_basic.tentative.https.any.js": [
-     "2036d22a3822fc8252794758012cc5a77a26f003",
+     "2202e55621506cee0598740d3d76b220f1259e90",
      [
       "native-io/flush_async_basic.tentative.https.any.html",
       {
@@ -504767,8 +504907,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504786,8 +504931,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504805,8 +504955,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -504824,8 +504979,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ]
     ],
@@ -505178,7 +505338,7 @@
      ]
     ],
     "rename_async_failure_handling.tentative.https.any.js": [
-     "bff8234f4a58ff343e068f64e97330d03b79bf53",
+     "125f49cdf895b7660c7371a9933dc5daf2300cf7",
      [
       "native-io/rename_async_failure_handling.tentative.https.any.html",
       {
@@ -505194,8 +505354,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -505213,8 +505378,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -505232,8 +505402,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -505251,8 +505426,13 @@
         [
          "script",
          "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ]
     ],
@@ -529126,7 +529306,7 @@
      ]
     ],
     "slotchange.html": [
-     "1f94cc7bee28a14442278aab355089abc9435a56",
+     "9c4b81a156360d95ff57045147dc7c7a747e0fd6",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini b/tests/wpt/metadata/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini
new file mode 100644
index 00000000000..46ab4a4ee81
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/perspective-containing-block-dynamic-1b.html.ini
@@ -0,0 +1,2 @@
+[perspective-containing-block-dynamic-1b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini b/tests/wpt/metadata/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini
new file mode 100644
index 00000000000..f7dd637e965
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/perspective-untransformable-no-stacking-context.html.ini
@@ -0,0 +1,2 @@
+[perspective-untransformable-no-stacking-context.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-containing-block-dynamic-1b.html.ini b/tests/wpt/metadata/css/css-transforms/transform-containing-block-dynamic-1b.html.ini
new file mode 100644
index 00000000000..0d84cc1a788
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/transform-containing-block-dynamic-1b.html.ini
@@ -0,0 +1,2 @@
+[transform-containing-block-dynamic-1b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 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/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index fcdcecc06b3..5df18ced386 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,24 +309,21 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 30e1b851fd4..70efd28ddfc 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini
new file mode 100644
index 00000000000..f6f0b54a8c3
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html.ini
@@ -0,0 +1,4 @@
+[pageload-image-in-popup.html]
+  [The document for a standalone media file should have one child in the body.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index 51f8272a6de..75d75b4cda2 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
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/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 49b12655f9a..442db3cb549 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
@@ -5,3 +5,6 @@
   [opener of discarded nested browsing context]
     expected: FAIL
 
+  [opener of discarded auxiliary browsing context]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index a03a1ca7ced..92a489f7f2d 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -1831,6 +1831,12 @@
   [Window interface: attribute crossOriginIsolated]
     expected: FAIL
 
+  [Window interface: window must inherit property "originAgentCluster" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute originAgentCluster]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..f4d11768961 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -6,10 +7,10 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_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/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    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/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 6bd53defaf4..dfbefe53f1c 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
@@ -632,3 +632,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\]\t-4.3575523383884062e+28\t9.3139332532882690e-1\t4.3575523383884062e+28\t4.6785307773705376e+28\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 4.3575523383884062e+28 at index of 28696.\n\tMax RelError of 4.6785307773705376e+28 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\]\t-2.5797221022028362e+21\t9.3139332532882690e-1\t2.5797221022028362e+21\t2.7697451034363701e+21\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 2.5797221022028362e+21 at index of 28696.\n\tMax RelError of 2.7697451034363701e+21 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-384.7973725474673 dB) is not greater than or equal to 65.737. Got -384.7973725474673.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-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/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js
deleted file mode 100644
index 0ae53e7877a..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js
+++ /dev/null
@@ -1,5 +0,0 @@
-try {
-    importScripts("/content-security-policy/support/post-message.js");
-} catch (e) {
-    postMessage("importScripts blocked");
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js
deleted file mode 100644
index a16827eddfc..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var id = 0;
-try {
-    id = setTimeout("postMessage('handler invoked')", 100);
-} catch (e) {}
-postMessage(id === 0 ? "setTimeout blocked" : "setTimeout allowed");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js
new file mode 100644
index 00000000000..d2b6691b8aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js
@@ -0,0 +1,17 @@
+var message = "importScripts allowed";
+try {
+    importScripts("/content-security-policy/support/post-message.js");
+} catch (e) {
+    message = "importScripts blocked";
+}
+
+if (typeof SharedWorkerGlobalScope === "function") {
+  onconnect = function (e) {
+    var port = e.ports[0];
+
+    port.onmessage = function () { port.postMessage(message); }
+    port.postMessage(message);
+  };
+} else if (typeof DedicatedWorkerGlobalScope === "function") {
+  self.postMessage(message);
+}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js
new file mode 100644
index 00000000000..c4241c97d0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js
@@ -0,0 +1,16 @@
+var id = 0;
+try {
+  id = setTimeout("postMessage('handler invoked')", 100);
+} catch (e) {}
+var message = id === 0 ? "setTimeout blocked" : "setTimeout allowed";
+
+if (typeof SharedWorkerGlobalScope === "function") {
+  onconnect = function (e) {
+    var port = e.ports[0];
+
+    port.onmessage = function () { port.postMessage(message); }
+    port.postMessage(message);
+  };
+} else if (typeof DedicatedWorkerGlobalScope === "function") {
+  self.postMessage(message);
+}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html
deleted file mode 100644
index 28906138069..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
-    <title>worker-importscripts-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log('Fail');
-        });
-        var result = '';
-        try {
-            var worker = new Worker('/content-security-policy/script-src/support/worker-importscripts.js');
-            worker.onmessage = function(event) {
-                result = event.data;
-                test(function() {
-                    assert_equals(result, 'importScripts blocked')
-                });
-                log("TEST COMPLETE");
-            };
-        } catch (e) {
-            result = e;
-            test(function() {
-                assert_equals(result, 'importScripts blocked')
-            });
-            log("TEST COMPLETE");
-        }
-
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts.sub.html
new file mode 100644
index 00000000000..0d7490d350e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts.sub.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
+    <title>worker-importscripts</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/testharness-helper.js'></script>
+</head>
+
+<body>
+    <script>
+      assert_worker_is_loaded(
+        "./support/worker-with-script-src-none-importscripts.js",
+        "Dedicated worker inherits CSP from main document",
+        "importScripts allowed");
+
+      assert_shared_worker_is_loaded(
+        "./support/worker-with-script-src-none-importscripts.js",
+        "Shared worker delivers its own CSP",
+        "importScripts blocked");
+    </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html
deleted file mode 100644
index 5f93433416b..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'self' 'unsafe-eval'; connect-src 'self';">
-    <title>worker-set-timeout-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["setTimeout blocked"]'></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log('Fail');
-        });
-        try {
-            var worker = new Worker('/content-security-policy/script-src/support/worker-set-timeout.js');
-            worker.onmessage = function(event) {
-                alert_assert(event.data);
-            };
-        } catch (e) {
-            alert_assert(e);
-        }
-
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout.sub.html
new file mode 100644
index 00000000000..68d7a56a186
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout.sub.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'self' 'unsafe-eval'; connect-src 'self';">
+    <title>worker-set-timeout</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/testharness-helper.js'></script>
+</head>
+
+<body>
+    <script>
+      assert_worker_is_loaded(
+        "./support/worker-with-script-src-none-set-timeout.js",
+        "Dedicated worker inherits CSP from main document",
+        "setTimeout allowed");
+
+      assert_shared_worker_is_loaded(
+        "./support/worker-with-script-src-none-set-timeout.js",
+        "Shared worker delivers its own CSP",
+        "setTimeout blocked");
+    </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js b/tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js
index 291af74037a..5c36e286da2 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js
@@ -40,26 +40,26 @@ function waitUntilEvent(obj, name) {
 // Given the URL of a worker that pings its opener upon load, this
 // function builds a test that asserts that the ping is received,
 // and that no CSP event fires.
-function assert_worker_is_loaded(url, description) {
+function assert_worker_is_loaded(url, description, expected_message = "ping") {
   async_test(t => {
     assert_no_csp_event_for_url(t, url);
     var w = new Worker(url);
     assert_no_event(t, w, "error");
     waitUntilEvent(w, "message")
       .then(t.step_func_done(e => {
-        assert_equals(e.data, "ping");
+        assert_equals(e.data, expected_message);
       }));
   }, description);
 }
 
-function assert_shared_worker_is_loaded(url, description) {
+function assert_shared_worker_is_loaded(url, description, expected_message = "ping") {
   async_test(t => {
     assert_no_csp_event_for_url(t, url);
     var w = new SharedWorker(url);
     assert_no_event(t, w, "error");
     waitUntilEvent(w.port, "message")
       .then(t.step_func_done(e => {
-        assert_equals(e.data, "ping");
+        assert_equals(e.data, expected_message);
       }));
     w.port.start();
   }, description);
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html
new file mode 100644
index 00000000000..3e62a52c30a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html
@@ -0,0 +1,36 @@
+<!-- quirks mode -->
+<meta charset="utf-8">
+<title>Should not crash when a clearance frame having a fragmented float is discovered</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://bugzilla.mozilla.org/show_bug.cgi?id=1663232">
+
+<style>
+:not(em) {
+  border-left: 4px dashed green;
+  column-width: 0;
+}
+</style>
+<script>
+function go() {
+  b.appendChild(a)
+}
+</script>
+<m>
+<details ontoggle="go()" open>
+<f>
+<menu>U<menu>
+<table align="RIGHT">
+<caption>
+<o>
+<ul>
+<l>
+<li>
+<tr>6
+<table>
+<a>
+<details id="b" open>
+<summary>
+<i id="a">
+</summary>
+<details style="float: right">
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-001.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-001.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-001.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-001.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-002.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-002.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-002.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-002.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-003.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-003.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-003.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-003.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-004.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-004.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-004.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-004.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-005.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-005.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-005.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-005.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-006.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-006.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-006.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-006.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-007.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-007.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-007.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-007.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-008.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-008.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-008.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-008.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-009.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-009.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-009.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-009.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-010.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-010.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-010.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-010.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-011.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-011.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-011.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-011.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-012.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-012.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-012.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-012.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-013.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-013.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-013.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-013.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-014.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-014.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-014.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-014.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-015.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-015.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-015.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-015.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-016.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-016.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-016.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-016.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-017.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-017.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-017.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-017.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-018.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-018.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-018.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-018.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-019.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-019.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-019.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-019.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-020.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-020.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-020.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-020.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-021.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-021.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-021.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-021.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-022.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-022.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-022.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-022.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-023.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-023.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-023.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-023.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-024.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-024.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-024.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-024.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-025.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-025.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-025.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-025.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-026.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-026.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-026.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-026.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-029.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-029.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-029.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-029.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-030.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-030.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-030.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-030.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-031.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-031.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-031.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-031.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-032.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-032.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-032.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-032.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-033.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-033.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-033.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-033.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-034.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-034.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-034.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-034.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-035.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-035.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-035.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-035.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-036.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-036.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-036.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-036.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-037.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-037.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-037.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-037.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-038.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-038.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-038.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-038.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-039.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-039.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-039.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-039.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-040.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-040.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-040.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-040.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-041.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-041.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-041.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-041.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-042.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-042.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-042.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-042.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-043.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-043.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-043.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-043.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-044.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-044.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-044.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-044.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-045.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-045.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-045.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-045.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-046.xht b/tests/wpt/web-platform-tests/css/css-conditional/css-supports-046.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/css-supports-046.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/css-supports-046.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht b/tests/wpt/web-platform-tests/css/css-conditional/support/pass.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/support/pass.xht
rename to tests/wpt/web-platform-tests/css/css-conditional/support/pass.xht
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html b/tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html
index 5ee2e30a9dd..26d11b32f64 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html
@@ -9,6 +9,12 @@
   <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
 </head>
 <body>
-<ol><li></li></ol>
+<ol>
+<li></li>
+<li></li>
+<li></li>
+<fieldset style="display:list-item"></fieldset>
+<li></li>
+</ol>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html b/tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html
index a4792599826..6978a63efaf 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html
@@ -10,8 +10,25 @@
   <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-set">
   <link rel="match" href="counter-set-002-ref.html">
 </head>
-<body onload="document.getElementById('item').style=''">
+<body>
 <noscript>Test not run - javascript required.</noscript>
-<ol><li id="item" style="counter-increment: list-item 3"></li></ol>
+<ol>
+<li></li>
+<li id="item" style="counter-increment: list-item 3"></li>
+<li></li>
+<style>
+.f {
+  display: list-item;
+}
+</style>
+<fieldset id="item4" class="f" style="counter-set: list-item 42"></fieldset>
+<li></li>
+</ol>
+
+<script>
+document.body.offsetTop;
+document.getElementById('item').style= '';
+document.getElementById('item4').style= '';
+</script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.html
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.tentative.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.tentative.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.html
diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo-ref.html b/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo-ref.html
new file mode 100644
index 00000000000..8eee65a2704
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo-ref.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<style>
+input {
+  border: 1px solid green;
+}
+</style>
+<input type=file part=input>
+<input type=text part=input placeholder=Foobar>
diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo.html b/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo.html
new file mode 100644
index 00000000000..f1753de7752
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<title>::part() doesn't incorrectly match pseudo-elements of the part</title>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=978105">
+<link rel="help" href="https://drafts.csswg.org/css-shadow-parts/">
+<link rel="match" href="part-nested-pseudo-ref.html">
+<style>
+#host::part(input) {
+  border: 1px solid green;
+}
+</style>
+<div id="host"></div>
+<script>
+  document.getElementById("host").attachShadow({ mode: "open" }).innerHTML = `
+    <input type=file part=input>
+    <input type=text part=input placeholder=Foobar>
+  `;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-016.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-016.html
new file mode 100644
index 00000000000..dc520b972b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-016.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: out-of-flow replaced element</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="position: relative;">
+  <img src="support/200x200-green.png" style="position: absolute; aspect-ratio: auto 10/1; height: 100px;">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-029.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-029.html
new file mode 100644
index 00000000000..e8d106a88fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-029.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: img with display:block and auto ratio</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<img src="support/1x1-green.png" style="width: 100px; aspect-ratio: auto 10/1; display: block;">
+
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html
new file mode 100644
index 00000000000..97aac0fde50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: img with display:block and auto ratio</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<img src="support/1x1-green.png" style="height: 100px; aspect-ratio: auto 10/1; display: block;">
+
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/200x200-green.png b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/200x200-green.png
new file mode 100644
index 00000000000..1dcc392a6ef
Binary files /dev/null and b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/200x200-green.png differ
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html
new file mode 100644
index 00000000000..df854d75fca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<title>CSS test reference</title>
+<style>
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  padding: 20px;
+  position: relative;
+}
+
+.parent {
+  border: 3px solid green;
+  position: absolute;
+  height: 60vh;
+}
+
+.parent img {
+  height: calc(60vh - 6px);
+}
+</style>
+<div class="parent">
+  <img src="/images/blue96x96.png">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009.html
new file mode 100644
index 00000000000..03407dc2b99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1677353">
+<link rel="match" href="intrinsic-percent-replaced-009-ref.html">
+<style>
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  padding: 20px;
+  position: relative;
+}
+
+.parent {
+  border: 3px solid green;
+  position: absolute;
+  height: 60%;
+}
+
+.parent img {
+  height: 100%;
+}
+</style>
+<div class="parent">
+  <img src="/images/blue96x96.png">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/containing-block-dynamic-1-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/containing-block-dynamic-1-ref.html
rename to tests/wpt/web-platform-tests/css/css-transforms/containing-block-dynamic-1-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-containing-block-dynamic-1a.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-containing-block-dynamic-1a.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-containing-block-dynamic-1b.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-containing-block-dynamic-1b.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-untransformable-no-stacking-context-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-untransformable-no-stacking-context-ref.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-untransformable-no-stacking-context.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-untransformable-no-stacking-context.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero-2-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero-2-ref.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero-2.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero-2.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero.html b/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/perspective-zero.html
rename to tests/wpt/web-platform-tests/css/css-transforms/perspective-zero.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reference/green.html b/tests/wpt/web-platform-tests/css/css-transforms/reference/green.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reference/green.html
rename to tests/wpt/web-platform-tests/css/css-transforms/reference/green.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/transform-containing-block-dynamic-1a.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/transform-containing-block-dynamic-1a.html
rename to tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/transform-containing-block-dynamic-1b.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/transform-containing-block-dynamic-1b.html
rename to tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/reftest.list
deleted file mode 100644
index f10bede79fa..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/conditional3/reftest.list
+++ /dev/null
@@ -1,46 +0,0 @@
-== css-supports-001.xht support/pass.xht
-== css-supports-002.xht support/pass.xht
-== css-supports-003.xht support/pass.xht
-== css-supports-004.xht support/pass.xht
-== css-supports-005.xht support/pass.xht
-== css-supports-006.xht support/pass.xht
-== css-supports-007.xht support/pass.xht
-== css-supports-008.xht support/pass.xht
-== css-supports-009.xht support/pass.xht
-== css-supports-010.xht support/pass.xht
-== css-supports-011.xht support/pass.xht
-== css-supports-012.xht support/pass.xht
-== css-supports-013.xht support/pass.xht
-== css-supports-014.xht support/pass.xht
-== css-supports-015.xht support/pass.xht
-== css-supports-016.xht support/pass.xht
-== css-supports-017.xht support/pass.xht
-== css-supports-018.xht support/pass.xht
-== css-supports-019.xht support/pass.xht
-== css-supports-020.xht support/pass.xht
-== css-supports-021.xht support/pass.xht
-== css-supports-022.xht support/pass.xht
-== css-supports-023.xht support/pass.xht
-== css-supports-024.xht support/pass.xht
-== css-supports-025.xht support/pass.xht
-== css-supports-026.xht support/pass.xht
-== css-supports-027.xht support/pass.xht
-== css-supports-028.xht support/pass.xht
-== css-supports-029.xht support/pass.xht
-== css-supports-030.xht support/pass.xht
-== css-supports-031.xht support/pass.xht
-== css-supports-032.xht support/pass.xht
-== css-supports-033.xht support/pass.xht
-== css-supports-034.xht support/pass.xht
-== css-supports-035.xht support/pass.xht
-== css-supports-036.xht support/pass.xht
-== css-supports-037.xht support/pass.xht
-== css-supports-038.xht support/pass.xht
-== css-supports-039.xht support/pass.xht
-== css-supports-040.xht support/pass.xht
-== css-supports-041.xht support/pass.xht
-== css-supports-042.xht support/pass.xht
-== css-supports-043.xht support/pass.xht
-== css-supports-044.xht support/pass.xht
-== css-supports-045.xht support/pass.xht
-== css-supports-046.xht support/pass.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list
deleted file mode 100644
index 8e2c2458402..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list
+++ /dev/null
@@ -1,280 +0,0 @@
-# Tests for absolutely-positioned children of a flex container
-== flexbox-abspos-child-001a.html flexbox-abspos-child-001-ref.html
-== flexbox-abspos-child-001b.html flexbox-abspos-child-001-ref.html
-== flexbox-abspos-child-002.html flexbox-abspos-child-002-ref.html
-
-# Tests for handling anonymous flex items
-== flexbox-anonymous-items-001.html flexbox-anonymous-items-001-ref.html
-
-# Tests for alignment of flex lines (align-content property)
-== flexbox-align-content-horiz-001a.xhtml flexbox-align-content-horiz-001-ref.xhtml
-== flexbox-align-content-horiz-001b.xhtml flexbox-align-content-horiz-001-ref.xhtml
-== flexbox-align-content-horiz-002.xhtml flexbox-align-content-horiz-002-ref.xhtml
-== flexbox-align-content-vert-001a.xhtml  flexbox-align-content-vert-001-ref.xhtml
-== flexbox-align-content-vert-001b.xhtml  flexbox-align-content-vert-001-ref.xhtml
-== flexbox-align-content-vert-002.xhtml flexbox-align-content-vert-002-ref.xhtml
-== flexbox-align-content-wmvert-001.xhtml  flexbox-align-content-wmvert-001-ref.xhtml
-
-# Tests for cross-axis alignment (align-self / align-items properties)
-== flexbox-align-self-baseline-horiz-001a.xhtml flexbox-align-self-baseline-horiz-001-ref.xhtml
-== flexbox-align-self-baseline-horiz-001b.xhtml flexbox-align-self-baseline-horiz-001-ref.xhtml
-== flexbox-align-self-baseline-horiz-002.xhtml flexbox-align-self-baseline-horiz-002-ref.xhtml
-== flexbox-align-self-baseline-horiz-003.xhtml flexbox-align-self-baseline-horiz-003-ref.xhtml
-== flexbox-align-self-baseline-horiz-004.xhtml flexbox-align-self-baseline-horiz-004-ref.xhtml
-== flexbox-align-self-baseline-horiz-005.xhtml flexbox-align-self-baseline-horiz-005-ref.xhtml
-== flexbox-align-self-baseline-horiz-006.xhtml flexbox-align-self-baseline-horiz-006-ref.xhtml
-== flexbox-align-self-baseline-horiz-007.xhtml flexbox-align-self-baseline-horiz-007-ref.xhtml
-== flexbox-align-self-baseline-horiz-008.xhtml flexbox-align-self-baseline-horiz-008-ref.xhtml
-
-== flexbox-align-self-stretch-vert-001.html flexbox-align-self-stretch-vert-001-ref.html
-== flexbox-align-self-stretch-vert-002.html flexbox-align-self-stretch-vert-002-ref.html
-
-== flexbox-align-self-horiz-001-block.xhtml  flexbox-align-self-horiz-001-ref.xhtml
-== flexbox-align-self-horiz-001-table.xhtml  flexbox-align-self-horiz-001-ref.xhtml
-== flexbox-align-self-horiz-002.xhtml  flexbox-align-self-horiz-002-ref.xhtml
-== flexbox-align-self-horiz-003.xhtml  flexbox-align-self-horiz-003-ref.xhtml
-== flexbox-align-self-horiz-004.xhtml  flexbox-align-self-horiz-004-ref.xhtml
-== flexbox-align-self-horiz-005.xhtml  flexbox-align-self-horiz-005-ref.xhtml
-== flexbox-align-self-vert-001.xhtml  flexbox-align-self-vert-001-ref.xhtml
-== flexbox-align-self-vert-002.xhtml  flexbox-align-self-vert-002-ref.xhtml
-== flexbox-align-self-vert-003.xhtml  flexbox-align-self-vert-003-ref.xhtml
-== flexbox-align-self-vert-004.xhtml  flexbox-align-self-vert-004-ref.xhtml
-== flexbox-align-self-vert-rtl-001.xhtml  flexbox-align-self-vert-rtl-001-ref.xhtml
-== flexbox-align-self-vert-rtl-002.xhtml  flexbox-align-self-vert-rtl-002-ref.xhtml
-== flexbox-align-self-vert-rtl-003.xhtml  flexbox-align-self-vert-rtl-003-ref.xhtml
-== flexbox-align-self-vert-rtl-004.xhtml  flexbox-align-self-vert-rtl-004-ref.xhtml
-== flexbox-align-self-vert-rtl-005.xhtml  flexbox-align-self-vert-rtl-005-ref.xhtml
-
-== flexbox-align-items-center-nested-001.html flexbox-align-items-center-nested-001-ref.html
-
-# Tests for computing the baseline of a flex container
-== flexbox-baseline-align-self-baseline-horiz-001.html flexbox-baseline-align-self-baseline-horiz-001-ref.html
-== flexbox-baseline-align-self-baseline-vert-001.html flexbox-baseline-align-self-baseline-vert-001-ref.html
-== flexbox-baseline-empty-001a.html flexbox-baseline-empty-001-ref.html
-== flexbox-baseline-empty-001b.html flexbox-baseline-empty-001-ref.html
-== flexbox-baseline-multi-item-horiz-001a.html flexbox-baseline-multi-item-horiz-001-ref.html
-== flexbox-baseline-multi-item-horiz-001b.html flexbox-baseline-multi-item-horiz-001-ref.html
-== flexbox-baseline-multi-item-vert-001a.html flexbox-baseline-multi-item-vert-001-ref.html
-== flexbox-baseline-multi-item-vert-001b.html flexbox-baseline-multi-item-vert-001-ref.html
-== flexbox-baseline-multi-line-horiz-001.html flexbox-baseline-multi-line-horiz-001-ref.html
-== flexbox-baseline-multi-line-horiz-002.html flexbox-baseline-multi-line-horiz-002-ref.html
-== flexbox-baseline-multi-line-horiz-003.html flexbox-baseline-multi-line-horiz-003-ref.html
-== flexbox-baseline-multi-line-horiz-004.html flexbox-baseline-multi-line-horiz-004-ref.html
-== flexbox-baseline-multi-line-vert-001.html flexbox-baseline-multi-line-vert-001-ref.html
-== flexbox-baseline-multi-line-vert-002.html flexbox-baseline-multi-line-vert-002-ref.html
-== flexbox-baseline-single-item-001a.html flexbox-baseline-single-item-001-ref.html
-== flexbox-baseline-single-item-001b.html flexbox-baseline-single-item-001-ref.html
-
-# Basic tests with with blocks as flex items
-== flexbox-basic-block-horiz-001.xhtml flexbox-basic-block-horiz-001-ref.xhtml
-== flexbox-basic-block-horiz-001v.xhtml flexbox-basic-block-horiz-001-ref.xhtml
-== flexbox-basic-block-vert-001.xhtml flexbox-basic-block-vert-001-ref.xhtml
-== flexbox-basic-block-vert-001v.xhtml flexbox-basic-block-vert-001-ref.xhtml
-
-# Tests for basic handling of <canvas>/<img>/etc as a flex item
-== flexbox-basic-canvas-horiz-001.xhtml   flexbox-basic-canvas-horiz-001-ref.xhtml
-== flexbox-basic-canvas-horiz-001v.xhtml  flexbox-basic-canvas-horiz-001-ref.xhtml
-== flexbox-basic-canvas-vert-001.xhtml    flexbox-basic-canvas-vert-001-ref.xhtml
-== flexbox-basic-canvas-vert-001v.xhtml   flexbox-basic-canvas-vert-001-ref.xhtml
-== flexbox-basic-fieldset-horiz-001.xhtml flexbox-basic-fieldset-horiz-001-ref.xhtml
-== flexbox-basic-fieldset-vert-001.xhtml  flexbox-basic-fieldset-vert-001-ref.xhtml
-== flexbox-basic-iframe-horiz-001.xhtml   flexbox-basic-iframe-horiz-001-ref.xhtml
-== flexbox-basic-iframe-vert-001.xhtml    flexbox-basic-iframe-vert-001-ref.xhtml
-== flexbox-basic-img-horiz-001.xhtml      flexbox-basic-img-horiz-001-ref.xhtml
-== flexbox-basic-img-vert-001.xhtml       flexbox-basic-img-vert-001-ref.xhtml
-== flexbox-basic-textarea-horiz-001.xhtml flexbox-basic-textarea-horiz-001-ref.xhtml
-== flexbox-basic-textarea-vert-001.xhtml  flexbox-basic-textarea-vert-001-ref.xhtml
-== flexbox-basic-video-horiz-001.xhtml    flexbox-basic-video-horiz-001-ref.xhtml
-== flexbox-basic-video-vert-001.xhtml     flexbox-basic-video-vert-001-ref.xhtml
-
-# Tests for "page-break-before" / "page-break-after" on a flex item
-== flexbox-break-request-horiz-001a.html flexbox-break-request-horiz-001-ref.html
-== flexbox-break-request-horiz-001b.html flexbox-break-request-horiz-001-ref.html
-== flexbox-break-request-horiz-002a.html flexbox-break-request-horiz-002-ref.html
-== flexbox-break-request-horiz-002b.html flexbox-break-request-horiz-002-ref.html
-== flexbox-break-request-vert-001a.html  flexbox-break-request-vert-001-ref.html
-== flexbox-break-request-vert-001b.html  flexbox-break-request-vert-001-ref.html
-== flexbox-break-request-vert-002a.html  flexbox-break-request-vert-002-ref.html
-== flexbox-break-request-vert-002b.html  flexbox-break-request-vert-002-ref.html
-
-# Tests for flex items with "visibility:collapse"
-== flexbox-collapsed-item-baseline-001.html flexbox-collapsed-item-baseline-001-ref.html
-== flexbox-collapsed-item-horiz-001.html flexbox-collapsed-item-horiz-001-ref.html
-== flexbox-collapsed-item-horiz-002.html flexbox-collapsed-item-horiz-002-ref.html
-== flexbox-collapsed-item-horiz-003.html flexbox-collapsed-item-horiz-003-ref.html
-
-# Tests for "row gap" and "column gap"
-== flexbox-column-row-gap-001.html flexbox-column-row-gap-001-ref.html
-== flexbox-column-row-gap-002.html flexbox-column-row-gap-002-ref.html
-== flexbox-column-row-gap-003.html flexbox-column-row-gap-003-ref.html
-== flexbox-column-row-gap-004.html flexbox-column-row-gap-004-ref.html
-
-# Tests with dynamic changes that impact sizing:
-== flexbox-dyn-resize-001.html flexbox-dyn-resize-001-ref.html
-
-# Tests for "flex-basis: content"
-== flexbox-flex-basis-content-001a.html flexbox-flex-basis-content-001-ref.html
-== flexbox-flex-basis-content-001b.html flexbox-flex-basis-content-001-ref.html
-== flexbox-flex-basis-content-002a.html flexbox-flex-basis-content-002-ref.html
-== flexbox-flex-basis-content-002b.html flexbox-flex-basis-content-002-ref.html
-== flexbox-flex-basis-content-003a.html flexbox-flex-basis-content-003-ref.html
-== flexbox-flex-basis-content-003b.html flexbox-flex-basis-content-003-ref.html
-== flexbox-flex-basis-content-004a.html flexbox-flex-basis-content-004-ref.html
-== flexbox-flex-basis-content-004b.html flexbox-flex-basis-content-004-ref.html
-
-# Tests for flex-flow shorthand property
-== flexbox-flex-flow-001.html flexbox-flex-flow-001-ref.html
-== flexbox-flex-flow-002.html flexbox-flex-flow-002-ref.html
-
-# Tests for flex-wrap property
-== flexbox-flex-wrap-horiz-001.html flexbox-flex-wrap-horiz-001-ref.html
-== flexbox-flex-wrap-horiz-002.html flexbox-flex-wrap-horiz-002-ref.html
-== flexbox-flex-wrap-vert-001.html  flexbox-flex-wrap-vert-001-ref.html
-== flexbox-flex-wrap-vert-002.html  flexbox-flex-wrap-vert-002-ref.html
-
-# Tests for intrinsic ratio interactions on flex items.
-# (Note that tests 001 and 002 share a reference case; they render the same,
-# because they don't do any direction-specific stretching/flexing.)
-== flexbox-intrinsic-ratio-001.html flexbox-intrinsic-ratio-001-ref.html
-== flexbox-intrinsic-ratio-001v.html flexbox-intrinsic-ratio-001-ref.html
-== flexbox-intrinsic-ratio-002.html flexbox-intrinsic-ratio-001-ref.html
-== flexbox-intrinsic-ratio-002v.html flexbox-intrinsic-ratio-001-ref.html
-== flexbox-intrinsic-ratio-003.html flexbox-intrinsic-ratio-003-ref.html
-== flexbox-intrinsic-ratio-003v.html flexbox-intrinsic-ratio-003-ref.html
-== flexbox-intrinsic-ratio-004.html flexbox-intrinsic-ratio-004-ref.html
-== flexbox-intrinsic-ratio-004v.html flexbox-intrinsic-ratio-004-ref.html
-== flexbox-intrinsic-ratio-005.html flexbox-intrinsic-ratio-005-ref.html
-== flexbox-intrinsic-ratio-005v.html flexbox-intrinsic-ratio-005-ref.html
-== flexbox-intrinsic-ratio-006.html flexbox-intrinsic-ratio-006-ref.html
-== flexbox-intrinsic-ratio-006v.html flexbox-intrinsic-ratio-006-ref.html
-== flexbox-intrinsic-ratio-007.html flexbox-intrinsic-ratio-007-ref.html
-== flexbox-intrinsic-ratio-007v.html flexbox-intrinsic-ratio-007-ref.html
-
-# Test for definite and indefinite sizes.
-== flexbox-definite-sizes-001.html flexbox-definite-sizes-001-ref.html
-== flexbox-definite-sizes-002.html flexbox-definite-sizes-001-ref.html
-== flexbox-definite-sizes-003.html flexbox-definite-sizes-001-ref.html
-== flexbox-definite-sizes-004.html flexbox-definite-sizes-001-ref.html
-== flexbox-definite-sizes-005.html flexbox-definite-sizes-005-ref.html
-
-# Tests for flex items as (pseudo) stacking contexts
-== flexbox-items-as-stacking-contexts-001.xhtml flexbox-items-as-stacking-contexts-001-ref.xhtml
-== flexbox-items-as-stacking-contexts-002.html flexbox-items-as-stacking-contexts-002-ref.html
-== flexbox-items-as-stacking-contexts-003.html flexbox-items-as-stacking-contexts-003-ref.html
-
-# Tests for main-axis alignment (jusify-content property)
-== flexbox-justify-content-horiz-001a.xhtml flexbox-justify-content-horiz-001-ref.xhtml
-== flexbox-justify-content-horiz-001b.xhtml flexbox-justify-content-horiz-001-ref.xhtml
-== flexbox-justify-content-horiz-002.xhtml flexbox-justify-content-horiz-002-ref.xhtml
-== flexbox-justify-content-horiz-003.xhtml flexbox-justify-content-horiz-003-ref.xhtml
-== flexbox-justify-content-horiz-004.xhtml flexbox-justify-content-horiz-004-ref.xhtml
-== flexbox-justify-content-horiz-005.xhtml flexbox-justify-content-horiz-005-ref.xhtml
-== flexbox-justify-content-horiz-006.xhtml flexbox-justify-content-horiz-006-ref.xhtml
-== flexbox-justify-content-vert-001a.xhtml flexbox-justify-content-vert-001-ref.xhtml
-== flexbox-justify-content-vert-001b.xhtml flexbox-justify-content-vert-001-ref.xhtml
-== flexbox-justify-content-vert-002.xhtml flexbox-justify-content-vert-002-ref.xhtml
-== flexbox-justify-content-vert-003.xhtml flexbox-justify-content-vert-003-ref.xhtml
-== flexbox-justify-content-vert-004.xhtml flexbox-justify-content-vert-004-ref.xhtml
-== flexbox-justify-content-vert-005.xhtml flexbox-justify-content-vert-005-ref.xhtml
-== flexbox-justify-content-vert-006.xhtml flexbox-justify-content-vert-006-ref.xhtml
-== flexbox-justify-content-wmvert-001.xhtml flexbox-justify-content-wmvert-001-ref.xhtml
-
-# Tests for flexbox with margin, border, and/or padding on flex items
-== flexbox-margin-auto-horiz-001.xhtml     flexbox-margin-auto-horiz-001-ref.xhtml
-== flexbox-margin-auto-horiz-002.xhtml     flexbox-margin-auto-horiz-002-ref.xhtml
-== flexbox-mbp-horiz-001.xhtml             flexbox-mbp-horiz-001-ref.xhtml
-== flexbox-mbp-horiz-001-reverse.xhtml     flexbox-mbp-horiz-001-reverse-ref.xhtml
-== flexbox-mbp-horiz-001-rtl.xhtml         flexbox-mbp-horiz-001-reverse-ref.xhtml
-== flexbox-mbp-horiz-001-rtl-reverse.xhtml flexbox-mbp-horiz-001-ref.xhtml
-== flexbox-mbp-horiz-002a.xhtml            flexbox-mbp-horiz-002-ref.xhtml
-== flexbox-mbp-horiz-002b.xhtml            flexbox-mbp-horiz-002-ref.xhtml
-== flexbox-mbp-horiz-002v.xhtml            flexbox-mbp-horiz-002-ref.xhtml
-== flexbox-mbp-horiz-003.xhtml             flexbox-mbp-horiz-003-ref.xhtml
-== flexbox-mbp-horiz-003v.xhtml flexbox-mbp-horiz-003-ref.xhtml
-== flexbox-mbp-horiz-003-reverse.xhtml     flexbox-mbp-horiz-003-reverse-ref.xhtml
-== flexbox-mbp-horiz-004.xhtml             flexbox-mbp-horiz-004-ref.xhtml
-
-# Tests for min-height:auto / min-width:auto on flex items
-== flexbox-min-height-auto-001.html flexbox-min-height-auto-001-ref.html
-== flexbox-min-height-auto-002a.html flexbox-min-height-auto-002-ref.html
-== flexbox-min-height-auto-002b.html flexbox-min-height-auto-002-ref.html
-== flexbox-min-height-auto-002c.html flexbox-min-height-auto-002-ref.html
-== flexbox-min-height-auto-003.html flexbox-min-height-auto-003-ref.html
-== flexbox-min-height-auto-004.html flexbox-min-height-auto-004-ref.html
-== flexbox-min-width-auto-001.html flexbox-min-width-auto-001-ref.html
-== flexbox-min-width-auto-002a.html flexbox-min-width-auto-002-ref.html
-== flexbox-min-width-auto-002b.html flexbox-min-width-auto-002-ref.html
-== flexbox-min-width-auto-002c.html flexbox-min-width-auto-002-ref.html
-== flexbox-min-width-auto-003.html flexbox-min-width-auto-003-ref.html
-== flexbox-min-width-auto-004.html flexbox-min-width-auto-004-ref.html
-
-# Tests for flex containers with the "overflow" property set
-== flexbox-overflow-horiz-001.html flexbox-overflow-horiz-001-ref.html
-== flexbox-overflow-horiz-002.html flexbox-overflow-horiz-002-ref.html
-== flexbox-overflow-horiz-003.html flexbox-overflow-horiz-003-ref.html
-== flexbox-overflow-horiz-004.html flexbox-overflow-horiz-004-ref.html
-== flexbox-overflow-horiz-005.html flexbox-overflow-horiz-005-ref.html
-== flexbox-overflow-vert-001.html flexbox-overflow-vert-001-ref.html
-== flexbox-overflow-vert-002.html flexbox-overflow-vert-002-ref.html
-== flexbox-overflow-vert-003.html flexbox-overflow-vert-003-ref.html
-== flexbox-overflow-vert-004.html flexbox-overflow-vert-004-ref.html
-== flexbox-overflow-vert-005.html flexbox-overflow-vert-005-ref.html
-
-# Tests for the order in which we paint flex items
-== flexbox-paint-ordering-001.xhtml flexbox-paint-ordering-001-ref.xhtml
-== flexbox-paint-ordering-002.xhtml flexbox-paint-ordering-002-ref.xhtml
-== flexbox-paint-ordering-003.html  flexbox-paint-ordering-003-ref.html
-
-# Tests for "display:flex" on root node
-== flexbox-root-node-001a.html flexbox-root-node-001-ref.html
-== flexbox-root-node-001b.html flexbox-root-node-001-ref.html
-
-# Tests for <overflow-position> "safe" keyword in CSS Alignment properties
-== flexbox-safe-overflow-position-001.html flexbox-safe-overflow-position-001-ref.html
-
-# Tests for sizing of flex containers, e.g. under min/max size constraints
-== flexbox-sizing-horiz-001.xhtml flexbox-sizing-horiz-001-ref.xhtml
-== flexbox-sizing-horiz-002.xhtml flexbox-sizing-horiz-002-ref.xhtml
-== flexbox-sizing-vert-001.xhtml  flexbox-sizing-vert-001-ref.xhtml
-== flexbox-sizing-vert-002.xhtml  flexbox-sizing-vert-002-ref.xhtml
-
-# Tests for table-fixup *not happening* on direct children of a flex container
-== flexbox-table-fixup-001.xhtml flexbox-table-fixup-001-ref.xhtml
-
-# Tests for handling of whitespace within anonymous flex items.
-== flexbox-whitespace-handling-001a.xhtml flexbox-whitespace-handling-001-ref.xhtml
-== flexbox-whitespace-handling-001b.xhtml flexbox-whitespace-handling-001-ref.xhtml
-== flexbox-whitespace-handling-002.xhtml  flexbox-whitespace-handling-002-ref.xhtml
-
-# Tests for flex containers with pseudo-elements
-== flexbox-with-pseudo-elements-001.html flexbox-with-pseudo-elements-001-ref.html
-== flexbox-with-pseudo-elements-002.html flexbox-with-pseudo-elements-002-ref.html
-== flexbox-with-pseudo-elements-003.html flexbox-with-pseudo-elements-003-ref.html
-
-# Tests for combined influence of 'writing-mode' & 'direction'
-# on flex container axes & flex item placement
-== flexbox-writing-mode-001.html flexbox-writing-mode-001-ref.html
-== flexbox-writing-mode-002.html flexbox-writing-mode-002-ref.html
-== flexbox-writing-mode-003.html flexbox-writing-mode-003-ref.html
-== flexbox-writing-mode-004.html flexbox-writing-mode-004-ref.html
-== flexbox-writing-mode-005.html flexbox-writing-mode-005-ref.html
-== flexbox-writing-mode-006.html flexbox-writing-mode-006-ref.html
-== flexbox-writing-mode-007.html flexbox-writing-mode-007-ref.html
-== flexbox-writing-mode-008.html flexbox-writing-mode-008-ref.html
-== flexbox-writing-mode-009.html flexbox-writing-mode-009-ref.html
-== flexbox-writing-mode-010.html flexbox-writing-mode-010-ref.html
-== flexbox-writing-mode-011.html flexbox-writing-mode-011-ref.html
-== flexbox-writing-mode-012.html flexbox-writing-mode-012-ref.html
-== flexbox-writing-mode-013.html flexbox-writing-mode-013-ref.html
-== flexbox-writing-mode-014.html flexbox-writing-mode-014-ref.html
-== flexbox-writing-mode-015.html flexbox-writing-mode-015-ref.html
-== flexbox-writing-mode-016.html flexbox-writing-mode-016-ref.html
-
-# Single-line size clamping
-== flexbox-single-line-clamp-1.html flexbox-single-line-clamp-1-ref.html
-== flexbox-single-line-clamp-2.html flexbox-single-line-clamp-2-ref.html
-== flexbox-single-line-clamp-3.html flexbox-single-line-clamp-3-ref.html
-
-# Flexbox as an absolute containing block.
-== position-absolute-containing-block-001.html position-absolute-containing-block-001-ref.html
-== position-absolute-containing-block-002.html position-absolute-containing-block-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
index a0e7a924c2a..3bf278e1989 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
@@ -22,9 +22,6 @@ include break3/reftest.list
 # Color Level 4
 include color4/reftest.list
 
-# Conditional Rules Level 3
-include conditional3/reftest.list
-
 # Containment
 include contain/reftest.list
 
@@ -34,9 +31,6 @@ include counter-styles-3/reftest.list
 # Filter Effects Module
 include filters/reftest.list
 
-# Flexible Box Layout Module
-include flexbox/reftest.list
-
 # Fonts Level 3
 include fonts3/reftest.list
 
@@ -64,9 +58,6 @@ include text3/reftest.list
 # Text Decoration Level 3
 include text-decor-3/reftest.list
 
-# Transforms
-include transforms/reftest.list
-
 # User Interface Level 3
 include ui3/reftest.list
 
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reftest.list
deleted file mode 100644
index e4777148d4b..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/transforms/reftest.list
+++ /dev/null
@@ -1,7 +0,0 @@
-== transform-containing-block-dynamic-1a.html containing-block-dynamic-1-ref.html
-== transform-containing-block-dynamic-1b.html containing-block-dynamic-1-ref.html
-== perspective-containing-block-dynamic-1a.html containing-block-dynamic-1-ref.html
-== perspective-containing-block-dynamic-1b.html containing-block-dynamic-1-ref.html
-== perspective-zero.html reference/green.html
-== perspective-zero-2.html perspective-zero-2-ref.html
-== perspective-untransformable-no-stacking-context.html perspective-untransformable-no-stacking-context-ref.html
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 7a900255780..dfe4e1e586b 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1701,7 +1701,7 @@ interface Window : EventTarget {
 
   // the user agent
   readonly attribute Navigator navigator;
-  readonly attribute boolean originIsolated;
+  readonly attribute boolean originAgentCluster;
 
   // user prompts
   undefined alert();
diff --git a/tests/wpt/web-platform-tests/interfaces/mediasession.idl b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
index c2b2e0589e1..3dd0cd75270 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediasession.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
@@ -26,7 +26,7 @@ enum MediaSessionAction {
   "seekto"
 };
 
-callback MediaSessionActionHandler = void(MediaSessionActionDetails details);
+callback MediaSessionActionHandler = undefined(MediaSessionActionDetails details);
 
 [Exposed=Window]
 interface MediaSession {
@@ -34,9 +34,9 @@ interface MediaSession {
 
   attribute MediaSessionPlaybackState playbackState;
 
-  void setActionHandler(MediaSessionAction action, MediaSessionActionHandler? handler);
+  undefined setActionHandler(MediaSessionAction action, MediaSessionActionHandler? handler);
 
-  void setPositionState(optional MediaPositionState state = {});
+  undefined setPositionState(optional MediaPositionState state = {});
 };
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 814007b02ee..b11dd752192 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -483,6 +483,7 @@ CSS-COLLIDING-SUPPORT-NAME: css/*/LOCK
 # These are all the current "merge mismatch" errors the build system produces
 CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/200x200-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-grid/grid-items/support/200x200-green.png
+CSS-COLLIDING-SUPPORT-NAME: css/css-sizing/aspect-ratio/support/200x200-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/support/pattern-grg-rgr-grg.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-multicol/support/pattern-grg-rgr-grg.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-transitions/support/pattern-grg-rgr-grg.png
diff --git a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
index fb53e3d4ca6..1a7c680084c 100644
--- a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
@@ -1,6 +1,7 @@
 // META: title=NativeIO API: close().
 // META: global=window,worker
 // META: script=resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
index 0cc4ad3e930..fb98fed67ca 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
@@ -2,6 +2,7 @@
 // META: global=window,worker
 // META: script=operation_helpers.js
 // META: script=../resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
index abff5d89dd0..2d7617d011c 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
@@ -2,6 +2,7 @@
 // META: global=window,worker
 // META: script=operation_helpers.js
 // META: script=../resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
index 0deb7652ee7..729bee3a083 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
@@ -2,6 +2,7 @@
 // META: global=window,worker
 // META: script=operation_helpers.js
 // META: script=../resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
index 2036d22a382..2202e556215 100644
--- a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
@@ -1,6 +1,7 @@
 // META: title=Synchronous NativeIO API: Flushed data is read back.
 // META: global=window,worker
 // META: script=resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
index bff8234f4a5..125f49cdf89 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
@@ -1,6 +1,7 @@
 // META: title=NativeIO API: Failures of rename are properly handled.
 // META: global=window,worker
 // META: script=resources/support.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/shadow-dom/slotchange.html b/tests/wpt/web-platform-tests/shadow-dom/slotchange.html
index 1f94cc7bee2..9c4b81a1563 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/slotchange.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/slotchange.html
@@ -15,13 +15,21 @@
 </div>
 
 <script>
-function doneIfSlotChange(slots, test) {
-  let fired = new Set();
-  for (let slot of slots) {
-    slot.addEventListener('slotchange', test.step_func((e) => {
-      assert_false(fired.has(slot.id));
-      fired.add(slot.id);
-      if (fired.size == slots.length) {
+function arraysEqual(a, b) {
+  if (a === b) return true;
+  if (a == null || b == null) return false;
+  if (a.length !== b.length) return false;
+  for (var i = 0; i < a.length; ++i) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+function doneIfSlotChange(slots, expectedAssignedNodes, test) {
+  let matched = Array(slots.length).fill(false);
+  for (let i=0; i<slots.length; i++) {
+    slots[i].addEventListener('slotchange', test.step_func((e) => {
+      matched[i] = arraysEqual(slots[i].assignedNodes(), expectedAssignedNodes[i]);
+      if (matched.every(v => v)) {
         test.done();
       }
     }))
@@ -32,10 +40,11 @@ async_test((test) => {
   let n = createTestTree(test1);
   removeWhiteSpaceOnlyTextNodes(n.test1);
 
-  doneIfSlotChange([n.s1], test);
-
   let d1 = document.createElement('div');
   d1.setAttribute('slot', 'slot1');
+
+  doneIfSlotChange([n.s1], [[n.c1, d1]], test);
+
   n.host1.appendChild(d1);
 }, 'slotchange event: Append a child to a host.');
 
@@ -43,7 +52,7 @@ async_test((test) => {
   let n = createTestTree(test1);
   removeWhiteSpaceOnlyTextNodes(n.test1);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   n.c1.remove();
 }, 'slotchange event: Remove a child from a host.');
@@ -54,14 +63,14 @@ async_test((test) => {
 
   n.c1.remove();
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 }, 'slotchange event: Remove a child before adding an event listener.');
 
 async_test((test) => {
   let n = createTestTree(test1);
   removeWhiteSpaceOnlyTextNodes(n.test1);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   n.c1.setAttribute('slot', 'slot-none');
 }, 'slotchange event: Change slot= attribute to make it un-assigned.');
@@ -70,7 +79,7 @@ async_test((test) => {
   let n = createTestTree(test1);
   removeWhiteSpaceOnlyTextNodes(n.test1);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   n.s1.setAttribute('name', 'slot-none');
 }, 'slotchange event: Change slot\'s name= attribute so that none is assigned.');
@@ -90,7 +99,7 @@ async_test((test) => {
   let n = createTestTree(test2);
   removeWhiteSpaceOnlyTextNodes(n.test2);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[n.c2]], test);
 
   n.c2.setAttribute('slot', 'slot1');
 }, 'slotchange event: Change slot= attribute to make it assigned.');
@@ -99,7 +108,7 @@ async_test((test) => {
   let n = createTestTree(test2);
   removeWhiteSpaceOnlyTextNodes(n.test2);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[n.c2]], test);
 
   n.s1.setAttribute('name', 'slot2');
 }, 'slotchange event: Change slot\'s name= attribute so that a node is assigned to the slot.');
@@ -118,10 +127,10 @@ async_test((test) => {
   let n = createTestTree(test_fallback);
   removeWhiteSpaceOnlyTextNodes(n.test_fallback);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   n.s1.appendChild(document.createElement('div'));
-}, 'slotchange event: Add a fallback content.');
+}, 'slotchange event: Change fallback content - assignedNodes still empty.');
 </script>
 
 <div id="test_fallback2">
@@ -139,10 +148,10 @@ async_test((test) => {
   let n = createTestTree(test_fallback2);
   removeWhiteSpaceOnlyTextNodes(n.test_fallback2);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   n.f1.remove();
-}, 'slotchange event: Remove a fallback content.');
+}, 'slotchange event: Remove a fallback content - assignedNodes still empty.');
 </script>
 
 <div id="test_fallback3">
@@ -162,19 +171,19 @@ async_test((test) => {
   let n = createTestTree(test_fallback3);
   removeWhiteSpaceOnlyTextNodes(n.test_fallback3);
 
-  doneIfSlotChange([n.s1, n.s2], test);
+  doneIfSlotChange([n.s1, n.s2], [[],[]], test);
 
   n.s1.appendChild(document.createElement('div'));
-}, 'slotchange event: Add a fallback content to nested slots.');
+}, 'slotchange event: Add a fallback content to nested slots - assignedNodes still empty.');
 
 async_test((test) => {
   let n = createTestTree(test_fallback3);
   removeWhiteSpaceOnlyTextNodes(n.test_fallback3);
 
-  doneIfSlotChange([n.s1, n.s2], test);
+  doneIfSlotChange([n.s1, n.s2], [[],[]], test);
 
   n.f1.remove();
-}, 'slotchange event: Remove a fallback content from nested slots.');
+}, 'slotchange event: Remove a fallback content from nested slots - assignedNodes still empty.');
 </script>
 
 <div id="test3">
@@ -191,7 +200,7 @@ async_test((test) => {
   let n = createTestTree(test3);
   removeWhiteSpaceOnlyTextNodes(n.test3);
 
-  doneIfSlotChange([n.s1], test);
+  doneIfSlotChange([n.s1], [[]], test);
 
   let slot = document.createElement('slot');
   slot.setAttribute('name', 'slot1');
@@ -214,7 +223,7 @@ async_test((test) => {
   let n = createTestTree(test4);
   removeWhiteSpaceOnlyTextNodes(n.test4);
 
-  doneIfSlotChange([n.s2], test);
+  doneIfSlotChange([n.s2], [[n.c1]], test);
 
   n.s1.remove();
 }, "slotchange event: Remove a preceding slot.");
@@ -239,7 +248,7 @@ async_test((test) => {
   let n = createTestTree(test5);
   removeWhiteSpaceOnlyTextNodes(n.test5);
 
-  doneIfSlotChange([n.s1, n.s2], test);
+  doneIfSlotChange([n.s1, n.s2], [[],[n.s1]], test);
 
   n.c1.remove();
 }, "slotchange event: A slot is assigned to another slot.");
@@ -263,8 +272,34 @@ async_test((test) => {
   let n = createTestTree(test6);
   removeWhiteSpaceOnlyTextNodes(n.test6);
 
-  doneIfSlotChange([n.s2], test);
+  doneIfSlotChange([n.s2], [[]], test);
 
   n.s1.remove();
-}, "slotchange event: Even if distributed nodes do not change, slotchange should be fired if assigned nodes are changed.");
+}, "slotchange event: Slotchange should be fired if assigned nodes are changed.");
 </script>
+
+<div id="test7">
+  <div id="host1">
+    <template data-mode="open">
+      <div id="host2">
+        <template data-mode="open">
+          <slot id="s2" name="slot2"></slot>
+        </template>
+        <slot id="s1" name="slot1" slot="slot2"></slot>
+      </div>
+    </template>
+  </div>
+</div>
+
+<script>
+async_test((test) => {
+  let n = createTestTree(test7);
+  removeWhiteSpaceOnlyTextNodes(n.test7);
+
+  let d1 = document.createElement('div');
+  d1.setAttribute('slot', 'slot1');
+  doneIfSlotChange([n.s1, n.s2], [[d1],[n.s1]], test);
+
+  n.host1.appendChild(d1);
+}, "slotchange event: Child content is added to nested slots.");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.key b/tests/wpt/web-platform-tests/tools/certs/cacert.key
index 1c1ca2bc110..1df8d73c3b2 100644
--- a/tests/wpt/web-platform-tests/tools/certs/cacert.key
+++ b/tests/wpt/web-platform-tests/tools/certs/cacert.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcASKD0ss81ECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGBV6uUfaaIYBIIEyBtxKGR+s9bP
-GXpgttZpWXUqeEh1QUhgHgH7f21v81x4t7Svy3esSn65UCaBUN/aqcPA31fcEmqX
-Lv4PbOZoGMvoJTzZSNEpuOAAZam2FdA6fbULLB42cfu3YiZYGApJsL9aRIYxBcGa
-b/qhAK8rgAIWi+cR405O+23ga9AtEvzWJ08JX5vGmPb/ZsQmEfeQX1IQzl0Bh+2D
-To8iviHlbb78Io7OiLcVv8Ds7O+7Ib0hxFCdurEkUqqVf+UC8NAE3qWrsZuSZbhj
-SkJFN1Ks82zM2TMAjQpNfFG5eHvkeRVUgLWbeV7cYigZYbRkkElrZOe6AL5ebuO3
-dz6RX4q9G2Hz/SfLfuKL+spI4/9Ya+bmsik2fPWJ4kdSwKItx9JtMaCSv1m44ElE
-gZGYE+N97+O9u888fiy1ob8JRCJZZi2KAOZkUYE7WHWk9vZCg6uSpAxFJcxOdxG/
-H5XCt/+iNOOTlqT2UCH5YZIblgU+tvt1tq/JSAUCfJPGMBCmiVz2ifs5bKerE7+b
-PMxoRHBaPMYS4rg0wgWNjZW8MVLGGaVzjfzIZwwcGyI3Lm48m+q3iuevjc9KvIYb
-L89ntnwQUA5T+NT3hSnKimXbc7XOu483T0/NEfGOSDzCF/qfTRCnVz+YqdjkXKXh
-5bd3NPz+MSLHkk0FFEorCNiOSDylIzzOu986uskgVtF79ixX71a+nBt5g0HpRbk+
-9cT8qKXvZN8YYXtrznbUVrdCK8EwmnAicZ0+ZkAYb8Pg5LaFg75sNnWsCQ/2ZWgs
-2+u4QtTNzKvmC7WaKi5SpAm5SJcxVzHSbdDLVMCV6eVyeJAuiRNR2ZByEfOeyNRY
-c3N38L4rquop41XGnorbt7n0EyU6j8yd0HmPQeJP/wNTh9E8lntkTbuxziht03YJ
-Qtk9a9vF9iQfoLpYd1VspPDLO7whn+2kGc8E2zJJlSsXVK8WhiQIPM0HOFN+OPBc
-INYYTrijuail+bAt+PeXmd2bnrCABr7o64v0h7cHmx+Yngc3OWzhtMXlk7/r/skP
-s0dEtr3BkD8iiKkHVvkqN4MCqkwc2H6Z1fV9uDhUv/dJIUsYWvLpvhY+QGv+R+5U
-yfnbRhHZPfAIzkbvKbuc7/bKvLOeCDSTF1pHnjiAQgE3lFsXLsfZ/9ViwFZ4/0Tu
-LR8Sv5pWxAc0qTYh3qyTLqgNlBfNgrYyf/PqiTIZpMqOnJkiX+VvkG/O+fMQMcLL
-JeZ7okF8TMqft9pWsgMZOcDLWyv4UFuwYNauEKJUjZAJ9L8O4dO74MYfR0c1fiMg
-27n6N6nt7bya7HzidHJx5cmGP6zCb1DLkdF3/2r/MYG9ciGodfwudfFRLZdeO6qs
-I3r1K9htN3zfr44aEJwzCOq5nXY7kGOeqdOzrODm67V2Y/poo17cEtgJuBEH5EW3
-E2PjNP1E2rmO7WcdlY69H4r280IzU1y/nmYzcYaVailQbJnBiDewty/KDAH9z/YN
-Bmf+xoDbuxcaFJC9SBe2H2pP0F+rjxn1vRwItPNa920HLgzyGw/LzEXodIk7nbDi
-Qkxxv3tM42R02iKRoQJsCE808KukBaNXRxdWmHXrvizgb4x5bgF9wceeE2uyGKt6
-+gCql5qVVIvmTmSQxwZ7aw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILrnX+IA5B7wCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEtP+3jaoEqkBIIEyAkS32MWcijR
+TWp8Y1SEM5Gos2WvaSVMZy8vURNeE23+YR2lD1zJbYy3c1vHWheK6VKHaH9NGkvK
+2D6rIsQwnE/O6gfZRxWb2hDRMXQDksAVH7igGfX+WkHoBwHyxrDb8juG/xWsFIr5
+W63AH6N8XR+N+m97uWIATpbcbhAkRaBOxELmHhDaMvQdvFqwhjewUqS3RrC947Kb
+4NcvG9kKGxI6UPWMErw0WWmVYsBc/8+gn1866Qef0IlxDqJdqRFhKspCZGBCj2EX
+CLrvM8+6NbI/5miTmjRsaBj7iTX9hvL46vVQt401E6V0V2vLI+oYuNrmD1fV75a6
+l8I9xhzaEjSIZ1t40yry8DukZN3EwM0oPzfP8WdKenof0rObaDiBYCqmyO+Re+n0
+QklgCK+pYfdGaEYhbIkyktfgZvWEw1+8t3jXEEG96lTIosl0WznD/teSpGnCtyme
+/KsLGCOYpUqyiKLgM3+aLiP0hVWAvFVT015gwQfdzyd0nXc4x8Q/Xz8jYL/t2TFM
+7tT9diQoaiJ12/ug8UZ3NQVgm8Ibk0Bu3pNUv1StFgyrY5XdP3FIMQWgU4p6+oj0
+cY5b62Wrw5XQoIrnkTG//lqAOeMTSFxvlu62RoC4y7ji7u1PQnzRjbMd7j42tqVA
+Xn+l9EJvqkynefYytIMsWw+uYAtUeBw8783R9j+Ldy6lvnk/CdnSqymZ7E+WF6bp
+54nWYsM6bv1y+T6gK6dYm9RUqfrgggsdNHC0GxsTwUmpHVERSAKdZb81xt5KCuM2
+waOxUYAY1Mp5OzvAGfeSstagdWQ0ExsAGw5BAZvuiS9b3x0RqnFoEyQwAv90ON1H
+Eb3E4w/eQsAu+SA5aUD/Yr1lt+hcKJ5EdvXHrLIl8ck4NYwxk0spZsbSceq0JekG
+obscmp5xyiA0/v9PJHVrmoNWFyy6GO8J/ZZztU/kTGajcXIO8P4ygLbh+Gr0gI5c
+sE0sIR/3Q61tiLMbWKxx+rwsptfYBdQyGCgvDbg3fNUxYmblFj6MyM8T3q7A1mcX
+0y7dGHr8n+a2IdJ8+ZTqZXuJh1AwHyUht1YzccXy6TvGPVuJgDuRp6zvs0w+D4Oe
+ddPUVs1P8wj4QhRes1dnuyTBUNokfoznHvKsGX8AH9eN+UOQ3TkwjDRe5pxtJ2XX
+HL3XeCVXt3Bxu3unZ6nisUHHt1a4jckS7gwkChWObyfGEq34J95W771Kw2cxeyDU
+pWz6Rt1jYGTioT1sIL2Z8m0Ru5n8SsMOysQkF1BXM9bmc8iB+lDNoi83G2Kgk6DN
+/vDMPhI894TL58BH/wx3PSMiiUA4eR+PjDltT5UC+qlhDiC6WEoSt/hhtrg7DgFb
+mPes42/B8T7CdmUD2HUUR+XsChBQhAQrcuzqMcS6Zq6KARgMaCzT3cYFA5C/LiUZ
+TyGmYpCBggkcpoKCVgUC9EmQ3FRC9nXCWnlDUJRM0sd3kluYGrQBo+wVzb+6JMvV
+JOESa/7t827YRvlYS8RCDihSgX1G4T/4napL3YCxPrFOmdCQYDovVaUA3qdlpxP+
+MQHsGiF9joIMKdfFjCKa2ryInMaR0lmv7y/Zs9EMWg8O6BQF+NQobJuwU5sKlegx
+8Lo4YqfmCdNAzsSJ6rhC1A==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.pem b/tests/wpt/web-platform-tests/tools/certs/cacert.pem
index a9383d0cf00..b30adfa419b 100644
--- a/tests/wpt/web-platform-tests/tools/certs/cacert.pem
+++ b/tests/wpt/web-platform-tests/tools/certs/cacert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIJAhzCCP2+gAwIBAgIDC40VMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDExMTIwMDIwNTNaFw0yMTExMTIwMDIwNTNa
+MIJAhzCCP2+gAwIBAgIDBPWrMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDEyMTIwMDI4MjdaFw0yMTEyMTIwMDI4Mjda
 MB0xGzAZBgNVBAMMEndlYi1wbGF0Zm9ybS10ZXN0czCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALdnLr4euIqNu/fGFriDJAA2QT4m8q196Ur22hKKvbzf
-ybjM/Ux1DwRDBvFjEmjyAnBgfMhYjGHG61SSz75qHONwHleStZlApMw6aA3izKwT
-EjwK8Lcd2YOPOWOwPXlURo9WC6f/U0NAwQ52+gg3Iru7XoY1Lpf6EyIs1SJwbqG+
-u1zPIw+z4DDinHdq2/zjvVuSqkgItj7wirTbUAeyZbIf+Bm+4QUzsUU7pWQGa/e6
-zEaV2iDh0HQS1H8FJsOx9eL0F1nEt3Ca/e0YYU6BRarESVRXKEVlOGov/WFe/3LL
-hzEVQDA69LT3U6FcW29risXcTs52Zb14GoTBSGGG+b8CAwEAAaOCPc4wgj3KMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFCWPU0qvGY1M+UVUpbjsIRzEY8uiMEcGA1Ud
-IwRAMD6AFCWPU0qvGY1M+UVUpbjsIRzEY8uioSGkHzAdMRswGQYDVQQDDBJ3ZWIt
-cGxhdGZvcm0tdGVzdHOCAwuNFTALBgNVHQ8EBAMCAgQwgh+bBgNVHR4Egh+SMIIf
+BQADggEPADCCAQoCggEBALyIJvebVlTCq1p3h+cow7sp3qjhVJQASg+v7huHucEG
+eoq11qbpaJ9WkeHxYO6PjpIHegpogvqKXmkV02BMqt+5ULEWIYpaz4VHiEH4E8Wc
+zZXYSDFDC40zDLjrzt1+BZYlMpBTeSRj7WLkD/Qhb6ZozAzDJhoJRpEkmQZ0t14s
+55feXzm87ZOiEm2d2B33JPpWhw+tusLufcGoz4D4e9tNOtXPdus/QpXRdsdoy53L
+WI8GRPfJKrhQ1gXnBXTcDJpXDPqk8JMsciYL+63MiVOZ93v4dD3uueK5Lsn/krVV
+Eoivkz1ONiXVgI1oQMJO7eFylka85fikC7r316ZCcJ0CAwEAAaOCPc4wgj3KMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFKepXnGpqWQbsgOM0WPj+KHQtRpoMEcGA1Ud
+IwRAMD6AFKepXnGpqWQbsgOM0WPj+KHQtRpooSGkHzAdMRswGQYDVQQDDBJ3ZWIt
+cGxhdGZvcm0tdGVzdHOCAwT1qzALBgNVHQ8EBAMCAgQwgh+bBgNVHR4Egh+SMIIf
 jqCCH4owE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVb3A4LndlYi1wbGF0Zm9ybS50
 ZXN0MBeCFW9wNy53ZWItcGxhdGZvcm0udGVzdDAXghVvcDkud2ViLXBsYXRmb3Jt
 LnRlc3QwF4IVb3A0LndlYi1wbGF0Zm9ybS50ZXN0MBeCFW5vdC13ZWItcGxhdGZv
@@ -337,11 +337,11 @@ d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3dr
 cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
 cWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0
 gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBADI9ECYU
-bk74fmKwJMWPy4fR8JWIL44Fg8Gng0zNcUSDGwh3vQGb+IQQSHMV9/BhRIAuPInB
-K6z9wGZRgSMUROci87G/NqJo86YP84CwQy/uiW11SgO5EIPD3qQh1Ytk3VOf4SUf
-zn+ewYwCTGfV6eQND/I40t9ZfAUtvPyI0D4Q1glTOZJV6nkaVJL6vCJhUrPWMRAe
-wrJq+z/N80/EA9YlB6m2nJNuPGCng2ckacdo0Xq+op4hqTTYFmfvBXrCR7/oeP5z
-VwFUBdqee2rsnBpFcgBKd0+7LoG4M0GYvbtgkILOAgjpZGni1U5bUumaLApzfYEt
-hEFv2hJH8ccY+C0=
+YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBAHRhJQlg
+uwzvgj4WGzomthrmeYpP9hELJzW8jPDyTZosUeX63zmctP46cFlcFPSZJn5UGUrP
+hpwdC5RJx9cGjYUjqqgahM+R5bpo0NqJJZfiO0a+yndxUwYRawW/fGDnyFwcXl7p
+QYD1dpw+u5b1m9+B4GW3hXqzBLwBKJ8mH62E4RZQwSBMsSNiDLRsPFAdc/IIHKUS
+B8zI53byoNLzjGSDjaw77n2arGS3CuoBbYyiMxVVmdRgZ8pbHewfKkwKNdsnGGgr
+0YHlg2WQ/lBSOvPovAti89vkWzPJYhJbPS2ybaHOAzVJxmqP3dpBoL2vw8yTIM6G
+kGxP4JsY0GYmQ+U=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
index 4e557404ab2..492fa9fd049 100644
--- a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
+++ b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDJ5znW1OiuaVzS
-BqGsIGNjixbjYO3pSf/3xsW7V9Hc9QZJ4RP5Rt1U8n+3/vFwH6ks5Wfdo2vWrRsB
-x8Z07l+b9FJF35i0kAJ9JPhAWaxg3agj0Aj/pYdlzEioXmkOD4pCSHrnKBQTkAne
-4qT6D5yoigvk/BXZ7WmnRM6IetnDmbttgnPVlKqhRU5rdZH4Rw+YtIML6hZ9Vmw3
-I3Ovo/o2wStKFcIuBe4IvC1ohMYgueP2vbHhab+tT9J6BnXCPhJdmL4L6UKYca6I
-sO32+mLxITT0NeHi0O910G8Dz6CgazYTtbuF27494q8y5hkXtbuPmxWZvr1vtdnK
-YX3acocHAgMBAAECgf8mpRttA1OGDqS1jo9jYs+jPfwjiWoAPSnBQ0qVkTmaEUwi
-1/H6xJWYrNHFZgbQbz7yWPaIdb8uV/PTY2mY+AdU0m7s8N9JsEbJrUnXB1L3N3X3
-ZNpUFFrWIUPG9kslZdQQ286qcAFnvSomfzsUoehaWhHswlNsYwTV/1WIyfrkdTFg
-Q//fpWJx4OaRWGwqf0Ld9Iab3FtJSeMQcoHyJSOeMPbbFhxJg38f3TdJMpQw4dHA
-97FkUyMFcuX9705DjiBmwyWEFNQAMdMxTX2I3dy1EexIdrK2vJJ9KykM6gCUazuu
-AXmJwakpnaAoYmjDSZBTB+9VEeK5ETN/MgchofECgYEA5rEApE+zNqiotWJnsTIt
-IUFdxv+i5VjQMfJzPIBgpqpjC35lqtaDnhRJ3omRAJgFQa5XIBJkOmsDGewbxGOi
-3nI/SXe5c3NpbOBvTIF3Mbgfok9KFVmnpDqHs6p0gShEn6CXJrXwNdfkVFnKUrRQ
-7vOPhV/K2dIeBAvQzk+ViMkCgYEA4A20F/A466jetgz+QV4IBo+tf6HEwqj9fFfX
-Bhwt+/hbFRnKY8H2YYTZBPGwj0Jg/QBfAt6aRMHaM6OvqxtqJHj9xreRRuD+t8wp
-KiVHpmMoE2lugnc3eRLXoBUMeu4dHcV2lzH6KsfQcO30Pcg+hX7QvVlGV6MQZRVP
-QB7sSU8CgYEAvz8AFDfKj8a0zmJ9KiY5ybcCAmaNaer99lpT9FVNSv44TCAGMuHR
-jWyubKHJJx/gQ7o/mmQE2XU7xfK6dk5PiHBYTRTHFpIYVV2eh2NRKFPHTezDsv13
-gCvRsj3ehfCXK2qbxEjSkiCfttoVZAj+i4o5ck2ewoNxxNLy0QajJhkCgYB5+9v+
-YIKNA27lzSMssaZK9DSw1YFLvjfsV+Kw5+y9T5U/YsBHGdYrd+m0AGZxSOGHPYl9
-BXcWUjibftXooc9jNiBs7YqB/YOQy+3pjUx6MWgjUXaiP4gLOg/9jxgxYaymhdiw
-LryWSB2bLmKYtIodolLBlHZwxk3pyvVP4sYgjwKBgCTf5wCibgaa6EjR6NewsFgU
-NPOXBvCEHXQENNBCWPPJZL1a6RJ48TZijMTzIa4S0m+AP3+g8vdFQ7X9uxRC/gfV
-5mWogHtK14dY07WMi8TJogJwoufukedrI5vtbQh3Rijty1Vwz7/Fcq/dgG3sFMzw
-7TjzYF4FIkYUQSzG/GP5
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDE3iJ5ETr7Gylm
++Pano4qjJBd/vBVx81OvGhdDdoD0U6fVZxYosFvZPwiq7+J4vM0Pv16Z+TaMKZiQ
+nQwABKBIUlufArAuRVtivsoxYdmuOFJ0e/KNaeL9zjfgK1mYK1zK/xNNIt/OpWJ/
+GPMSCkywZ9ozBJ4+0vfb+ddDZruKfOMqTURL4zclukld5egdvT+1xF11yvYtPncY
+A4c8u4g4ry3nN8b3DEBgr0aWM3f9uXLVhddSqt0Qy7IpaqWI1cAwT9Dq1VAJK2ZB
+Hn9VQULSnVc+unmK8WU0Rgqs5s012B9oB6NfpQht6FIc+PQRNldNimxYkb2uneO6
+r/CjiVlfAgMBAAECggEAN/gPROwpIIqwUp4lQbO1DnyMUbxfPG45NGbuhjeCofPG
+m10bZ6X79t98z1wzvq+ufPOjKZM4dtC8lyCO8NJf3y/K7IIPJJiDSqeDRFbVVDqe
+9o7mfl3EMvQV3p10c1agovWxvxRTHKTYQ9oMAOz8sIpV9nsxohrIbLmzAW6Lkus+
+YmCCE0pBdxf9QmQAdcqHFjclFllfRGrlNqRTCsjUaDToat4N0riGr0nbLzEHw7Ml
+YLQVT3OTpKj3kNsA/Po9YFpt4hWv5Q0Ng0T0TKuBBe36qNQOaKje0RAmUS2rfYTS
+XEGsZU9w3uXJAMmcTbOG9+RGkwsern9gEGDfCvpKwQKBgQD1Z2JhQB2xUd3phvPq
+CQDlBWBJ9gPfZAIc9h8YrvzIGlR2iCUDSf04r148LqCf2a4Bm4YGRDtGKpCjmrg5
+hM3eHICnsI+KxsSexQV2yWBxfijI94WxvB9R5/WmebbyGN9Dz14e79cCpIOJNqQJ
+wfvlWf8vQaEZO6D6qW/1dVAI3QKBgQDNXj9aXX3KZewkj5dFSJOB63EATD9DOTaB
+BbtovYGlnS6hZApmrKRHqu8RwTWJtDe5f/9LWNamgSb+X9YevkxUd4IFxZmccSij
+3eQrJfyMgFOSeK/mTOgtGjSXLxCvUmNe0vkzAEt26mM/TS3vJ8UZFxzm0CEXuzsk
+3cuV5I9pawKBgQCzAKJmRZpjCVBRUzr/72lTpMRDrsvMWuqfrXepTZrdazdI7q3w
+5Dts6Z5XT7uiXenrCkKMt6B04f93Fxhh/FkeNrQxnTxXAf3RwezmZKWQo3Gkhchj
+iNFfsU8iC45CsZnJoK0K6+9t4gqAP/cPlwvik+7rzXdxLGmT7ZvY86VZkQKBgEax
+yt0wkby6mS98vnX7JcvzYFLZ7G0XpMuFTZ4gniCEmyizZ2EwzNxe2y0hdWyRvRz+
+EsO9MSbgDqxCEVND7sKk4P1bqCVSTssZ9xFjYix7gElLgkGk98eO3cutR/ESS2K4
+/U+xKkklJkUELGvHJPIeIrTRsJKawSFPuGVA6J1BAoGBANobP7XsZoSkQvsDPEXT
+lYdB9ez11hkQ1ZTbqkHrNUpJQ1IUbUuuK5cgNqK5rMTDySH/zofbh1kDOJxO0R5O
+KrqghC/efrOiDhOmGrxlYH7enTYEfDSav1M1TTTZ7cLd4+q8yeZ97S5b533NfsFF
+oYu93U3AsLggvr23JopNBxSQ
 -----END PRIVATE KEY-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
index 7c58aa67f0a..51df91094a3 100644
--- a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
+++ b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
@@ -1,43 +1,43 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 757014 (0xb8d16)
+        Serial Number: 325036 (0x4f5ac)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=web-platform-tests
         Validity
-            Not Before: Nov 12 00:20:53 2020 GMT
-            Not After : Nov 12 00:20:53 2021 GMT
+            Not Before: Dec 12 00:28:27 2020 GMT
+            Not After : Dec 12 00:28:27 2021 GMT
         Subject: CN=web-platform.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:c9:e7:39:d6:d4:e8:ae:69:5c:d2:06:a1:ac:20:
-                    63:63:8b:16:e3:60:ed:e9:49:ff:f7:c6:c5:bb:57:
-                    d1:dc:f5:06:49:e1:13:f9:46:dd:54:f2:7f:b7:fe:
-                    f1:70:1f:a9:2c:e5:67:dd:a3:6b:d6:ad:1b:01:c7:
-                    c6:74:ee:5f:9b:f4:52:45:df:98:b4:90:02:7d:24:
-                    f8:40:59:ac:60:dd:a8:23:d0:08:ff:a5:87:65:cc:
-                    48:a8:5e:69:0e:0f:8a:42:48:7a:e7:28:14:13:90:
-                    09:de:e2:a4:fa:0f:9c:a8:8a:0b:e4:fc:15:d9:ed:
-                    69:a7:44:ce:88:7a:d9:c3:99:bb:6d:82:73:d5:94:
-                    aa:a1:45:4e:6b:75:91:f8:47:0f:98:b4:83:0b:ea:
-                    16:7d:56:6c:37:23:73:af:a3:fa:36:c1:2b:4a:15:
-                    c2:2e:05:ee:08:bc:2d:68:84:c6:20:b9:e3:f6:bd:
-                    b1:e1:69:bf:ad:4f:d2:7a:06:75:c2:3e:12:5d:98:
-                    be:0b:e9:42:98:71:ae:88:b0:ed:f6:fa:62:f1:21:
-                    34:f4:35:e1:e2:d0:ef:75:d0:6f:03:cf:a0:a0:6b:
-                    36:13:b5:bb:85:db:be:3d:e2:af:32:e6:19:17:b5:
-                    bb:8f:9b:15:99:be:bd:6f:b5:d9:ca:61:7d:da:72:
-                    87:07
+                    00:c4:de:22:79:11:3a:fb:1b:29:66:f8:f6:a7:a3:
+                    8a:a3:24:17:7f:bc:15:71:f3:53:af:1a:17:43:76:
+                    80:f4:53:a7:d5:67:16:28:b0:5b:d9:3f:08:aa:ef:
+                    e2:78:bc:cd:0f:bf:5e:99:f9:36:8c:29:98:90:9d:
+                    0c:00:04:a0:48:52:5b:9f:02:b0:2e:45:5b:62:be:
+                    ca:31:61:d9:ae:38:52:74:7b:f2:8d:69:e2:fd:ce:
+                    37:e0:2b:59:98:2b:5c:ca:ff:13:4d:22:df:ce:a5:
+                    62:7f:18:f3:12:0a:4c:b0:67:da:33:04:9e:3e:d2:
+                    f7:db:f9:d7:43:66:bb:8a:7c:e3:2a:4d:44:4b:e3:
+                    37:25:ba:49:5d:e5:e8:1d:bd:3f:b5:c4:5d:75:ca:
+                    f6:2d:3e:77:18:03:87:3c:bb:88:38:af:2d:e7:37:
+                    c6:f7:0c:40:60:af:46:96:33:77:fd:b9:72:d5:85:
+                    d7:52:aa:dd:10:cb:b2:29:6a:a5:88:d5:c0:30:4f:
+                    d0:ea:d5:50:09:2b:66:41:1e:7f:55:41:42:d2:9d:
+                    57:3e:ba:79:8a:f1:65:34:46:0a:ac:e6:cd:35:d8:
+                    1f:68:07:a3:5f:a5:08:6d:e8:52:1c:f8:f4:11:36:
+                    57:4d:8a:6c:58:91:bd:ae:9d:e3:ba:af:f0:a3:89:
+                    59:5f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                4F:2E:22:FC:84:2A:2D:A1:8B:1E:1E:3B:23:7F:37:5B:15:C8:EF:FB
+                F5:4B:78:98:A0:A3:36:E3:6F:B8:3C:19:E2:F7:BE:70:0E:F8:70:73
             X509v3 Authority Key Identifier: 
-                keyid:25:8F:53:4A:AF:19:8D:4C:F9:45:54:A5:B8:EC:21:1C:C4:63:CB:A2
+                keyid:A7:A9:5E:71:A9:A9:64:1B:B2:03:8C:D1:63:E3:F8:A1:D0:B5:1A:68
 
             X509v3 Key Usage: 
                 Digital Signature, Non Repudiation, Key Encipherment
@@ -46,33 +46,33 @@ Certificate:
             X509v3 Subject Alternative Name: 
                 DNS:web-platform.test, DNS:op8.web-platform.test, DNS:op7.web-platform.test, DNS:op9.web-platform.test, DNS:op4.web-platform.test, DNS:not-web-platform.test, DNS:op6.web-platform.test, DNS:op3.web-platform.test, DNS:op2.web-platform.test, DNS:op1.web-platform.test, DNS:www.web-platform.test, DNS:op5.web-platform.test, DNS:op88.web-platform.test, DNS:op98.web-platform.test, DNS:op85.web-platform.test, DNS:op89.web-platform.test, DNS:op66.web-platform.test, DNS:op72.web-platform.test, DNS:op24.web-platform.test, DNS:op41.web-platform.test, DNS:op79.web-platform.test, DNS:op91.web-platform.test, DNS:op59.web-platform.test, DNS:op39.web-platform.test, DNS:op60.web-platform.test, DNS:op58.web-platform.test, DNS:op28.web-platform.test, DNS:www1.web-platform.test, DNS:op14.web-platform.test, DNS:op69.web-platform.test, DNS:op40.web-platform.test, DNS:op74.web-platform.test, DNS:op31.web-platform.test, DNS:op18.web-platform.test, DNS:op73.web-platform.test, DNS:op77.web-platform.test, DNS:op12.web-platform.test, DNS:op54.web-platform.test, DNS:op63.web-platform.test, DNS:op71.web-platform.test, DNS:op95.web-platform.test, DNS:op16.web-platform.test, DNS:op36.web-platform.test, DNS:op27.web-platform.test, DNS:op29.web-platform.test, DNS:op94.web-platform.test, DNS:op44.web-platform.test, DNS:op33.web-platform.test, DNS:op84.web-platform.test, DNS:op32.web-platform.test, DNS:op61.web-platform.test, DNS:op70.web-platform.test, DNS:www2.web-platform.test, DNS:op43.web-platform.test, DNS:op78.web-platform.test, DNS:op26.web-platform.test, DNS:op76.web-platform.test, DNS:op52.web-platform.test, DNS:op99.web-platform.test, DNS:op86.web-platform.test, DNS:op46.web-platform.test, DNS:op17.web-platform.test, DNS:op90.web-platform.test, DNS:op93.web-platform.test, DNS:op10.web-platform.test, DNS:op55.web-platform.test, DNS:op47.web-platform.test, DNS:op51.web-platform.test, DNS:op45.web-platform.test, DNS:op80.web-platform.test, DNS:op68.web-platform.test, DNS:op49.web-platform.test, DNS:op57.web-platform.test, DNS:op35.web-platform.test, DNS:op67.web-platform.test, DNS:op92.web-platform.test, DNS:op15.web-platform.test, DNS:op13.web-platform.test, DNS:op75.web-platform.test, DNS:op64.web-platform.test, DNS:op97.web-platform.test, DNS:op37.web-platform.test, DNS:op56.web-platform.test, DNS:op62.web-platform.test, DNS:op82.web-platform.test, DNS:op25.web-platform.test, DNS:op11.web-platform.test, DNS:op50.web-platform.test, DNS:op38.web-platform.test, DNS:op83.web-platform.test, DNS:op81.web-platform.test, DNS:op20.web-platform.test, DNS:op21.web-platform.test, DNS:op23.web-platform.test, DNS:op42.web-platform.test, DNS:op22.web-platform.test, DNS:op65.web-platform.test, DNS:op96.web-platform.test, DNS:op87.web-platform.test, DNS:op19.web-platform.test, DNS:op53.web-platform.test, DNS:op30.web-platform.test, DNS:op48.web-platform.test, DNS:op34.web-platform.test, DNS:op6.not-web-platform.test, DNS:op3.not-web-platform.test, DNS:op2.not-web-platform.test, DNS:op5.not-web-platform.test, DNS:www.not-web-platform.test, DNS:www.www.web-platform.test, DNS:op7.not-web-platform.test, DNS:op4.not-web-platform.test, DNS:op8.not-web-platform.test, DNS:op9.not-web-platform.test, DNS:op1.not-web-platform.test, DNS:op36.not-web-platform.test, DNS:op53.not-web-platform.test, DNS:op50.not-web-platform.test, DNS:op24.not-web-platform.test, DNS:op31.not-web-platform.test, DNS:op95.not-web-platform.test, DNS:op83.not-web-platform.test, DNS:www2.not-web-platform.test, DNS:op73.not-web-platform.test, DNS:op19.not-web-platform.test, DNS:op21.not-web-platform.test, DNS:op81.not-web-platform.test, DNS:op70.not-web-platform.test, DNS:op78.not-web-platform.test, DNS:op40.not-web-platform.test, DNS:op25.not-web-platform.test, DNS:op65.not-web-platform.test, DNS:www.www2.web-platform.test, DNS:op80.not-web-platform.test, DNS:op52.not-web-platform.test, DNS:op68.not-web-platform.test, DNS:op45.not-web-platform.test, DNS:op71.not-web-platform.test, DNS:op72.not-web-platform.test, DNS:op90.not-web-platform.test, DNS:op89.not-web-platform.test, DNS:op49.not-web-platform.test, DNS:op77.not-web-platform.test, DNS:op79.not-web-platform.test, DNS:op82.not-web-platform.test, DNS:www.www1.web-platform.test, DNS:op12.not-web-platform.test, DNS:op39.not-web-platform.test, DNS:op44.not-web-platform.test, DNS:www1.not-web-platform.test, DNS:op58.not-web-platform.test, DNS:op14.not-web-platform.test, DNS:op30.not-web-platform.test, DNS:op62.not-web-platform.test, DNS:op61.not-web-platform.test, DNS:op92.not-web-platform.test, DNS:op29.not-web-platform.test, DNS:op98.not-web-platform.test, DNS:op64.not-web-platform.test, DNS:op26.not-web-platform.test, DNS:op22.not-web-platform.test, DNS:op94.not-web-platform.test, DNS:op38.not-web-platform.test, DNS:op33.not-web-platform.test, DNS:op23.not-web-platform.test, DNS:op57.not-web-platform.test, DNS:op54.not-web-platform.test, DNS:op85.not-web-platform.test, DNS:op46.not-web-platform.test, DNS:op97.not-web-platform.test, DNS:op32.not-web-platform.test, DNS:op60.not-web-platform.test, DNS:op96.not-web-platform.test, DNS:op51.not-web-platform.test, DNS:op41.not-web-platform.test, DNS:op35.not-web-platform.test, DNS:op99.not-web-platform.test, DNS:op42.not-web-platform.test, DNS:op67.not-web-platform.test, DNS:op37.not-web-platform.test, DNS:op48.not-web-platform.test, DNS:op55.not-web-platform.test, DNS:op56.not-web-platform.test, DNS:op84.not-web-platform.test, DNS:op34.not-web-platform.test, DNS:op69.not-web-platform.test, DNS:op11.not-web-platform.test, DNS:op93.not-web-platform.test, DNS:www1.www.web-platform.test, DNS:op86.not-web-platform.test, DNS:op13.not-web-platform.test, DNS:op20.not-web-platform.test, DNS:op76.not-web-platform.test, DNS:op27.not-web-platform.test, DNS:op17.not-web-platform.test, DNS:op75.not-web-platform.test, DNS:op15.not-web-platform.test, DNS:op47.not-web-platform.test, DNS:op18.not-web-platform.test, DNS:op63.not-web-platform.test, DNS:op28.not-web-platform.test, DNS:op43.not-web-platform.test, DNS:op66.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:op91.not-web-platform.test, DNS:op74.not-web-platform.test, DNS:op59.not-web-platform.test, DNS:op88.not-web-platform.test, DNS:op87.not-web-platform.test, DNS:op10.not-web-platform.test, DNS:op16.not-web-platform.test, DNS:www1.www2.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
     Signature Algorithm: sha256WithRSAEncryption
-         ad:77:d8:df:b7:6b:c2:af:07:58:75:0b:2b:78:15:09:a8:9a:
-         fc:4e:4e:13:64:c2:1b:f9:24:e7:6e:55:4b:3e:23:90:00:d4:
-         05:71:19:96:56:0a:2f:d5:46:2a:6a:94:2c:20:51:7a:99:ad:
-         e8:51:2b:48:ff:5a:56:92:69:04:e9:a7:b7:17:42:43:a3:cc:
-         af:2a:8d:1a:a7:52:6f:82:42:a8:d4:ea:3a:85:f4:47:c9:bd:
-         27:16:b0:9d:2c:13:99:19:37:45:24:f9:b1:7a:52:75:d1:a5:
-         a2:7c:1f:4a:d8:a1:7e:65:5f:7e:53:e7:b1:bf:31:6c:1c:98:
-         eb:09:7a:cd:b3:cf:4a:ae:f6:1a:1f:43:4b:22:d6:b2:11:96:
-         e0:08:aa:96:39:da:b8:4f:1c:e5:32:15:31:d5:dc:78:74:e0:
-         d1:2c:cb:f1:93:01:32:a4:d9:d8:69:9c:a1:8c:94:4f:cd:d0:
-         86:e0:1c:76:02:0e:bf:dc:b2:53:67:7c:3f:82:d2:87:8f:11:
-         ce:26:85:38:1b:f3:65:62:fb:36:9c:e3:c4:57:68:f2:4d:00:
-         23:21:69:54:47:2a:77:e6:ac:37:d0:b4:a9:48:bf:fb:e0:03:
-         08:65:31:72:1e:7e:8f:fb:e2:39:99:a5:87:6f:4e:46:46:0a:
-         53:38:ec:d4
+         69:64:ad:f6:53:84:f8:7e:e2:6d:0a:4a:ff:3f:44:d0:30:4f:
+         aa:db:18:8c:1a:49:28:76:04:19:61:1b:34:4b:d9:63:da:96:
+         e1:73:67:26:cf:b0:71:ef:0f:0a:e8:db:17:00:5b:48:cc:89:
+         6d:a5:c5:41:c5:ea:5e:6f:2a:4f:5e:68:f0:93:69:3c:32:6c:
+         15:7f:f5:bd:9b:f8:ab:82:01:65:42:c2:d5:f5:26:9e:06:2b:
+         84:46:74:99:bd:44:d2:17:3b:28:7b:61:61:a3:55:7c:90:6d:
+         7e:88:6e:3c:ce:73:ac:90:a2:89:72:ee:17:0d:e8:21:2d:9d:
+         f7:b0:86:2f:53:8c:70:84:25:3c:6f:33:f4:12:39:7d:68:28:
+         24:31:44:a5:66:05:29:8e:9d:f3:df:62:df:5b:e0:37:d9:15:
+         44:fc:33:f0:63:8e:93:74:10:db:4f:72:5c:2c:b7:ab:18:58:
+         73:f4:ed:15:04:26:d1:42:67:cf:62:35:ee:9a:31:74:34:5e:
+         62:96:1e:a7:23:25:ec:d8:ff:56:40:34:ee:ba:f3:e1:81:5d:
+         56:ab:a1:2d:65:f5:20:57:0f:60:90:dc:ea:ab:d4:0d:96:5b:
+         b2:b5:39:5f:0b:6d:97:3a:b6:bf:d7:9c:36:60:97:3b:bc:3e:
+         f4:8b:e2:df
 -----BEGIN CERTIFICATE-----
-MIIgvDCCH6SgAwIBAgIDC40WMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDExMTIwMDIwNTNaFw0yMTExMTIwMDIwNTNa
+MIIgvDCCH6SgAwIBAgIDBPWsMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDEyMTIwMDI4MjdaFw0yMTEyMTIwMDI4Mjda
 MBwxGjAYBgNVBAMMEXdlYi1wbGF0Zm9ybS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAyec51tTormlc0gahrCBjY4sW42Dt6Un/98bFu1fR3PUG
-SeET+UbdVPJ/t/7xcB+pLOVn3aNr1q0bAcfGdO5fm/RSRd+YtJACfST4QFmsYN2o
-I9AI/6WHZcxIqF5pDg+KQkh65ygUE5AJ3uKk+g+cqIoL5PwV2e1pp0TOiHrZw5m7
-bYJz1ZSqoUVOa3WR+EcPmLSDC+oWfVZsNyNzr6P6NsErShXCLgXuCLwtaITGILnj
-9r2x4Wm/rU/SegZ1wj4SXZi+C+lCmHGuiLDt9vpi8SE09DXh4tDvddBvA8+goGs2
-E7W7hdu+PeKvMuYZF7W7j5sVmb69b7XZymF92nKHBwIDAQABo4IeBDCCHgAwCQYD
-VR0TBAIwADAdBgNVHQ4EFgQUTy4i/IQqLaGLHh47I383WxXI7/swHwYDVR0jBBgw
-FoAUJY9TSq8ZjUz5RVSluOwhHMRjy6IwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
+AAOCAQ8AMIIBCgKCAQEAxN4ieRE6+xspZvj2p6OKoyQXf7wVcfNTrxoXQ3aA9FOn
+1WcWKLBb2T8Iqu/ieLzND79emfk2jCmYkJ0MAASgSFJbnwKwLkVbYr7KMWHZrjhS
+dHvyjWni/c434CtZmCtcyv8TTSLfzqVifxjzEgpMsGfaMwSePtL32/nXQ2a7inzj
+Kk1ES+M3JbpJXeXoHb0/tcRddcr2LT53GAOHPLuIOK8t5zfG9wxAYK9GljN3/bly
+1YXXUqrdEMuyKWqliNXAME/Q6tVQCStmQR5/VUFC0p1XPrp5ivFlNEYKrObNNdgf
+aAejX6UIbehSHPj0ETZXTYpsWJG9rp3juq/wo4lZXwIDAQABo4IeBDCCHgAwCQYD
+VR0TBAIwADAdBgNVHQ4EFgQU9Ut4mKCjNuNvuDwZ4ve+cA74cHMwHwYDVR0jBBgw
+FoAUp6lecampZBuyA4zRY+P4odC1GmgwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
 CCsGAQUFBwMBMIIdjwYDVR0RBIIdhjCCHYKCEXdlYi1wbGF0Zm9ybS50ZXN0ghVv
 cDgud2ViLXBsYXRmb3JtLnRlc3SCFW9wNy53ZWItcGxhdGZvcm0udGVzdIIVb3A5
 LndlYi1wbGF0Zm9ybS50ZXN0ghVvcDQud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13
@@ -231,10 +231,10 @@ NmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRl
 c3SCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2
 MjhhLndlYi1wbGF0Zm9ybS50ZXN0gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54
 bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJ
-KoZIhvcNAQELBQADggEBAK132N+3a8KvB1h1Cyt4FQmomvxOThNkwhv5JOduVUs+
-I5AA1AVxGZZWCi/VRipqlCwgUXqZrehRK0j/WlaSaQTpp7cXQkOjzK8qjRqnUm+C
-QqjU6jqF9EfJvScWsJ0sE5kZN0Uk+bF6UnXRpaJ8H0rYoX5lX35T57G/MWwcmOsJ
-es2zz0qu9hofQ0si1rIRluAIqpY52rhPHOUyFTHV3Hh04NEsy/GTATKk2dhpnKGM
-lE/N0IbgHHYCDr/cslNnfD+C0oePEc4mhTgb82Vi+zac48RXaPJNACMhaVRHKnfm
-rDfQtKlIv/vgAwhlMXIefo/74jmZpYdvTkZGClM47NQ=
+KoZIhvcNAQELBQADggEBAGlkrfZThPh+4m0KSv8/RNAwT6rbGIwaSSh2BBlhGzRL
+2WPaluFzZybPsHHvDwro2xcAW0jMiW2lxUHF6l5vKk9eaPCTaTwybBV/9b2b+KuC
+AWVCwtX1Jp4GK4RGdJm9RNIXOyh7YWGjVXyQbX6IbjzOc6yQooly7hcN6CEtnfew
+hi9TjHCEJTxvM/QSOX1oKCQxRKVmBSmOnfPfYt9b4DfZFUT8M/BjjpN0ENtPclws
+t6sYWHP07RUEJtFCZ89iNe6aMXQ0XmKWHqcjJezY/1ZANO668+GBXVaroS1l9SBX
+D2CQ3Oqr1A2WW7K1OV8LbZc6tr/XnDZglzu8PvSL4t8=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/web-platform-tests/tools/ci/pr_preview.py b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
index 5bd2365164b..c7107334d4f 100755
--- a/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
+++ b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
@@ -12,7 +12,6 @@ import argparse
 import json
 import logging
 import os
-import subprocess
 import time
 
 import requests
@@ -65,6 +64,8 @@ def gh_request(method_name, url, body=None, media_type=None):
 
     resp.raise_for_status()
 
+    if resp.status_code == 204:
+        return None
     return resp.json()
 
 class GitHubRateLimitException(Exception):
@@ -106,35 +107,6 @@ class Project(object):
         self._host = host
         self._github_project = github_project
 
-    @guard('core')
-    def get_pull_request(self, number):
-        url = '{}/repos/{}/pulls/{}'.format(
-            self._host, self._github_project, number
-        )
-
-        logger.info('Fetching Pull Request %s', number)
-        return gh_request('GET', url)
-
-    @guard('search')
-    def get_pull_requests(self, updated_since):
-        window_start = time.strftime('%Y-%m-%dT%H:%M:%SZ', updated_since)
-        url = '{}/search/issues?q=repo:{}+is:pr+updated:>{}'.format(
-            self._host, self._github_project, window_start
-        )
-
-        logger.info(
-            'Searching for Pull Requests updated since %s', window_start
-        )
-
-        data = gh_request('GET', url)
-
-        logger.info('Found %d Pull Requests', len(data['items']))
-
-        if data['incomplete_results']:
-            raise Exception('Incomplete results')
-
-        return {pr['number']: pr for pr in data['items']}
-
     @guard('core')
     def create_ref(self, refspec, revision):
         url = '{}/repos/{}/git/refs'.format(self._host, self._github_project)
@@ -146,6 +118,23 @@ class Project(object):
             'sha': revision
         })
 
+    @guard('core')
+    def get_ref_revision(self, refspec):
+        url = '{}/repos/{}/git/refs/{}'.format(
+            self._host, self._github_project, refspec
+        )
+
+        logger.info('Fetching ref "%s"', refspec)
+
+        try:
+            body = gh_request('GET', url)
+            logger.info('Ref data: %s', json.dumps(body, indent=2))
+            return body['object']['sha']
+        except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                return None
+            raise e
+
     @guard('core')
     def update_ref(self, refspec, revision):
         url = '{}/repos/{}/git/refs/{}'.format(
@@ -156,6 +145,16 @@ class Project(object):
 
         gh_request('PATCH', url, {'sha': revision})
 
+    @guard('core')
+    def delete_ref(self, refspec):
+        url = '{}/repos/{}/git/refs/{}'.format(
+            self._host, self._github_project, refspec
+        )
+
+        logger.info('Deleting ref "%s"', refspec)
+
+        gh_request('DELETE', url)
+
     @guard('core')
     def create_deployment(self, pull_request, revision):
         url = '{}/repos/{}/deployments'.format(
@@ -206,73 +205,6 @@ class Project(object):
             'environment_url': environment_url
         }, 'application/vnd.github.ant-man-preview+json')
 
-class Remote(object):
-    def __init__(self, github_project):
-        # The repository in the GitHub Actions environment is configured with
-        # a remote whose URL uses unauthenticated HTTPS, making it unsuitable
-        # for pushing changes.
-        self._token = os.environ['GITHUB_TOKEN']
-
-    def _git(self, command):
-        return subprocess.check_output([
-            'git',
-            '-c',
-            'credential.username={}'.format(self._token),
-            '-c',
-            'core.askPass=true',
-        ] + command)
-
-    def get_revision(self, refspec):
-        output = self._git([
-            'ls-remote',
-            'origin',
-            'refs/{}'.format(refspec)
-        ])
-
-        if not output:
-            return None
-
-        return output.decode('utf-8').split()[0]
-
-    def delete_ref(self, refspec):
-        full_ref = 'refs/{}'.format(refspec)
-
-        logger.info('Deleting ref "%s"', refspec)
-
-        self._git([
-            'push',
-            'origin',
-            '--delete',
-            full_ref
-        ])
-
-    def get_pull_requests_with_open_ref(self):
-        '''Returns pull requests that have an open ref.
-
-        This checks for all refs that match the pattern 'refs/prs-open/{pr}',
-        and then returns them as a list of pull request numbers. Note that this
-        method does not query github; this is only the open pull requests as
-        far as WPT knows.
-        '''
-
-        refspec = 'refs/prs-open/*'
-
-        logger.info('Fetching all ref names matching "%s"', refspec)
-
-        output = self._git([
-            'ls-remote',
-            'origin',
-            refspec,
-        ])
-
-        if not output:
-            return []
-
-        ref_names = [line.split()[1] for line in output.decode('utf-8').splitlines()]
-        logger.info('%s ref names found', len(ref_names))
-        return [int(ref_name.split('/')[2]) for ref_name in ref_names]
-
-
 def is_open(pull_request):
     return not pull_request['closed_at']
 
@@ -306,7 +238,7 @@ def is_deployed(host, deployment):
     logger.info('Response text: %s', response.text.strip())
     return response.text.strip() == deployment['sha']
 
-def update_mirror_refs(project, remote, pull_request):
+def update_mirror_refs(project, pull_request):
     '''Update the WPT refs that control mirroring of this pull request.
 
     Two sets of refs are used to control wptpr.live's mirroring of pull
@@ -327,11 +259,10 @@ def update_mirror_refs(project, remote, pull_request):
         **pull_request
     )
     refspec_open = 'prs-open/{number}'.format(**pull_request)
-    revision_latest = remote.get_revision(
-        'pull/{number}/head'.format(**pull_request)
-    )
-    revision_trusted = remote.get_revision(refspec_trusted)
-    revision_open = remote.get_revision(refspec_open)
+
+    revision_latest = pull_request['head']['sha']
+    revision_trusted = project.get_ref_revision(refspec_trusted)
+    revision_open = project.get_ref_revision(refspec_open)
 
     if should_be_mirrored(project, pull_request):
         logger.info('Pull Request should be mirrored')
@@ -351,10 +282,10 @@ def update_mirror_refs(project, remote, pull_request):
     logger.info('Pull Request should not be mirrored')
 
     if not has_mirroring_label(pull_request) and revision_trusted is not None:
-        remote.delete_ref(refspec_trusted)
+        project.delete_ref(refspec_trusted)
 
     if revision_open is not None and not is_open(pull_request):
-        remote.delete_ref(refspec_open)
+        project.delete_ref(refspec_open)
 
     # No revision to be deployed to wptpr.live
     return None
@@ -394,7 +325,6 @@ def deploy(project, target, pull_request, revision, timeout):
 
 def main(host, github_project, target, timeout):
     project = Project(host, github_project)
-    remote = Remote(github_project)
 
     with open(os.environ['GITHUB_EVENT_PATH']) as handle:
         data = json.load(handle)
@@ -405,7 +335,7 @@ def main(host, github_project, target, timeout):
 
     logger.info('Processing Pull Request #%(number)d', pull_request)
 
-    revision_to_mirror = update_mirror_refs(project, remote, pull_request)
+    revision_to_mirror = update_mirror_refs(project, pull_request)
     if revision_to_mirror:
         deploy(project, target, pull_request, revision_to_mirror, timeout)
 
diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py b/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
index 87478727d3e..a268383ed0b 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
@@ -128,12 +128,24 @@ class Requests(object):
         '/repos/test-org/test-repo/git/refs',
         {'ref':'refs/prs-trusted-for-preview/45'}
     )
+    ref_get_open = (
+        'GET', '/repos/test-org/test-repo/git/refs/prs-open/45', {}
+    )
+    ref_get_trusted = (
+        'GET', '/repos/test-org/test-repo/git/refs/prs-trusted-for-preview/45', {}
+    )
     ref_update_open = (
         'PATCH', '/repos/test-org/test-repo/git/refs/prs-open/45', {}
     )
     ref_update_trusted = (
         'PATCH', '/repos/test-org/test-repo/git/refs/prs-trusted-for-preview/45', {}
     )
+    ref_delete_open = (
+        'DELETE', '/repos/test-org/test-repo/git/refs/prs-open/45', {}
+    )
+    ref_delete_trusted = (
+        'DELETE', '/repos/test-org/test-repo/git/refs/prs-trusted-for-preview/45', {}
+    )
     deployment_get = ('GET', '/repos/test-org/test-repo/deployments', {})
     deployment_create = ('POST', '/repos/test-org/test-repo/deployments', {})
     deployment_status_create_pending = (
@@ -170,12 +182,10 @@ class Responses(object):
 
 
 @contextlib.contextmanager
-def temp_repo(change_dir=False):
+def temp_repo():
     original_dir = os.getcwd()
     directory = tempfile.mkdtemp()
-
-    if change_dir:
-        os.chdir(directory)
+    os.chdir(directory)
 
     try:
         subprocess.check_call(['git', 'init'], cwd=directory)
@@ -199,62 +209,31 @@ def temp_repo(change_dir=False):
 
         yield directory
     finally:
-        if change_dir:
-            os.chdir(original_dir)
-
+        os.chdir(original_dir)
         shutil.rmtree(
             directory, ignore_errors=False, onerror=handle_remove_readonly
         )
 
-def update_mirror_refs(pull_request, expected_traffic, refs={}):
+def update_mirror_refs(pull_request, expected_traffic):
     os.environ['GITHUB_TOKEN'] = 'c0ffee'
 
     github_server = MockServer((TEST_HOST, 0), expected_traffic)
     github_port = github_server.server_address[1]
-    remote_refs = {}
 
     method_threw = False
-    with temp_repo(change_dir=True), temp_repo() as remote_repo, github_server:
-        subprocess.check_call(
-            ['git', 'commit', '--allow-empty', '-m', 'first'],
-            cwd=remote_repo
-        )
-        subprocess.check_call(
-            ['git', 'commit', '--allow-empty', '-m', 'second'],
-            cwd=remote_repo
-        )
-        subprocess.check_call(['git', 'remote', 'add', 'origin', remote_repo])
-
-        for name, value in refs.items():
-            subprocess.check_call(
-                ['git', 'update-ref', name, value],
-                cwd=remote_repo
-            )
-
-        subprocess.check_call(['git', 'remote', '-v'])
+    with temp_repo(), github_server:
         project = pr_preview.Project(
             'http://{}:{}'.format(TEST_HOST, github_port),
             'test-org/test-repo',
         )
-        remote = pr_preview.Remote('test-org/test-repo')
         try:
-            pr_preview.update_mirror_refs(project, remote, pull_request)
+            pr_preview.update_mirror_refs(project, pull_request)
         except pr_preview.GitHubRateLimitException:
             method_threw = True
 
-        lines = subprocess.check_output(['git', 'ls-remote', 'origin'])
-        for line in lines.decode('utf-8').strip().split('\n'):
-            revision, ref = line.split()
-
-            if not ref or ref in ('HEAD', 'refs/heads/master'):
-                continue
-
-            remote_refs[ref] = revision
-
     return (
         method_threw,
         github_server.actual_traffic,
-        remote_refs,
     )
 
 
@@ -289,6 +268,7 @@ def deploy(pr_num, revision, expected_github_traffic, expected_preview_traffic):
 def test_update_mirror_refs_fail_rate_limited():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'COLLABORATOR',
@@ -308,7 +288,7 @@ def test_update_mirror_refs_fail_rate_limited():
         ))
     ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -319,14 +299,20 @@ def test_synchronize_ignore_closed():
     # No existing refs, but a closed PR event comes in. Nothing should happen.
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'COLLABORATOR',
         'closed_at': '2019-10-28',
     }
-    expected_traffic = []
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
+    ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -336,6 +322,7 @@ def test_synchronize_ignore_closed():
 def test_update_mirror_refs_collaborator():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'COLLABORATOR',
@@ -343,12 +330,16 @@ def test_update_mirror_refs_collaborator():
     }
     expected_traffic = [
         (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
         (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_open, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_trusted, (200, {})),
     ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic, = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -358,14 +349,20 @@ def test_update_mirror_refs_collaborator():
 def test_update_mirror_refs_ignore_collaborator_bot():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'chromium-wpt-export-bot'},
         'author_association': 'COLLABORATOR',
         'closed_at': None,
     }
-    expected_traffic = []
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
+    ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -375,14 +372,20 @@ def test_update_mirror_refs_ignore_collaborator_bot():
 def test_update_mirror_refs_ignore_untrusted_contributor():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'CONTRIBUTOR',
         'closed_at': None,
     }
-    expected_traffic = []
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
+    ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -392,6 +395,7 @@ def test_update_mirror_refs_ignore_untrusted_contributor():
 def test_update_mirror_refs_trusted_contributor():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         # user here is a contributor (untrusted), but the issue
         # has been labelled as safe.
         'labels': [{'name': 'safe for preview'}],
@@ -401,12 +405,16 @@ def test_update_mirror_refs_trusted_contributor():
     }
     expected_traffic = [
         (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
         (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_open, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_trusted, (200, {})),
     ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -416,6 +424,7 @@ def test_update_mirror_refs_trusted_contributor():
 def test_synchronize_sync_bot_with_label():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         # user here is a bot which is normally not mirrored,
         # but the issue has been labelled as safe.
         'labels': [{'name': 'safe for preview'}],
@@ -425,12 +434,16 @@ def test_synchronize_sync_bot_with_label():
     }
     expected_traffic = [
         (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (404, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (404, {})),
         (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_open, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
         (Requests.ref_create_trusted, (200, {})),
     ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
+    method_threw, actual_traffic = update_mirror_refs(
         pull_request, expected_traffic
     )
 
@@ -440,6 +453,7 @@ def test_synchronize_sync_bot_with_label():
 def test_update_mirror_refs_update_collaborator():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'COLLABORATOR',
@@ -447,18 +461,27 @@ def test_update_mirror_refs_update_collaborator():
     }
     expected_traffic = [
         (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
         (Requests.get_rate, Responses.no_limit),
         (Requests.ref_update_open, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
         (Requests.ref_update_trusted, (200, {})),
     ]
-    refs = {
-        'refs/pull/45/head': 'HEAD',
-        'refs/prs-open/45': 'HEAD~',
-        'refs/prs-trusted-for-preview/45': 'HEAD~'
-    }
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
-        pull_request, expected_traffic, refs
+    method_threw, actual_traffic = update_mirror_refs(
+        pull_request, expected_traffic
     )
 
     assert not method_threw
@@ -467,6 +490,7 @@ def test_update_mirror_refs_update_collaborator():
 def test_synchronize_update_member():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'jgraham'},
         'author_association': 'MEMBER',
@@ -474,18 +498,27 @@ def test_synchronize_update_member():
     }
     expected_traffic = [
         (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
         (Requests.get_rate, Responses.no_limit),
         (Requests.ref_update_open, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
         (Requests.ref_update_trusted, (200, {}))
     ]
-    refs = {
-        'refs/pull/45/head': 'HEAD',
-        'refs/prs-open/45': 'HEAD~',
-        'refs/prs-trusted-for-preview/45': 'HEAD~'
-    }
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
-        pull_request, expected_traffic, refs
+    method_threw, actual_traffic = update_mirror_refs(
+        pull_request, expected_traffic
     )
 
     assert not method_threw
@@ -494,25 +527,39 @@ def test_synchronize_update_member():
 def test_update_mirror_refs_delete_collaborator():
     pull_request = {
         'number': 45,
+        'head': {'sha': 'abc123'},
         'labels': [],
         'user': {'login': 'stephenmcgruer'},
         'author_association': 'COLLABORATOR',
         'closed_at': 2019-10-30,
     }
-    expected_traffic = []
-    refs = {
-        'refs/pull/45/head': 'HEAD',
-        'refs/prs-open/45': 'HEAD~',
-        'refs/prs-trusted-for-preview/45': 'HEAD~'
-    }
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_trusted, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_get_open, (
+            200,
+            {
+                'object': {'sha': 'def234'},
+            }
+        )),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_delete_trusted, (204, None)),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.ref_delete_open, (204, None)),
+    ]
 
-    method_threw, actual_traffic, remote_refs = update_mirror_refs(
-        pull_request, expected_traffic, refs
+    method_threw, actual_traffic = update_mirror_refs(
+        pull_request, expected_traffic
     )
 
     assert not method_threw
     assert same_members(expected_traffic, actual_traffic)
-    assert list(remote_refs) == ['refs/pull/45/head']
 
 def test_deploy_fail_rate_limited():
     expected_github_traffic = [
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
index 071d53e9e4e..ef67c0c5227 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -2,7 +2,7 @@
 # DO NOT EDIT MANUALLY.
 
 # tools/certs/web-platform.test.pem
-WPT_FINGERPRINT = '2cJlW4Y613RmoaIxvps+Afm0Fd3olxiahT3z2DNw6PA='
+WPT_FINGERPRINT = 'jLyENXJPaWkMd5jvkdeZNBCDxmlrsaejX6b9sUNA6Kc='
 
 # signed-exchange/resources/127.0.0.1.sxg.pem
 SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='