From 7045630fee46d3b9a68779f010130f6431dfd64f Mon Sep 17 00:00:00 2001
From: Servo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com>
Date: Sun, 26 Jan 2025 14:36:52 +0100
Subject: [PATCH] Update web-platform-tests to revision
 b'e5e7dab5e72edd352b17105acce2b8f443face10' (#35174)

Signed-off-by: WPT Sync Bot <ghbot+wpt-sync@servo.org>
---
 ...tition-navigation.tentative.https.html.ini |    2 -
 ...n-worker-creation.tentative.https.html.ini |    2 -
 .../cross-partition.tentative.https.html.ini  |    2 -
 .../clipboard-item.https.html.ini             |   84 +
 ...ile-list-change-reference-updates.html.ini |    3 +
 .../idlharness.https.window.js.ini            |   93 +
 .../cors-safelisted-request-header.any.js.ini |   12 -
 .../anonymous-table-box-width-001.xht.ini     |    3 -
 .../css-cascade/layer-media-toggle.html.ini   |    2 -
 .../font-display-preload.html.ini             |    2 +-
 ...he-check-pseudo-element.tentative.html.ini |    2 -
 ...ct-arrow-pseudo-element.tentative.html.ini |    2 -
 .../dynamic-available-size-iframe.html.ini    |    2 -
 .../stretch/block-height-1.html.ini           |    2 +
 .../stretch/block-height-2.html.ini           |    2 +
 ...teractivity-inert-focus.tentative.html.ini |    3 +-
 .../interactivity-computed.tentative.html.ini |  138 +-
 .../parsing/interactivity.tentative.html.ini  |   18 +-
 .../cssom/medialist-interfaces-001.html.ini   |   10 -
 .../mediaqueries/test_media_queries.html.ini  | 2521 +++++++------
 .../custom-elements/builtin-coverage.html.ini |  113 +-
 .../HTMLSlotElement.html.ini                  |    6 +-
 .../HTMLStyleElement.html.ini                 |    6 -
 .../dom/idlharness.any.js.ini                 |    9 -
 .../dom/idlharness.window.js.ini              |   27 -
 .../tentative/observable-from.any.js.ini      |   12 +
 .../new-window.tentative.https.window.js.ini  |   37 +-
 ...ute-redirect.tentative.https.window.js.ini |    6 +
 ...sions-policy.tentative.https.window.js.ini |    3 +
 .../quota.tentative.https.window.js.ini       |  102 +-
 .../element-picture.https.sub.html.ini        |    9 -
 .../fetch/range/general.any.js.ini            |    6 -
 .../iframe-nosrc.html.ini                     |    3 +
 .../load-pageshow-events-window-open.html.ini |    3 -
 .../2d.composite.canvas.clear.html.ini        |    3 +
 .../2d.composite.canvas.copy.html.ini         |    3 +
 ...composite.canvas.destination-atop.html.ini |    3 +
 ...d.composite.canvas.destination-in.html.ini |    3 +
 ....composite.canvas.destination-out.html.ini |    3 +
 ...composite.canvas.destination-over.html.ini |    3 +
 .../2d.composite.canvas.lighter.html.ini      |    3 +
 .../2d.composite.canvas.source-atop.html.ini  |    3 +
 .../2d.composite.canvas.source-in.html.ini    |    3 +
 .../2d.composite.canvas.source-out.html.ini   |    3 +
 .../2d.composite.canvas.source-over.html.ini  |    3 +
 .../2d.composite.canvas.xor.html.ini          |    3 +
 .../2d.composite.image.clear.html.ini         |    3 +
 .../2d.composite.image.copy.html.ini          |    3 +
 ....composite.image.destination-atop.html.ini |    3 +
 ...2d.composite.image.destination-in.html.ini |    3 +
 ...d.composite.image.destination-out.html.ini |    3 +
 ....composite.image.destination-over.html.ini |    3 +
 .../2d.composite.image.lighter.html.ini       |    3 +
 .../2d.composite.image.source-atop.html.ini   |    3 +
 .../2d.composite.image.source-in.html.ini     |    3 +
 .../2d.composite.image.source-out.html.ini    |    3 +
 .../2d.composite.image.source-over.html.ini   |    3 +
 .../2d.composite.image.xor.html.ini           |    3 +
 ...2d.composite.uncovered.image.copy.html.ini |    3 +
 ....uncovered.image.destination-atop.html.ini |    3 +
 ...te.uncovered.image.destination-in.html.ini |    3 +
 ...mposite.uncovered.image.source-in.html.ini |    3 +
 ...posite.uncovered.image.source-out.html.ini |    3 +
 ....composite.uncovered.pattern.copy.html.ini |    3 +
 ...ncovered.pattern.destination-atop.html.ini |    3 +
 ....uncovered.pattern.destination-in.html.ini |    3 +
 ...osite.uncovered.pattern.source-in.html.ini |    3 +
 ...site.uncovered.pattern.source-out.html.ini |    3 +
 ...ret-position-edge-cases.tentative.html.ini |    2 +
 ...re.caret-position-edges.tentative.html.ini |    2 +
 ....measure.caret-position.tentative.html.ini |    2 +
 ...ret-position-edge-cases.tentative.html.ini |    2 +
 ...osition-edge-cases.tentative.worker.js.ini |    2 +
 ...re.caret-position-edges.tentative.html.ini |    2 +
 ...ret-position-edges.tentative.worker.js.ini |    2 +
 ....measure.caret-position.tentative.html.ini |    2 +
 ...me-content-attribute-and-property.html.ini |   13 +-
 .../html/dom/idlharness.any.js.ini            |    3 +
 .../html/dom/idlharness.https.html.ini        |   72 +-
 .../html/dom/reflection-metadata.html.ini     |  228 --
 .../html/dom/reflection-misc.html.ini         |  114 -
 .../styling/LinkStyle.html.ini                |    4 -
 .../the-style-element/style_media.html.ini    |    5 -
 .../style_media_change.html.ini               |    8 -
 .../style_type_change.html.ini                |   11 -
 .../style_type_html.html.ini                  |    7 -
 ...tyle-block-ascii-case-insensitive.html.ini |    2 -
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...ct-value-selectedOption.tentative.html.ini |    2 +
 .../html/semantics/interfaces.html.ini        |    9 -
 .../invokers/idlharness.tentative.html.ini    |    2 +
 ...terestelement-interface.tentative.html.ini |    2 +
 ...invokeelement-interface.tentative.html.ini |    2 +
 ...ype-reset-popovertarget.tentative.html.ini |    2 -
 .../popover-css-properties.tentative.html.ini |  198 +-
 ...opover-types-with-hints.tentative.html.ini |    2 -
 .../test-navigation-type-reload.html.ini      |    9 -
 .../tentative/detached-frame.html.ini         |    2 -
 .../include-frames-originA-A-A.html.ini       |    2 -
 .../include-frames-originA-A.html.ini         |    2 -
 .../include-frames-originA-AA.html.ini        |    2 -
 .../include-frames-originA-AB.html.ini        |    2 -
 .../include-frames-originA-B-A.html.ini       |    2 -
 .../include-frames-originA-B-B.html.ini       |    2 -
 .../include-frames-originA-B.html.ini         |    2 -
 .../performance-entry-source.html.ini         |    2 -
 .../with-filter-options-originA.html.ini      |    2 -
 .../Extensions-to-Event-Interface.html.ini    |    6 -
 .../HTMLSlotElement-interface.html.ini        |   15 -
 .../shadow-dom/Slottable-mixin.html.ini       |    3 -
 .../shadow-dom/event-composed.html.ini        |    6 -
 .../shadow-dom/slots.html.ini                 |    9 -
 .../Worker/Worker-constructor.html.ini        |    2 +
 .../formdata/constructor-submitter.html.ini   |    9 -
 tests/wpt/meta/MANIFEST.json                  | 3263 ++++++++++++++---
 ...n-trigger-exit-range-end-computed.html.ini |   81 +
 ...tion-trigger-exit-range-end-valid.html.ini |   72 +
 ...tion-trigger-exit-range-shorthand.html.ini |  318 ++
 ...trigger-exit-range-start-computed.html.ini |   81 +
 ...on-trigger-exit-range-start-valid.html.ini |   75 +
 ...mation-trigger-range-end-computed.html.ini |   81 +
 ...animation-trigger-range-end-valid.html.ini |   72 +
 ...animation-trigger-range-shorthand.html.ini |  318 ++
 ...tion-trigger-range-start-computed.html.ini |   81 +
 ...imation-trigger-range-start-valid.html.ini |   75 +
 ...rigger-timeline-parsing.tentative.html.ini |  147 +
 ...n-trigger-type-computed.tentative.html.ini |    3 +
 ...tion-trigger-type-valid.tentative.html.ini |   21 +
 .../scroll-state-scrollable-body-001.html.ini |    2 +
 .../scroll-state-scrollable-body-002.html.ini |    2 +
 .../scroll-state-scrollable-root.html.ini     |    2 +
 .../font-weight-sign-function.html.ini        |    9 +
 .../css-mixins/at-function-parsing.html.ini   |  207 ++
 .../css-mixins/dashed-function-eval.html.ini  |  105 +
 .../scroll-buttons-valid.html.ini             |   15 +
 .../scroll-markers-computed.html.ini          |    0
 .../scroll-markers-valid.html.ini             |    0
 .../css-overflow/scroll-buttons-003.html.ini  |    2 +
 .../css-overflow/scroll-buttons-004.html.ini  |    2 +
 .../scroll-buttons-disabled-snapping.html.ini |    2 +
 ...table-cell-overflow-auto-scrolled.html.ini |    2 +
 ...ange-style-inherited-try-fallback.html.ini |    3 +
 .../after-change-style-inherited.html.ini     |    6 +
 ...ini => interactivity-inert-focus.html.ini} |    2 +-
 ...ractivity-inert-html-attribute-ua.html.ini |   12 +
 ...teractivity-inert-modal-dialog-ua.html.ini |   15 +
 ...ml.ini => interactivity-computed.html.ini} |    2 +-
 ...tative.html.ini => interactivity.html.ini} |    2 +-
 .../tentative/observable-from.any.js.ini      |   12 +
 .../new-window.tentative.https.window.js.ini  |   37 +-
 ...ute-redirect.tentative.https.window.js.ini |    6 +
 ...sions-policy.tentative.https.window.js.ini |    3 +
 .../quota.tentative.https.window.js.ini       |  102 -
 ...ized-payload.tentative.https.window.js.ini |    3 +
 ...ized-payload.tentative.https.window.js.ini |    3 +
 ...mpty-payload.tentative.https.window.js.ini |   19 +
 .../max-payload.tentative.https.window.js.ini |   13 +
 ...iple-iframes.tentative.https.window.js.ini |    3 +
 ...ized-payload.tentative.https.window.js.ini |   19 +
 ...mall-payload.tentative.https.window.js.ini |   19 +
 ...mpty-payload.tentative.https.window.js.ini |   25 +
 .../max-payload.tentative.https.window.js.ini |    6 +
 ...iple-origins.tentative.https.window.js.ini |   18 +
 ...ized-payload.tentative.https.window.js.ini |   18 +
 ...ized-payload.tentative.https.window.js.ini |    3 +
 ...mpty-payload.tentative.https.window.js.ini |   18 +
 .../max-payload.tentative.https.window.js.ini |    7 +
 ...iple-iframes.tentative.https.window.js.ini |    3 +
 ...ized-payload.tentative.https.window.js.ini |   19 +
 ...mall-payload.tentative.https.window.js.ini |   19 +
 ...mall-payload.tentative.https.window.js.ini |   18 +
 .../css-font-face.sub.tentative.html.ini      |    3 +
 .../empty-iframe-load-event.html.ini          |    6 -
 ...c-aboutblank-navigate-immediately.html.ini |    3 +
 ...tion-unload-cross-origin.sub.window.js.ini |    3 -
 .../2d.composite.canvas.clear.html.ini        |    3 +
 .../2d.composite.canvas.copy.html.ini         |    3 +
 ...composite.canvas.destination-atop.html.ini |    3 +
 ...d.composite.canvas.destination-in.html.ini |    3 +
 ....composite.canvas.destination-out.html.ini |    3 +
 ...composite.canvas.destination-over.html.ini |    3 +
 .../2d.composite.canvas.lighter.html.ini      |    3 +
 .../2d.composite.canvas.source-atop.html.ini  |    3 +
 .../2d.composite.canvas.source-in.html.ini    |    3 +
 .../2d.composite.canvas.source-out.html.ini   |    3 +
 .../2d.composite.canvas.source-over.html.ini  |    3 +
 .../2d.composite.canvas.xor.html.ini          |    3 +
 .../2d.composite.image.clear.html.ini         |    3 +
 .../2d.composite.image.copy.html.ini          |    3 +
 ....composite.image.destination-atop.html.ini |    3 +
 ...2d.composite.image.destination-in.html.ini |    3 +
 ...d.composite.image.destination-out.html.ini |    3 +
 ....composite.image.destination-over.html.ini |    3 +
 .../2d.composite.image.lighter.html.ini       |    3 +
 .../2d.composite.image.source-atop.html.ini   |    3 +
 .../2d.composite.image.source-in.html.ini     |    3 +
 .../2d.composite.image.source-out.html.ini    |    3 +
 .../2d.composite.image.source-over.html.ini   |    3 +
 .../2d.composite.image.xor.html.ini           |    3 +
 ...2d.composite.uncovered.image.copy.html.ini |    3 +
 ....uncovered.image.destination-atop.html.ini |    3 +
 ...te.uncovered.image.destination-in.html.ini |    3 +
 ...mposite.uncovered.image.source-in.html.ini |    3 +
 ...posite.uncovered.image.source-out.html.ini |    3 +
 ....composite.uncovered.pattern.copy.html.ini |    3 +
 ...ncovered.pattern.destination-atop.html.ini |    3 +
 ....uncovered.pattern.destination-in.html.ini |    3 +
 ...osite.uncovered.pattern.source-in.html.ini |    3 +
 ...site.uncovered.pattern.source-out.html.ini |    3 +
 .../createImageBitmap-transfer.html.ini       |    2 +-
 ...anvas.2d.direction.inherit.canvas.html.ini |    2 +
 ...ction.inherit.disconnected.canvas.html.ini |    2 +
 ...vas.2d.direction.inherit.document.html.ini |    2 +
 ...canvas.2d.direction.inherit.style.html.ini |    2 +
 .../text/canvas.2d.disconnected.html.ini      |    2 +
 .../canvas.2d.offscreen.direction.html.ini    |    2 +
 ...ferred.direction.inherit.document.html.ini |    2 +
 ...een.transferred.direction.inherit.html.ini |    2 +
 ...vas.2d.offscreen.worker.direction.html.ini |    2 +
 ...-subresource-corp.tentative.https.html.ini |   36 +
 tests/wpt/meta/html/dom/idlharness.any.js.ini |    3 +
 .../meta/html/dom/idlharness.https.html.ini   |    3 +
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 .../popover-css-properties.tentative.html.ini |  198 -
 .../idlharness.tentative.html.ini             |   54 +
 ...sttarget-css-properties.tentative.html.ini |  198 +
 ...on-getComposedRanges-range-update.html.ini |    2 +
 .../signatures/tentative/inline.html.ini      |   12 +
 .../webmessaging/without-ports/018.html.ini   |    4 -
 .../Worker/Worker-constructor.html.ini        |    2 +
 tests/wpt/tests/.github/workflows/docker.yml  |    2 +-
 .../wpt/tests/IndexedDB/idbfactory_cmp.any.js |   99 +
 tests/wpt/tests/IndexedDB/idbfactory_cmp.htm  |   21 -
 tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm |   41 -
 tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm |   27 -
 tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm |   40 -
 .../idbobjectstore-rename-abort.any.js        |  135 +
 .../idbobjectstore-rename-abort.html          |  120 -
 .../idbobjectstore-rename-errors.any.js       |  144 +
 .../idbobjectstore-rename-errors.html         |  121 -
 .../idbobjectstore-rename-store.any.js        |  435 +++
 .../idbobjectstore-rename-store.html          |  369 --
 ...saction-objectStore-exception-order.any.js |   23 +
 ...ansaction-objectStore-exception-order.html |   26 -
 ...dbtransaction-objectStore-finished.any.js} |   17 +-
 .../tests/IndexedDB/keypath-exceptions.any.js |  288 ++
 .../tests/IndexedDB/keypath-exceptions.htm    |  281 --
 .../keypath-special-identifiers.any.js        |   62 +
 .../IndexedDB/keypath-special-identifiers.htm |   66 -
 tests/wpt/tests/IndexedDB/keypath.any.js      |  138 +
 tests/wpt/tests/IndexedDB/keypath.htm         |  150 -
 .../tests/IndexedDB/keypath_invalid.any.js    |   69 +
 tests/wpt/tests/IndexedDB/keypath_invalid.htm |   65 -
 .../tests/IndexedDB/keypath_maxsize.any.js    |   78 +
 tests/wpt/tests/IndexedDB/keypath_maxsize.htm |   63 -
 .../IndexedDB/request-abort-ordering.any.js   |   85 +
 .../IndexedDB/request-abort-ordering.html     |   83 -
 ...ing.html => request-event-ordering.any.js} |  142 +-
 .../request_bubble-and-capture.any.js         |   70 +
 .../IndexedDB/request_bubble-and-capture.htm  |   69 -
 ...ranslator_translate.tentative.https.any.js |   15 +
 .../clear-site-data/clear-cache.https.html    |   10 +-
 ...ation-trigger-exit-range-end-computed.html |   37 +
 ...mation-trigger-exit-range-end-invalid.html |   21 +
 ...nimation-trigger-exit-range-end-valid.html |   33 +
 ...nimation-trigger-exit-range-shorthand.html |  180 +
 ...ion-trigger-exit-range-start-computed.html |   36 +
 ...tion-trigger-exit-range-start-invalid.html |   17 +
 ...mation-trigger-exit-range-start-valid.html |   34 +
 .../animation-trigger-range-end-computed.html |   37 +
 .../animation-trigger-range-end-invalid.html  |   21 +
 .../animation-trigger-range-end-valid.html    |   33 +
 .../animation-trigger-range-shorthand.html    |  180 +
 ...nimation-trigger-range-start-computed.html |   36 +
 ...animation-trigger-range-start-invalid.html |   17 +
 .../animation-trigger-range-start-valid.html  |   34 +
 ...on-trigger-timeline-parsing.tentative.html |   99 +
 ...ation-trigger-type-computed.tentative.html |   19 +
 ...mation-trigger-type-invalid.tentative.html |   22 +
 ...nimation-trigger-type-valid.tentative.html |   24 +
 .../scroll-state-scrollable-body-001.html     |   55 +
 .../scroll-state-scrollable-body-002.html     |   47 +
 .../scroll-state-scrollable-root.html         |   51 +
 .../css-fonts/font-weight-sign-function.html  |   18 +
 .../clip-path-interpolation-shape.html        |   24 +-
 .../css/css-mixins/at-function-parsing.html   |  109 +
 .../css/css-mixins/dashed-function-eval.html  |  496 +++
 .../css/css-multicol/getclientrects-002.html  |   31 +
 .../css/css-multicol/getclientrects-003.html  |   37 +
 .../css/css-multicol/getclientrects-004.html  |   37 +
 .../{parsing => }/scroll-buttons-invalid.html |    1 -
 .../{parsing => }/scroll-buttons-valid.html   |    5 +
 .../scroll-markers-computed.html              |    0
 .../{parsing => }/scroll-markers-invalid.html |    0
 .../{parsing => }/scroll-markers-valid.html   |    0
 .../scroll-button-hover-remove.html           |   57 +
 .../css/css-overflow/scroll-button-hover.html |   56 +
 .../css/css-overflow/scroll-buttons-003.html  |   19 +
 .../css/css-overflow/scroll-buttons-004.html  |   17 +
 .../scroll-buttons-disabled-snapping-ref.html |   82 +
 .../scroll-buttons-disabled-snapping.html     |   85 +
 .../scroll-marker-hover-logical.html          |   64 +
 .../scroll-marker-hover-remove.html           |   69 +
 .../css/css-overflow/scroll-marker-hover.html |   60 +
 ...sition-sticky-column-reverse-flex-ref.html |    5 +
 .../position-sticky-column-reverse-flex.html  |   37 +
 ...01.tentative.html => has-slotted-001.html} |    0
 ...02.tentative.html => has-slotted-002.html} |    0
 ...03.tentative.html => has-slotted-003.html} |    0
 ...ive.html => has-slotted-changing-001.html} |    0
 ...ive.html => has-slotted-changing-002.html} |    0
 ...ve.html => has-slotted-flattened-001.html} |    4 +-
 .../has-slotted-flattened-002.html            |   17 +
 .../has-slotted-flattened-002.tentative.html  |   22 -
 .../has-slotted-flattened-003.html            |   17 +
 .../has-slotted-flattened-003.tentative.html  |   25 -
 .../has-slotted-flattened-004.html            |   17 +
 .../has-slotted-manual-assignment.html        |   47 +
 .../has-slotted-query-selector.html           |   53 +
 ...r-change-style-inherited-try-fallback.html |   58 +
 .../after-change-style-inherited.html         |   68 +
 .../css-ui/interactivity-inert-click-002.html |   25 +
 ...ve.html => interactivity-inert-click.html} |    2 +-
 ...ve.html => interactivity-inert-focus.html} |    2 +-
 ...interactivity-inert-html-attribute-ua.html |   32 +
 .../interactivity-inert-modal-dialog-ua.html  |   51 +
 ...ative.html => interactivity-computed.html} |    2 +-
 ...vity.tentative.html => interactivity.html} |    2 +-
 .../pseudo-element-animations-rerun.html      |   36 +
 .../pseudo-element-animations.html            |  140 +-
 .../forms/input-range-block-size.html         |   39 +
 .../forms/input-range-inline-size.html        |   39 +
 .../input-range-zero-inline-size-ref.html     |   23 +
 .../forms/input-range-zero-inline-size.html   |   34 +
 ...ght-overflow-visible-negative-margins.html |   60 +
 tests/wpt/tests/digital-credentials/META.yml  |    1 +
 .../nodes/MutationObserver-textContent.html   |   76 +
 .../dom/observable/tentative/idlharness.html  |    2 +-
 .../tentative/observable-from.any.js          |  107 +-
 ...tive-brace-syntax-innerhtml.tentative.html |    2 +-
 ...rt-declarative-brace-syntax.tentative.html |    2 +-
 .../basic-dom-part-objects.tentative.html     |    2 +-
 ...-parts-parseparts-002-crash.tentative.html |    2 +-
 .../dom-parts-parseparts-crash.tentative.html |    2 +-
 ...om-parts-parseparts-on-body.tentative.html |    2 +-
 ...om-parts-parseparts-on-head.tentative.html |    2 +-
 ...om-parts-parseparts-on-root.tentative.html |    2 +-
 .../dom-parts-valid-node-types.tentative.html |    2 +-
 .../scripts/syntax-mediakeysession.js         |   15 +-
 .../iframe.tentative.https.window.js          |   24 -
 .../new-window.tentative.https.window.js      |   32 +-
 ...tribute-redirect.tentative.https.window.js |    9 +-
 ...rmissions-policy.tentative.https.window.js |   13 +-
 ...-by-permissions-policy.tentative.window.js |    1 +
 .../permissions-policy/resources/helper.js    |    5 +-
 .../quota.tentative.https.window.js           |  134 -
 .../tests/fetch/fetch-later/quota/README.md   |   10 +
 ...versized-payload.tentative.https.window.js |   63 +
 .../quota/cross-origin-iframe/README.md       |    9 +
 ...versized-payload.tentative.https.window.js |   56 +
 .../empty-payload.tentative.https.window.js   |   37 +
 .../max-payload.tentative.https.window.js     |  113 +
 ...multiple-iframes.tentative.https.window.js |   62 +
 ...versized-payload.tentative.https.window.js |   25 +
 .../small-payload.tentative.https.window.js   |   22 +
 .../empty-payload.tentative.https.window.js   |   37 +
 .../max-payload.tentative.https.window.js     |   48 +
 ...multiple-origins.tentative.https.window.js |   43 +
 ...versized-payload.tentative.https.window.js |   24 +
 .../fetch-later/quota/resources/helper.js     |   35 +
 .../quota/same-origin-iframe/README.md        |    9 +
 ...versized-payload.tentative.https.window.js |   55 +
 .../empty-payload.tentative.https.window.js   |   37 +
 .../max-payload.tentative.https.window.js     |   61 +
 ...multiple-iframes.tentative.https.window.js |   61 +
 ...versized-payload.tentative.https.window.js |   25 +
 .../small-payload.tentative.https.window.js   |   21 +
 .../small-payload.tentative.https.window.js   |   19 +
 .../resources/fetch-later-helper.js           |  308 ++
 .../fetch-later/resources/fetch-later.html    |   28 +-
 ...nterest-group-auction-data.https.window.js |  167 +
 .../resources/fledge_http_server_util.py      |    9 +
 .../trusted-scoring-signals.https.window.js   |  313 +-
 .../2d.composite.canvas.clear.html            |   18 +-
 .../compositing/2d.composite.canvas.copy.html |   18 +-
 .../2d.composite.canvas.destination-atop.html |   18 +-
 .../2d.composite.canvas.destination-in.html   |   18 +-
 .../2d.composite.canvas.destination-out.html  |   18 +-
 .../2d.composite.canvas.destination-over.html |   18 +-
 .../2d.composite.canvas.lighter.html          |   18 +-
 .../2d.composite.canvas.source-atop.html      |   18 +-
 .../2d.composite.canvas.source-in.html        |   18 +-
 .../2d.composite.canvas.source-out.html       |   18 +-
 .../2d.composite.canvas.source-over.html      |   18 +-
 .../compositing/2d.composite.canvas.xor.html  |   18 +-
 .../compositing/2d.composite.clip.clear.html  |    3 +-
 .../compositing/2d.composite.clip.copy.html   |    3 +-
 .../2d.composite.clip.destination-atop.html   |    3 +-
 .../2d.composite.clip.destination-in.html     |    3 +-
 .../2d.composite.clip.destination-out.html    |    3 +-
 .../2d.composite.clip.destination-over.html   |    3 +-
 .../2d.composite.clip.lighter.html            |    3 +-
 .../2d.composite.clip.source-atop.html        |    3 +-
 .../2d.composite.clip.source-in.html          |    3 +-
 .../2d.composite.clip.source-out.html         |    3 +-
 .../2d.composite.clip.source-over.html        |    3 +-
 .../compositing/2d.composite.clip.xor.html    |    3 +-
 .../compositing/2d.composite.image.clear.html |   14 +-
 .../compositing/2d.composite.image.copy.html  |   14 +-
 .../2d.composite.image.destination-atop.html  |   14 +-
 .../2d.composite.image.destination-in.html    |   14 +-
 .../2d.composite.image.destination-out.html   |   14 +-
 .../2d.composite.image.destination-over.html  |   14 +-
 .../2d.composite.image.lighter.html           |   14 +-
 .../2d.composite.image.source-atop.html       |   14 +-
 .../2d.composite.image.source-in.html         |   14 +-
 .../2d.composite.image.source-out.html        |   14 +-
 .../2d.composite.image.source-over.html       |   14 +-
 .../compositing/2d.composite.image.xor.html   |   14 +-
 .../2d.composite.uncovered.image.copy.html    |   15 +-
 ...site.uncovered.image.destination-atop.html |   15 +-
 ...posite.uncovered.image.destination-in.html |   15 +-
 ...d.composite.uncovered.image.source-in.html |   15 +-
 ....composite.uncovered.image.source-out.html |   15 +-
 .../2d.composite.uncovered.pattern.copy.html  |   14 +-
 ...te.uncovered.pattern.destination-atop.html |   14 +-
 ...site.uncovered.pattern.destination-in.html |   14 +-
 ...composite.uncovered.pattern.source-in.html |   14 +-
 ...omposite.uncovered.pattern.source-out.html |   14 +-
 .../manual/text/canvas.2d.direction-ref.html  |   24 +
 .../canvas.2d.direction.inherit.canvas.html   |   29 +
 ...direction.inherit.disconnected.canvas.html |   38 +
 .../canvas.2d.direction.inherit.document.html |   34 +
 .../canvas.2d.direction.inherit.style.html    |   33 +
 .../2d.composite.canvas.clear.html            |   41 +-
 .../2d.composite.canvas.clear.worker.js       |   42 +-
 .../compositing/2d.composite.canvas.copy.html |   41 +-
 .../2d.composite.canvas.copy.worker.js        |   42 +-
 .../2d.composite.canvas.destination-atop.html |   41 +-
 ...omposite.canvas.destination-atop.worker.js |   42 +-
 .../2d.composite.canvas.destination-in.html   |   41 +-
 ....composite.canvas.destination-in.worker.js |   42 +-
 .../2d.composite.canvas.destination-out.html  |   41 +-
 ...composite.canvas.destination-out.worker.js |   42 +-
 .../2d.composite.canvas.destination-over.html |   41 +-
 ...omposite.canvas.destination-over.worker.js |   42 +-
 .../2d.composite.canvas.lighter.html          |   41 +-
 .../2d.composite.canvas.lighter.worker.js     |   42 +-
 .../2d.composite.canvas.source-atop.html      |   41 +-
 .../2d.composite.canvas.source-atop.worker.js |   42 +-
 .../2d.composite.canvas.source-in.html        |   41 +-
 .../2d.composite.canvas.source-in.worker.js   |   42 +-
 .../2d.composite.canvas.source-out.html       |   41 +-
 .../2d.composite.canvas.source-out.worker.js  |   42 +-
 .../2d.composite.canvas.source-over.html      |   41 +-
 .../2d.composite.canvas.source-over.worker.js |   42 +-
 .../compositing/2d.composite.canvas.xor.html  |   41 +-
 .../2d.composite.canvas.xor.worker.js         |   42 +-
 .../compositing/2d.composite.clip.clear.html  |    3 +-
 .../2d.composite.clip.clear.worker.js         |    3 +-
 .../compositing/2d.composite.clip.copy.html   |    3 +-
 .../2d.composite.clip.copy.worker.js          |    3 +-
 .../2d.composite.clip.destination-atop.html   |    3 +-
 ....composite.clip.destination-atop.worker.js |    3 +-
 .../2d.composite.clip.destination-in.html     |    3 +-
 ...2d.composite.clip.destination-in.worker.js |    3 +-
 .../2d.composite.clip.destination-out.html    |    3 +-
 ...d.composite.clip.destination-out.worker.js |    3 +-
 .../2d.composite.clip.destination-over.html   |    3 +-
 ....composite.clip.destination-over.worker.js |    3 +-
 .../2d.composite.clip.lighter.html            |    3 +-
 .../2d.composite.clip.lighter.worker.js       |    3 +-
 .../2d.composite.clip.source-atop.html        |    3 +-
 .../2d.composite.clip.source-atop.worker.js   |    3 +-
 .../2d.composite.clip.source-in.html          |    3 +-
 .../2d.composite.clip.source-in.worker.js     |    3 +-
 .../2d.composite.clip.source-out.html         |    3 +-
 .../2d.composite.clip.source-out.worker.js    |    3 +-
 .../2d.composite.clip.source-over.html        |    3 +-
 .../2d.composite.clip.source-over.worker.js   |    3 +-
 .../compositing/2d.composite.clip.xor.html    |    3 +-
 .../2d.composite.clip.xor.worker.js           |    3 +-
 .../compositing/2d.composite.image.clear.html |   29 +-
 .../2d.composite.image.clear.worker.js        |   30 +-
 .../compositing/2d.composite.image.copy.html  |   29 +-
 .../2d.composite.image.copy.worker.js         |   30 +-
 .../2d.composite.image.destination-atop.html  |   29 +-
 ...composite.image.destination-atop.worker.js |   30 +-
 .../2d.composite.image.destination-in.html    |   29 +-
 ...d.composite.image.destination-in.worker.js |   30 +-
 .../2d.composite.image.destination-out.html   |   29 +-
 ....composite.image.destination-out.worker.js |   30 +-
 .../2d.composite.image.destination-over.html  |   29 +-
 ...composite.image.destination-over.worker.js |   30 +-
 .../2d.composite.image.lighter.html           |   29 +-
 .../2d.composite.image.lighter.worker.js      |   30 +-
 .../2d.composite.image.source-atop.html       |   29 +-
 .../2d.composite.image.source-atop.worker.js  |   30 +-
 .../2d.composite.image.source-in.html         |   29 +-
 .../2d.composite.image.source-in.worker.js    |   30 +-
 .../2d.composite.image.source-out.html        |   29 +-
 .../2d.composite.image.source-out.worker.js   |   30 +-
 .../2d.composite.image.source-over.html       |   29 +-
 .../2d.composite.image.source-over.worker.js  |   30 +-
 .../compositing/2d.composite.image.xor.html   |   29 +-
 .../2d.composite.image.xor.worker.js          |   30 +-
 .../2d.composite.uncovered.image.copy.html    |   30 +-
 ...d.composite.uncovered.image.copy.worker.js |   31 +-
 ...site.uncovered.image.destination-atop.html |   30 +-
 ...uncovered.image.destination-atop.worker.js |   31 +-
 ...posite.uncovered.image.destination-in.html |   30 +-
 ...e.uncovered.image.destination-in.worker.js |   31 +-
 ...d.composite.uncovered.image.source-in.html |   30 +-
 ...posite.uncovered.image.source-in.worker.js |   31 +-
 ....composite.uncovered.image.source-out.html |   30 +-
 ...osite.uncovered.image.source-out.worker.js |   31 +-
 .../2d.composite.uncovered.pattern.copy.html  |   31 +-
 ...composite.uncovered.pattern.copy.worker.js |   32 +-
 ...te.uncovered.pattern.destination-atop.html |   31 +-
 ...covered.pattern.destination-atop.worker.js |   32 +-
 ...site.uncovered.pattern.destination-in.html |   31 +-
 ...uncovered.pattern.destination-in.worker.js |   32 +-
 ...composite.uncovered.pattern.source-in.html |   31 +-
 ...site.uncovered.pattern.source-in.worker.js |   32 +-
 ...omposite.uncovered.pattern.source-out.html |   31 +-
 ...ite.uncovered.pattern.source-out.worker.js |   32 +-
 .../canvas.2d.offscreen.direction-ref.html    |   22 +
 .../text/canvas.2d.offscreen.direction.html   |   37 +
 ...ransferred.direction.inherit.document.html |   38 +
 ...fscreen.transferred.direction.inherit.html |   30 +
 .../canvas.2d.offscreen.worker.direction.html |   30 +
 .../manual/text/text-direction-worker.js      |    8 +
 .../tests/html/canvas/tools/gentestutils.py   |   35 +
 .../tests/html/canvas/tools/templates.yaml    |   25 +-
 .../html/canvas/tools/yaml/element/meta.yaml  |   38 +-
 .../canvas/tools/yaml/offscreen/meta.yaml     |  108 +-
 ...ting-subresource-corp.tentative.https.html |   54 +-
 .../resources/reporting-worker.js             |   19 +
 .../document-isolation-policy/resources/sw.js |   12 +
 .../dir-auto-dynamic-changes.window.js        |    2 +-
 ...cross-realm-callback-report-exception.html |    5 +
 ...-picker-hover-active-pseudo.tentative.html |  113 +
 .../dialog-popover-overlay-ref.html           |   15 +
 .../dialog-popover-overlay.html               |   33 +
 .../semantics/popovers/popover-focus-2.html   |   32 +
 .../popover-hover-hang.tentative.html         |   34 -
 .../popover-hover-hide-hide.tentative.html    |   21 -
 .../popover-hover-hide-hover.tentative.html   |   21 -
 .../popover-hover-hide-show.tentative.html    |   21 -
 .../popover-hover-hide-toggle.tentative.html  |   21 -
 ...popover-target-action-hover.tentative.html |  180 -
 .../resources/popover-hover-hide-common.js    |  139 -
 .../interest-target/idlharness.tentative.html |   21 +
 .../interestelement-interface.tentative.html  |   19 +-
 ...terestevent-dispatch-shadow.tentative.html |   17 +-
 .../interestevent-interface.tentative.html    |    4 +-
 ...arget-anchor-event-dispatch.tentative.html |   37 +-
 ...ttarget-area-event-dispatch.tentative.html |   13 +-
 ...interesttarget-basic-delays.tentative.html |   48 +
 ...arget-button-event-dispatch.tentative.html |   13 +-
 ...eresttarget-css-properties.tentative.html} |    6 +-
 .../interesttarget-hide-delay.tentative.html  |   89 +
 ...ttarget-on-popover-behavior.tentative.html |   10 +-
 .../interesttarget-show-delay.tentative.html  |  149 +
 ...target-svg-a-event-dispatch.tentative.html |   13 +-
 .../resources/invoker-utils.js                |   61 +
 tests/wpt/tests/interfaces/html.idl           |   13 +-
 .../interest-invokers.tentative.idl           |   15 +-
 tests/wpt/tests/interfaces/speech-api.idl     |   10 +
 tests/wpt/tests/interfaces/webgpu.idl         |    3 +
 .../tests/media-source/waiting-for-audio.html |  174 +
 ...notification-console-manual.tentative.html |   17 -
 ...notification-console-manual.tentative.html |   15 -
 .../tests/resources/chromium/webxr-test.js    |   12 +-
 ...html-safety.dat => sethtml-safety.sub.dat} |    9 +-
 .../sethtml-safety.tentative.html             |    4 +-
 ....dat => sethtml-tree-construction.sub.dat} |    0
 .../sethtml-tree-construction.tentative.html  |    2 +-
 ...-unsafety.dat => sethtml-unsafety.sub.dat} |    9 +-
 .../clip-path-with-view-timeline.html         |   55 +
 .../scroll-timelines/setting-effect.html      |   45 +
 ...ection-getComposedRanges-range-update.html |  190 +
 .../signatures/tentative/inline.html          |  162 +
 ...icyFactory-createPolicy-cspTests-none.html |   50 +-
 ...pePolicyFactory-createPolicy-cspTests.html |   54 +-
 ...require-trusted-types-for-report-only.html |   54 +-
 ...trusted-types-for-report-only.html.headers |    3 +-
 .../require-trusted-types-for.html            |   59 +-
 .../trusted-types/support/csp-violations.js   |   81 +
 .../trusted-types/support/resolve-spv.js      |    9 -
 ...d-types-eval-reporting-no-unsafe-eval.html |   87 +-
 ...sted-types-eval-reporting-report-only.html |   79 +-
 .../trusted-types-eval-reporting.html         |   63 +-
 .../trusted-types-report-only.html            |   80 +-
 .../trusted-types-report-only.html.headers    |    1 +
 .../trusted-types-reporting.html              |  337 +-
 .../trusted-types-source-file-path.html       |   36 +-
 .../trusted-types-svg-script-set-href.html    |   39 +-
 .../trusted-types-svg-script.html             |   45 +-
 .../wpt/tests/url/resources/urltestdata.json  |   15 +
 .../get-keyframe-fontsize-crash.html          |   21 +
 .../webcodecs/image-decoder.https.any.js      |   23 +-
 .../per-frame-qp-encoding.https.any.js        |    2 +-
 .../context_destroyed/context_destroyed.py    |   70 +-
 .../tests/bidi/input/set_files/files.py       |    6 +-
 .../tests/bidi/integration/navigation.py      |   16 +-
 .../tests/bidi/log/entry_added/stacktrace.py  |   33 +-
 .../webdriver/tests/bidi/network/__init__.py  |   18 +-
 .../network/auth_required/auth_required.py    |    4 +-
 .../before_request_sent.py                    |   22 +-
 .../bidi/network/fetch_error/fetch_error.py   |    4 +-
 .../response_completed/response_completed.py  |   28 +-
 .../response_started/response_started.py      |   22 +-
 .../bidi/session/subscribe/subscription_id.py |   15 +-
 .../tests/bidi/session/unsubscribe/invalid.py |   18 +
 .../bidi/session/unsubscribe/subscriptions.py |  243 ++
 .../arg_min_max.https.any.js                  | 1057 +++++-
 .../conformance_tests/pooling.https.any.js    |   47 +
 ...RTCRtpTransceiver-setCodecPreferences.html |   19 +
 ...h264-unidirectional-codec-offer.https.html |  130 +-
 621 files changed, 18766 insertions(+), 8474 deletions(-)
 delete mode 100644 tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/clipboard-apis/clipboard-item.https.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/clipboard-apis/data-transfer-file-list-change-reference-updates.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/clipboard-apis/idlharness.https.window.js.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/CSS2/tables/anonymous-table-box-width-001.xht.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-cascade/layer-media-toggle.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLStyleElement.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.clear.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.copy.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.xor.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media_change.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_change.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_html.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/select-value-selectedOption.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/invokers/idlharness.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/invokers/interestelement-interface.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/invokers/invokeelement-interface.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/popovers/button-type-reset-popovertarget.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-types-with-hints.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/detached-frame.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A-A.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AA.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AB.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-A.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-B.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/performance-entry-source.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/performance-timeline/tentative/with-filter-options-originA.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-computed.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-shorthand.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-computed.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-computed.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-valid.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html.ini
 create mode 100644 tests/wpt/meta/css/css-fonts/font-weight-sign-function.html.ini
 create mode 100644 tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
 create mode 100644 tests/wpt/meta/css/css-mixins/dashed-function-eval.html.ini
 rename tests/wpt/meta/css/css-overflow/parsing/{parsing => }/scroll-buttons-valid.html.ini (88%)
 rename tests/wpt/meta/css/css-overflow/parsing/{parsing => }/scroll-markers-computed.html.ini (100%)
 rename tests/wpt/meta/css/css-overflow/parsing/{parsing => }/scroll-markers-valid.html.ini (100%)
 create mode 100644 tests/wpt/meta/css/css-overflow/scroll-buttons-003.html.ini
 create mode 100644 tests/wpt/meta/css/css-overflow/scroll-buttons-004.html.ini
 create mode 100644 tests/wpt/meta/css/css-overflow/scroll-buttons-disabled-snapping.html.ini
 create mode 100644 tests/wpt/meta/css/css-tables/table-cell-overflow-auto-scrolled.html.ini
 create mode 100644 tests/wpt/meta/css/css-transitions/after-change-style-inherited-try-fallback.html.ini
 rename tests/wpt/meta/css/css-ui/{interactivity-inert-focus.tentative.html.ini => interactivity-inert-focus.html.ini} (51%)
 create mode 100644 tests/wpt/meta/css/css-ui/interactivity-inert-html-attribute-ua.html.ini
 create mode 100644 tests/wpt/meta/css/css-ui/interactivity-inert-modal-dialog-ua.html.ini
 rename tests/wpt/meta/css/css-ui/parsing/{interactivity-computed.tentative.html.ini => interactivity-computed.html.ini} (99%)
 rename tests/wpt/meta/css/css-ui/parsing/{interactivity.tentative.html.ini => interactivity.html.ini} (94%)
 delete mode 100644 tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/empty-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/max-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js.ini
 create mode 100644 tests/wpt/meta/fetch/fetch-later/quota/small-payload.tentative.https.window.js.ini
 delete mode 100644 tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
 delete mode 100644 tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.clear.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.copy.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.xor.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/popovers/popover-css-properties.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/the-button-element/interest-target/idlharness.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
 create mode 100644 tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
 create mode 100644 tests/wpt/meta/subresource-integrity/signatures/tentative/inline.html.ini
 delete mode 100644 tests/wpt/meta/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/tests/IndexedDB/idbfactory_cmp.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/idbfactory_cmp.htm
 delete mode 100644 tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm
 delete mode 100644 tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm
 delete mode 100644 tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm
 create mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html
 create mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html
 create mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html
 create mode 100644 tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html
 rename tests/wpt/tests/IndexedDB/{idbtransaction-objectStore-finished.html => idbtransaction-objectStore-finished.any.js} (51%)
 create mode 100644 tests/wpt/tests/IndexedDB/keypath-exceptions.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/keypath-exceptions.htm
 create mode 100644 tests/wpt/tests/IndexedDB/keypath-special-identifiers.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm
 create mode 100644 tests/wpt/tests/IndexedDB/keypath.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/keypath.htm
 create mode 100644 tests/wpt/tests/IndexedDB/keypath_invalid.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/keypath_invalid.htm
 create mode 100644 tests/wpt/tests/IndexedDB/keypath_maxsize.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/keypath_maxsize.htm
 create mode 100644 tests/wpt/tests/IndexedDB/request-abort-ordering.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/request-abort-ordering.html
 rename tests/wpt/tests/IndexedDB/{request-event-ordering.html => request-event-ordering.any.js} (75%)
 create mode 100644 tests/wpt/tests/IndexedDB/request_bubble-and-capture.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-computed.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-shorthand.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-computed.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-invalid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-computed.tentative.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-invalid.tentative.html
 create mode 100644 tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-valid.tentative.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html
 create mode 100644 tests/wpt/tests/css/css-fonts/font-weight-sign-function.html
 create mode 100644 tests/wpt/tests/css/css-mixins/at-function-parsing.html
 create mode 100644 tests/wpt/tests/css/css-mixins/dashed-function-eval.html
 create mode 100644 tests/wpt/tests/css/css-multicol/getclientrects-002.html
 create mode 100644 tests/wpt/tests/css/css-multicol/getclientrects-003.html
 create mode 100644 tests/wpt/tests/css/css-multicol/getclientrects-004.html
 rename tests/wpt/tests/css/css-overflow/parsing/{parsing => }/scroll-buttons-invalid.html (94%)
 rename tests/wpt/tests/css/css-overflow/parsing/{parsing => }/scroll-buttons-valid.html (87%)
 rename tests/wpt/tests/css/css-overflow/parsing/{parsing => }/scroll-markers-computed.html (100%)
 rename tests/wpt/tests/css/css-overflow/parsing/{parsing => }/scroll-markers-invalid.html (100%)
 rename tests/wpt/tests/css/css-overflow/parsing/{parsing => }/scroll-markers-valid.html (100%)
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-button-hover-remove.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-button-hover.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-buttons-003.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-buttons-004.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping-ref.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-marker-hover-logical.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-marker-hover-remove.html
 create mode 100644 tests/wpt/tests/css/css-overflow/scroll-marker-hover.html
 create mode 100644 tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex-ref.html
 create mode 100644 tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex.html
 rename tests/wpt/tests/css/css-scoping/{has-slotted-001.tentative.html => has-slotted-001.html} (100%)
 rename tests/wpt/tests/css/css-scoping/{has-slotted-002.tentative.html => has-slotted-002.html} (100%)
 rename tests/wpt/tests/css/css-scoping/{has-slotted-003.tentative.html => has-slotted-003.html} (100%)
 rename tests/wpt/tests/css/css-scoping/{has-slotted-changing-001.tentative.html => has-slotted-changing-001.html} (100%)
 rename tests/wpt/tests/css/css-scoping/{has-slotted-changing-002.tentative.html => has-slotted-changing-002.html} (100%)
 rename tests/wpt/tests/css/css-scoping/{has-slotted-flattened-001.tentative.html => has-slotted-flattened-001.html} (92%)
 create mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.html
 delete mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.tentative.html
 create mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.html
 delete mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.tentative.html
 create mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-flattened-004.html
 create mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-manual-assignment.html
 create mode 100644 tests/wpt/tests/css/css-scoping/has-slotted-query-selector.html
 create mode 100644 tests/wpt/tests/css/css-transitions/after-change-style-inherited-try-fallback.html
 create mode 100644 tests/wpt/tests/css/css-ui/interactivity-inert-click-002.html
 rename tests/wpt/tests/css/css-ui/{interactivity-inert-click.tentative.html => interactivity-inert-click.html} (91%)
 rename tests/wpt/tests/css/css-ui/{interactivity-inert-focus.tentative.html => interactivity-inert-focus.html} (89%)
 create mode 100644 tests/wpt/tests/css/css-ui/interactivity-inert-html-attribute-ua.html
 create mode 100644 tests/wpt/tests/css/css-ui/interactivity-inert-modal-dialog-ua.html
 rename tests/wpt/tests/css/css-ui/parsing/{interactivity-computed.tentative.html => interactivity-computed.html} (87%)
 rename tests/wpt/tests/css/css-ui/parsing/{interactivity.tentative.html => interactivity.html} (87%)
 create mode 100644 tests/wpt/tests/css/css-view-transitions/pseudo-element-animations-rerun.html
 create mode 100644 tests/wpt/tests/css/css-writing-modes/forms/input-range-block-size.html
 create mode 100644 tests/wpt/tests/css/css-writing-modes/forms/input-range-inline-size.html
 create mode 100644 tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size-ref.html
 create mode 100644 tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size.html
 create mode 100644 tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-negative-margins.html
 create mode 100644 tests/wpt/tests/dom/nodes/MutationObserver-textContent.html
 delete mode 100644 tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/README.md
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/README.md
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/empty-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/max-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/resources/helper.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/README.md
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/fetch/fetch-later/quota/small-payload.tentative.https.window.js
 create mode 100644 tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction-ref.html
 create mode 100644 tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html
 create mode 100644 tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html
 create mode 100644 tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html
 create mode 100644 tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/manual/text/text-direction-worker.js
 create mode 100644 tests/wpt/tests/html/document-isolation-policy/resources/reporting-worker.js
 create mode 100644 tests/wpt/tests/html/document-isolation-policy/resources/sw.js
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-picker-hover-active-pseudo.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-hover-hang.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js
 create mode 100644 tests/wpt/tests/html/semantics/the-button-element/interest-target/idlharness.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-basic-delays.tentative.html
 rename tests/wpt/tests/html/semantics/{popovers/popover-css-properties.tentative.html => the-button-element/interest-target/interesttarget-css-properties.tentative.html} (92%)
 create mode 100644 tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
 create mode 100644 tests/wpt/tests/media-source/waiting-for-audio.html
 delete mode 100644 tests/wpt/tests/resize-observer/resize-loop-cancel-error-notification-console-manual.tentative.html
 delete mode 100644 tests/wpt/tests/resize-observer/resize-loop-error-notification-console-manual.tentative.html
 rename tests/wpt/tests/sanitizer-api/{sethtml-safety.dat => sethtml-safety.sub.dat} (70%)
 rename tests/wpt/tests/sanitizer-api/{sethtml-tree-construction.dat => sethtml-tree-construction.sub.dat} (100%)
 rename tests/wpt/tests/sanitizer-api/{sethtml-unsafety.dat => sethtml-unsafety.sub.dat} (75%)
 create mode 100644 tests/wpt/tests/scroll-animations/crashtests/clip-path-with-view-timeline.html
 create mode 100644 tests/wpt/tests/scroll-animations/scroll-timelines/setting-effect.html
 create mode 100644 tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
 create mode 100644 tests/wpt/tests/subresource-integrity/signatures/tentative/inline.html
 create mode 100644 tests/wpt/tests/trusted-types/support/csp-violations.js
 delete mode 100644 tests/wpt/tests/trusted-types/support/resolve-spv.js
 create mode 100644 tests/wpt/tests/web-animations/crashtests/get-keyframe-fontsize-crash.html
 create mode 100644 tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/subscriptions.py

diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
deleted file mode 100644
index 575e16729cb..00000000000
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-partition-navigation.tentative.https.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
deleted file mode 100644
index 06d580aa061..00000000000
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-partition-worker-creation.tentative.https.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
deleted file mode 100644
index 5f8ed6cf262..00000000000
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-partition.tentative.https.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/clipboard-apis/clipboard-item.https.html.ini b/tests/wpt/meta-legacy-layout/clipboard-apis/clipboard-item.https.html.ini
new file mode 100644
index 00000000000..057b25ac030
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/clipboard-apis/clipboard-item.https.html.ini
@@ -0,0 +1,84 @@
+[clipboard-item.https.html]
+  [ClipboardItem({string, Blob}) succeeds with different types]
+    expected: FAIL
+
+  [ClipboardItem() succeeds with empty options]
+    expected: FAIL
+
+  [ClipboardItem({}) fails with empty dictionary input]
+    expected: FAIL
+
+  [ClipboardItem(Blob) fails]
+    expected: FAIL
+
+  [ClipboardItem() fails with null input]
+    expected: FAIL
+
+  [ClipboardItem() fails with no input]
+    expected: FAIL
+
+  [types() returns correct values]
+    expected: FAIL
+
+  [getType(DOMString valid type) succeeds with correct output]
+    expected: FAIL
+
+  [getType(DOMString invalid type) succeeds with correct output]
+    expected: FAIL
+
+  [getType(DOMString type) rejects correctly when querying for missing type]
+    expected: FAIL
+
+  [getType(DOMString valid type) converts DOMString to Blob]
+    expected: FAIL
+
+  [getType(DOMString invalid type) converts DOMString to Blob]
+    expected: FAIL
+
+  [supports(text/plain) returns true]
+    expected: FAIL
+
+  [supports(text/html) returns true]
+    expected: FAIL
+
+  [supports(image/png) returns true]
+    expected: FAIL
+
+  [supports(text/uri-list) returns true]
+    expected: FAIL
+
+  [supports(image/svg+xml) returns true]
+    expected: FAIL
+
+  [supports(web foo/bar) returns true]
+    expected: FAIL
+
+  [supports(web text/html) returns true]
+    expected: FAIL
+
+  [supports(web ) returns false]
+    expected: FAIL
+
+  [supports(web) returns false]
+    expected: FAIL
+
+  [supports(web foo) returns false]
+    expected: FAIL
+
+  [supports(foo/bar) returns false]
+    expected: FAIL
+
+  [supports(weB text/html) returns false]
+    expected: FAIL
+
+  [supports( web text/html) returns false]
+    expected: FAIL
+
+  [supports(not a/real type) returns false]
+    expected: FAIL
+
+  [supports() returns false]
+    expected: FAIL
+
+  [supports( ) returns false]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/clipboard-apis/data-transfer-file-list-change-reference-updates.html.ini b/tests/wpt/meta-legacy-layout/clipboard-apis/data-transfer-file-list-change-reference-updates.html.ini
new file mode 100644
index 00000000000..6e3f63a3715
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/clipboard-apis/data-transfer-file-list-change-reference-updates.html.ini
@@ -0,0 +1,3 @@
+[data-transfer-file-list-change-reference-updates.html]
+  [expect changed contents]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/clipboard-apis/idlharness.https.window.js.ini b/tests/wpt/meta-legacy-layout/clipboard-apis/idlharness.https.window.js.ini
new file mode 100644
index 00000000000..d16c54f589e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/clipboard-apis/idlharness.https.window.js.ini
@@ -0,0 +1,93 @@
+[idlharness.https.window.html]
+  [ClipboardItem interface: existence and properties of interface object]
+    expected: FAIL
+
+  [ClipboardItem interface object length]
+    expected: FAIL
+
+  [ClipboardItem interface object name]
+    expected: FAIL
+
+  [ClipboardItem interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [ClipboardItem interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [ClipboardItem interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [ClipboardItem interface: attribute presentationStyle]
+    expected: FAIL
+
+  [ClipboardItem interface: attribute types]
+    expected: FAIL
+
+  [ClipboardItem interface: operation getType(DOMString)]
+    expected: FAIL
+
+  [ClipboardItem interface: operation supports(DOMString)]
+    expected: FAIL
+
+  [Clipboard interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Clipboard interface object length]
+    expected: FAIL
+
+  [Clipboard interface object name]
+    expected: FAIL
+
+  [Clipboard interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Clipboard interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Clipboard interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Clipboard interface: operation read(optional ClipboardUnsanitizedFormats)]
+    expected: FAIL
+
+  [Clipboard interface: operation readText()]
+    expected: FAIL
+
+  [Clipboard interface: operation write(ClipboardItems)]
+    expected: FAIL
+
+  [Clipboard interface: operation writeText(DOMString)]
+    expected: FAIL
+
+  [Clipboard must be primary interface of navigator.clipboard]
+    expected: FAIL
+
+  [Stringification of navigator.clipboard]
+    expected: FAIL
+
+  [Clipboard interface: navigator.clipboard must inherit property "read(optional ClipboardUnsanitizedFormats)" with the proper type]
+    expected: FAIL
+
+  [Clipboard interface: calling read(optional ClipboardUnsanitizedFormats) on navigator.clipboard with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Clipboard interface: navigator.clipboard must inherit property "readText()" with the proper type]
+    expected: FAIL
+
+  [Clipboard interface: navigator.clipboard must inherit property "write(ClipboardItems)" with the proper type]
+    expected: FAIL
+
+  [Clipboard interface: calling write(ClipboardItems) on navigator.clipboard with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Clipboard interface: navigator.clipboard must inherit property "writeText(DOMString)" with the proper type]
+    expected: FAIL
+
+  [Clipboard interface: calling writeText(DOMString) on navigator.clipboard with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Navigator interface: attribute clipboard]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "clipboard" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/cors/cors-safelisted-request-header.any.js.ini b/tests/wpt/meta-legacy-layout/cors/cors-safelisted-request-header.any.js.ini
index aa613925264..ba2b322785f 100644
--- a/tests/wpt/meta-legacy-layout/cors/cors-safelisted-request-header.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/cors/cors-safelisted-request-header.any.js.ini
@@ -14,12 +14,6 @@
   [Preflight for {"content-type":"text/plain\\u000b"}]
     expected: FAIL
 
-  [No preflight for {"range":"bytes=100-200"}]
-    expected: FAIL
-
-  [No preflight for {"range":"bytes=200-"}]
-    expected: FAIL
-
 
 [cors-safelisted-request-header.any.html]
   [Preflight for {"content-type":"text/plain\\f"}]
@@ -36,9 +30,3 @@
 
   [Preflight for {"content-type":"text/plain\\u000b"}]
     expected: FAIL
-
-  [No preflight for {"range":"bytes=100-200"}]
-    expected: FAIL
-
-  [No preflight for {"range":"bytes=200-"}]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/tables/anonymous-table-box-width-001.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/tables/anonymous-table-box-width-001.xht.ini
deleted file mode 100644
index 527442d5aa2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/tables/anonymous-table-box-width-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[anonymous-table-box-width-001.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-cascade/layer-media-toggle.html.ini b/tests/wpt/meta-legacy-layout/css/css-cascade/layer-media-toggle.html.ini
deleted file mode 100644
index 3443a01ea54..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-cascade/layer-media-toggle.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[layer-media-toggle.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/font-display/font-display-preload.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/font-display/font-display-preload.html.ini
index e3d080a6d44..6f9ac1c935f 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/font-display/font-display-preload.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/font-display/font-display-preload.html.ini
@@ -1,3 +1,3 @@
 [font-display-preload.html]
   bug: https://github.com/servo/servo/issues/21566
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
deleted file mode 100644
index 062a58a6e3f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[the-check-pseudo-element.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
deleted file mode 100644
index a4c4197b59b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[the-select-arrow-pseudo-element.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
deleted file mode 100644
index 35256741d38..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/dynamic-available-size-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dynamic-available-size-iframe.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
new file mode 100644
index 00000000000..5c9d7ecf7ea
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
@@ -0,0 +1,2 @@
+[block-height-1.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
new file mode 100644
index 00000000000..8e53e770c55
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
@@ -0,0 +1,2 @@
+[block-height-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/interactivity-inert-focus.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/interactivity-inert-focus.tentative.html.ini
index e38d83a2896..80f1879f2bf 100644
--- a/tests/wpt/meta-legacy-layout/css/css-ui/interactivity-inert-focus.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/interactivity-inert-focus.tentative.html.ini
@@ -1,3 +1,2 @@
 [interactivity-inert-focus.tentative.html]
-  [Try focus inert input]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity-computed.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity-computed.tentative.html.ini
index 47e5e701f31..a2f58805782 100644
--- a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity-computed.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity-computed.tentative.html.ini
@@ -1,138 +1,2 @@
 [interactivity-computed.tentative.html]
-  [Property interactivity value 'auto']
-    expected: FAIL
-
-  [Property interactivity value 'inert']
-    expected: FAIL
-
-  [Property interactivity has initial value auto]
-    expected: FAIL
-
-  [Property interactivity inherits]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (0) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (0.3) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (0) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (0.3) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [CSS Animations: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (-0.3) should be [auto\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (0) should be [auto\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (0.3) should be [auto\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (0.5) should be [inert\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (0.6) should be [inert\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (1) should be [inert\]]
-    expected: FAIL
-
-  [Web Animations: property <interactivity> from [auto\] to [inert\] at (1.5) should be [inert\]]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity.tentative.html.ini
index 1684fcbd542..d1821eacb4d 100644
--- a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/interactivity.tentative.html.ini
@@ -1,18 +1,2 @@
 [interactivity.tentative.html]
-  [e.style['interactivity'\] = "auto" should set the property value]
-    expected: FAIL
-
-  [e.style['interactivity'\] = "inert" should set the property value]
-    expected: FAIL
-
-  [e.style['interactivity'\] = "initial" should set the property value]
-    expected: FAIL
-
-  [e.style['interactivity'\] = "inherit" should set the property value]
-    expected: FAIL
-
-  [e.style['interactivity'\] = "unset" should set the property value]
-    expected: FAIL
-
-  [e.style['interactivity'\] = "revert" should set the property value]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/medialist-interfaces-001.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/medialist-interfaces-001.html.ini
index ac84d3d0e00..2c08e0e6e22 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/medialist-interfaces-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/medialist-interfaces-001.html.ini
@@ -1,14 +1,4 @@
 [medialist-interfaces-001.html]
   type: testharness
-  [mediatest_medialist_serialize_element]
-    expected: FAIL
-
-  [mediatest_medialist_serialize_comma]
-    expected: FAIL
-
   [mediatest_medialist_serialize_lexicographical]
     expected: FAIL
-
-  [mediatest_medialist_serialize_order]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/mediaqueries/test_media_queries.html.ini b/tests/wpt/meta-legacy-layout/css/mediaqueries/test_media_queries.html.ini
index 584383088db..601d354bf7e 100644
--- a/tests/wpt/meta-legacy-layout/css/mediaqueries/test_media_queries.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/mediaqueries/test_media_queries.html.ini
@@ -314,9 +314,6 @@
   [subtest_198]
     expected: FAIL
 
-  [find_depth]
-    expected: FAIL
-
   [subtest_232]
     expected: FAIL
 
@@ -1595,33 +1592,12 @@
   [expression_should_not_be_parseable: device-height < -100000em]
     expected: FAIL
 
-  [should_not_apply: all and (width: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (width: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (width = ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (width = ${value - 1}px)]
-    expected: FAIL
-
   [should_not_apply: all and (min-width: ${value + 1}px)]
     expected: FAIL
 
-  [should_not_apply: all and (max-width: ${value - 1}px)]
-    expected: FAIL
-
   [should_not_apply: all and (min-width: ${Math.ceil(value/em_size) + 1}em)]
     expected: FAIL
 
-  [should_not_apply: all and (max-width: ${Math.floor(value/em_size) - 1}em)]
-    expected: FAIL
-
-  [should_not_apply: (width < ${value}px)]
-    expected: FAIL
-
   [should_not_apply: (width > ${value}px)]
     expected: FAIL
 
@@ -1631,150 +1607,12 @@
   [should_not_apply: (width >= ${value + 1}px)]
     expected: FAIL
 
-  [should_not_apply: (width < ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (width <= ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (height: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (height: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (height = ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (height = ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-height: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-height: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-height: ${Math.ceil(value/em_size) + 1}em)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-height: ${Math.floor(value/em_size) - 1}em)]
-    expected: FAIL
-
-  [should_not_apply: (height < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (height > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (height > ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (height >= ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (height < ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (height <= ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-width: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-width: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-width = ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-width = ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-device-width: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-device-width: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-device-width: ${Math.ceil(value/em_size) + 1}em)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-device-width: ${Math.floor(value/em_size) - 1}em)]
-    expected: FAIL
-
-  [should_not_apply: (device-width < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-width > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-width > ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-width >= ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-width < ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-width <= ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-height: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-height: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-height = ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (device-height = ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-device-height: ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-device-height: ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-device-height: ${Math.ceil(value/em_size) + 1}em)]
-    expected: FAIL
-
-  [should_not_apply: all and (max-device-height: ${Math.floor(value/em_size) - 1}em)]
-    expected: FAIL
-
-  [should_not_apply: (device-height < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-height > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-height > ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-height >= ${value + 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-height < ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (device-height <= ${value - 1}px)]
-    expected: FAIL
-
   [width = 0, height != 0: should_not_apply: all and (width)]
     expected: FAIL
 
-  [width = 0, height = 0: should_not_apply: all and (height)]
-    expected: FAIL
-
   [width = 0, height = 0: should_not_apply: all and (width)]
     expected: FAIL
 
-  [width != 0, height = 0: should_not_apply: all and (height)]
-    expected: FAIL
-
   [ratio that reduces to 59/40: expression_should_not_be_parseable: min-orientation]
     expected: FAIL
 
@@ -1793,72 +1631,15 @@
   [ratio that reduces to 59/40: expression_should_not_be_parseable: max-orientation: landscape]
     expected: FAIL
 
-  [ratio that reduces to 59/40: should_not_apply: (orientation: portrait)]
-    expected: FAIL
-
-  [ratio that reduces to 59/80: should_not_apply: (orientation: landscape)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 58/80)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 59/81)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 60/80)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 59/79)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 5901/8000)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 5899/8000)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 5900/8001)]
-    expected: FAIL
-
-  [should_not_apply: (aspect-ratio: 5900/7999)]
-    expected: FAIL
-
-  [should_not_apply: (min-aspect-ratio: 60/80)]
-    expected: FAIL
-
-  [should_not_apply: (min-aspect-ratio: 59/79)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: min-aspect-ratio]
     expected: FAIL
 
-  [should_not_apply: (max-aspect-ratio: 58/80)]
-    expected: FAIL
-
-  [should_not_apply: (max-aspect-ratio: 59/81)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: max-aspect-ratio]
     expected: FAIL
 
-  [should_not_apply: all and (device-aspect-ratio: ${high_dar_2})]
-    expected: FAIL
-
-  [should_not_apply: all and (device-aspect-ratio: ${low_dar_1})]
-    expected: FAIL
-
-  [should_not_apply: all and (min-device-aspect-ratio: ${high_dar_1})]
-    expected: FAIL
-
-  [should_not_apply: not all and (min-device-aspect-ratio: ${low_dar_1})]
-    expected: FAIL
-
   [expression_should_not_be_parseable: min-device-aspect-ratio]
     expected: FAIL
 
-  [should_not_apply: all and (max-device-aspect-ratio: ${low_dar_1})]
-    expected: FAIL
-
   [expression_should_not_be_parseable: max-device-aspect-ratio]
     expected: FAIL
 
@@ -1955,12 +1736,6 @@
   [expression_should_not_be_parseable: max-color-index: 1/1]
     expected: FAIL
 
-  [should_not_apply: (color-index: 1)]
-    expected: FAIL
-
-  [should_not_apply: (min-color-index: 1)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: resolution: 0dpi]
     expected: FAIL
 
@@ -1997,21 +1772,6 @@
   [expression_should_not_be_parseable: max-resolution: 0x]
     expected: FAIL
 
-  [resolution is exact: should_not_apply: (resolution: ${resolution + 1}dpi)]
-    expected: FAIL
-
-  [resolution is exact: should_not_apply: (resolution: ${resolution - 1}dpi)]
-    expected: FAIL
-
-  [should_not_apply: not all and (min-resolution: ${dpi_low}dpi)]
-    expected: FAIL
-
-  [should_not_apply: all and (min-resolution: ${dpi_high}dpi)]
-    expected: FAIL
-
-  [should_not_apply: (max-resolution: ${dpcm_low}dpcm)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: min-scan:interlace]
     expected: FAIL
 
@@ -2024,15 +1784,6 @@
   [expression_should_not_be_parseable: max-scan: progressive]
     expected: FAIL
 
-  [should_not_apply: (scan)]
-    expected: FAIL
-
-  [should_not_apply: (scan: progressive)]
-    expected: FAIL
-
-  [should_not_apply: (scan: interlace)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: min-grid]
     expected: FAIL
 
@@ -2048,69 +1799,6 @@
   [expression_should_not_be_parseable: grid: -1]
     expected: FAIL
 
-  [should_not_apply: (grid)]
-    expected: FAIL
-
-  [should_not_apply: (grid: 1)]
-    expected: FAIL
-
-  [should_not_apply: (grid: 2)]
-    expected: FAIL
-
-  [should_not_apply: (grid: -1)]
-    expected: FAIL
-
-  [should_not_apply: not all and (orientation]
-    expected: FAIL
-
-  [should_not_apply: (orientation:]
-    expected: FAIL
-
-  [should_not_apply: (orientation:)]
-    expected: FAIL
-
-  [should_not_apply: (orientation:  )]
-    expected: FAIL
-
-  [should_not_apply: (orientation:,all]
-    expected: FAIL
-
-  [should_not_apply: only all and (grid]
-    expected: FAIL
-
-  [should_not_apply: (grid]
-    expected: FAIL
-
-  [should_not_apply: (grid,all]
-    expected: FAIL
-
-  [should_not_apply: ,badmedium,]
-    expected: FAIL
-
-  [should_not_apply: (badexpression),badmedium]
-    expected: FAIL
-
-  [should_not_apply: badmedium,(badexpression)]
-    expected: FAIL
-
-  [should_not_apply: badmedium,[badsyntax\]]
-    expected: FAIL
-
-  [should_not_apply: [badsyntax\],badmedium]
-    expected: FAIL
-
-  [should_not_apply: all and min-color : 1]
-    expected: FAIL
-
-  [should_not_apply: (bogus)]
-    expected: FAIL
-
-  [should_not_apply: not all and (bogus)]
-    expected: FAIL
-
-  [should_not_apply: only all and (bogus)]
-    expected: FAIL
-
   [expression_should_not_be_parseable: overflow-block: some-random-invalid-thing]
     expected: FAIL
 
@@ -2135,12 +1823,6 @@
   [(any-pointer) == not (any-pointer: none)]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width]
-    expected: FAIL
-
   [expression_should_be_parseable: width : -1px]
     expected: FAIL
 
@@ -2171,42 +1853,12 @@
   [expression_should_be_unknown: width : -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px : width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-width > -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width > -0]
-    expected: FAIL
-
   [expression_should_be_parseable: width > -1px]
     expected: FAIL
 
   [expression_should_be_unknown: width > -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width > -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width > -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: width > -0.00001mm]
     expected: FAIL
 
@@ -2219,39 +1871,12 @@
   [expression_should_be_unknown: width > -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px > width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-width >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: width > = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: width >= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: width >= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width >= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width >= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: width >= -0.00001mm]
     expected: FAIL
 
@@ -2264,39 +1889,12 @@
   [expression_should_be_unknown: width >= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px >= width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-width = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width = 100000px]
-    expected: FAIL
-
   [expression_should_be_parseable: width = -1px]
     expected: FAIL
 
   [expression_should_be_unknown: width = -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width = -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width = -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: width = -0.00001mm]
     expected: FAIL
 
@@ -2309,45 +1907,12 @@
   [expression_should_be_unknown: width = -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px = width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-width <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: width < = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: width <= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: width <= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width <= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width <= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: width <= -0.00001mm]
     expected: FAIL
 
@@ -2360,36 +1925,12 @@
   [expression_should_be_unknown: width <= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px <= width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-width < -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width < -0]
-    expected: FAIL
-
   [expression_should_be_parseable: width < -1px]
     expected: FAIL
 
   [expression_should_be_unknown: width < -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-width < -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-width < -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: width < -0.00001mm]
     expected: FAIL
 
@@ -2402,24 +1943,6 @@
   [expression_should_be_unknown: width < -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px < width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height]
-    expected: FAIL
-
   [expression_should_be_parseable: height : -1px]
     expected: FAIL
 
@@ -2450,42 +1973,12 @@
   [expression_should_be_unknown: height : -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px : height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height > -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height > -0]
-    expected: FAIL
-
   [expression_should_be_parseable: height > -1px]
     expected: FAIL
 
   [expression_should_be_unknown: height > -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-height > -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height > -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: height > -0.00001mm]
     expected: FAIL
 
@@ -2498,39 +1991,12 @@
   [expression_should_be_unknown: height > -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px > height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: height > = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: height >= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: height >= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-height >= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height >= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: height >= -0.00001mm]
     expected: FAIL
 
@@ -2543,39 +2009,12 @@
   [expression_should_be_unknown: height >= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px >= height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height = 100000px]
-    expected: FAIL
-
   [expression_should_be_parseable: height = -1px]
     expected: FAIL
 
   [expression_should_be_unknown: height = -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-height = -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height = -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: height = -0.00001mm]
     expected: FAIL
 
@@ -2588,45 +2027,12 @@
   [expression_should_be_unknown: height = -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px = height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: height < = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: height <= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: height <= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-height <= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height <= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: height <= -0.00001mm]
     expected: FAIL
 
@@ -2639,36 +2045,12 @@
   [expression_should_be_unknown: height <= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px <= height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-height < -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height < -0]
-    expected: FAIL
-
   [expression_should_be_parseable: height < -1px]
     expected: FAIL
 
   [expression_should_be_unknown: height < -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-height < -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-height < -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: height < -0.00001mm]
     expected: FAIL
 
@@ -2681,24 +2063,6 @@
   [expression_should_be_unknown: height < -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px < height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width : -1px]
     expected: FAIL
 
@@ -2729,42 +2093,12 @@
   [expression_should_be_unknown: device-width : -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px : device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width > -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width > -0]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width > -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-width > -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-width > -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width > -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width > -0.00001mm]
     expected: FAIL
 
@@ -2777,39 +2111,12 @@
   [expression_should_be_unknown: device-width > -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px > device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-width > = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width >= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-width >= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-width >= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width >= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width >= -0.00001mm]
     expected: FAIL
 
@@ -2822,39 +2129,12 @@
   [expression_should_be_unknown: device-width >= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px >= device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width = 100000px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width = -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-width = -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-width = -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width = -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width = -0.00001mm]
     expected: FAIL
 
@@ -2867,45 +2147,12 @@
   [expression_should_be_unknown: device-width = -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px = device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-width < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-width < = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width <= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-width <= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-width <= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width <= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width <= -0.00001mm]
     expected: FAIL
 
@@ -2918,36 +2165,12 @@
   [expression_should_be_unknown: device-width <= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px <= device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-width < -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width < -0]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width < -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-width < -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-width < -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-width < -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-width < -0.00001mm]
     expected: FAIL
 
@@ -2960,24 +2183,6 @@
   [expression_should_be_unknown: device-width < -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px < device-width : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-width > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-width >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-width = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height : -1px]
     expected: FAIL
 
@@ -3008,42 +2213,12 @@
   [expression_should_be_unknown: device-height : -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px : device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px : device-height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height > -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height > -0]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height > -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-height > -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-height > -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height > -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height > -0.00001mm]
     expected: FAIL
 
@@ -3056,39 +2231,12 @@
   [expression_should_be_unknown: device-height > -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px > device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px > device-height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height >= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-height > = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height >= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-height >= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-height >= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height >= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height >= -0.00001mm]
     expected: FAIL
 
@@ -3101,39 +2249,12 @@
   [expression_should_be_unknown: device-height >= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px >= device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px >= device-height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height = -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height = 100000px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height = -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-height = -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-height = -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height = -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height = -0.00001mm]
     expected: FAIL
 
@@ -3146,45 +2267,12 @@
   [expression_should_be_unknown: device-height = -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px = device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height <= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px = device-height < 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height <= -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-height < = 0px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height <= -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-height <= -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-height <= -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height <= -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height <= -0.00001mm]
     expected: FAIL
 
@@ -3197,36 +2285,12 @@
   [expression_should_be_unknown: device-height <= -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px <= device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px <= device-height = 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-height < -0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height < -0]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height < -1px]
     expected: FAIL
 
   [expression_should_be_unknown: device-height < -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: min-device-height < -1px]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-height < -1px]
-    expected: FAIL
-
   [expression_should_be_parseable: device-height < -0.00001mm]
     expected: FAIL
 
@@ -3239,213 +2303,30 @@
   [expression_should_be_unknown: device-height < -100000em]
     expected: FAIL
 
-  [expression_should_be_unknown: 0px < device-height : 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-height > 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-height >= 0px]
-    expected: FAIL
-
-  [expression_should_be_unknown: 0px < device-height = 0px]
-    expected: FAIL
-
-  [should_not_apply: (0px < width < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > width > 0px)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px > width)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px >= width)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > width > ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value + 1}px > width > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (0px < height < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > height > 0px)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px > height)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px >= height)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > height > ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value + 1}px > height > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (0px < device-width < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > device-width > 0px)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px > device-width)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px >= device-width)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > device-width > ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value + 1}px > device-width > ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (0px < device-height < ${value}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > device-height > 0px)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px > device-height)]
-    expected: FAIL
-
-  [should_not_apply: (${value - 1}px >= device-height)]
-    expected: FAIL
-
-  [should_not_apply: (${value}px > device-height > ${value - 1}px)]
-    expected: FAIL
-
-  [should_not_apply: (${value + 1}px > device-height > ${value}px)]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: min-orientation]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: min-orientation: portrait]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: min-orientation: landscape]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: max-orientation]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: max-orientation: portrait]
-    expected: FAIL
-
-  [ratio that reduces to 59/40: expression_should_be_unknown: max-orientation: landscape]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-aspect-ratio]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-device-aspect-ratio]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-device-aspect-ratio]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: -1/1]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: 1/-1]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: -1/-1]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: 1 / invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-aspect-ratio: 1 invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: -1/1]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: 1/-1]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: -1/-1]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: 1 / invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: device-aspect-ratio: 1 invalid]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-color]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-color]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-monochrome]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-monochrome]
-    expected: FAIL
-
-  [expression_should_be_unknown: color: 1.0]
-    expected: FAIL
-
   [expression_should_be_parseable: color: -1]
     expected: FAIL
 
   [expression_should_be_unknown: color: -1]
     expected: FAIL
 
-  [expression_should_be_unknown: color: 1/1]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-monochrome: 1.0]
-    expected: FAIL
-
   [expression_should_be_parseable: min-monochrome: -1]
     expected: FAIL
 
   [expression_should_be_unknown: min-monochrome: -1]
     expected: FAIL
 
-  [expression_should_be_unknown: min-monochrome: 1/1]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-color-index: 1.0]
-    expected: FAIL
-
   [expression_should_be_parseable: max-color-index: -1]
     expected: FAIL
 
   [expression_should_be_unknown: max-color-index: -1]
     expected: FAIL
 
-  [expression_should_be_unknown: max-color-index: 1/1]
-    expected: FAIL
-
   [expression_should_be_parseable: resolution: 0dpi]
     expected: FAIL
 
   [expression_should_be_unknown: resolution: 0dpi]
     expected: FAIL
 
-  [expression_should_be_unknown: resolution: -3dpi]
-    expected: FAIL
-
   [expression_should_be_parseable: resolution: 0dppx]
     expected: FAIL
 
@@ -3464,9 +2345,6 @@
   [expression_should_be_unknown: min-resolution: 0dpi]
     expected: FAIL
 
-  [expression_should_be_unknown: min-resolution: -3dpi]
-    expected: FAIL
-
   [expression_should_be_parseable: min-resolution: 0dppx]
     expected: FAIL
 
@@ -3485,9 +2363,6 @@
   [expression_should_be_unknown: max-resolution: 0dpi]
     expected: FAIL
 
-  [expression_should_be_unknown: max-resolution: -3dpi]
-    expected: FAIL
-
   [expression_should_be_parseable: max-resolution: 0dppx]
     expected: FAIL
 
@@ -3500,101 +2375,1385 @@
   [expression_should_be_unknown: max-resolution: 0x]
     expected: FAIL
 
-  [expression_should_be_unknown: min-scan:interlace]
-    expected: FAIL
-
-  [expression_should_be_unknown: scan: 1]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-scan]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-scan: progressive]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-grid]
-    expected: FAIL
-
-  [expression_should_be_unknown: min-grid:0]
-    expected: FAIL
-
-  [expression_should_be_unknown: max-grid: 1]
-    expected: FAIL
-
-  [expression_should_be_unknown: grid: 2]
-    expected: FAIL
-
-  [expression_should_be_unknown: grid: -1]
-    expected: FAIL
-
-  [expression_should_be_unknown: overflow-block: some-random-invalid-thing]
-    expected: FAIL
-
-  [expression_should_be_unknown: overflow-inline: some-random-invalid-thing]
-    expected: FAIL
-
-  [expression_should_be_unknown: update: some-random-invalid-thing]
-    expected: FAIL
-
   [Sanity check for update]
     expected: FAIL
 
-  ['or' keyword: should_not_apply: (height) or (height)]
+  [expression_should_be_known: (orientation)]
     expected: FAIL
 
-  [nesting: should_not_apply: ((height))]
+  [expression_should_be_known: not (orientation)]
     expected: FAIL
 
-  ['not' keyword: should_not_apply: not (width)]
+  [expression_should_be_known: (orientation) and (orientation)]
     expected: FAIL
 
-  ['not' keyword: should_not_apply: not ((width) or (height))]
+  [expression_should_be_known: (orientation) or (orientation)]
     expected: FAIL
 
-  ['not' keyword: should_not_apply: not ((width) and (not (height)))]
+  [expression_should_be_known: (orientation) or ((orientation) and ((orientation) or (orientation) or (not (orientation))))]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: (unknown)]
+  [expression_should_be_known: height]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not (unknown)]
+  [expression_should_be_known: height : 0]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: ((unknown) and (width))]
+  [expression_should_be_known: height : 0px]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not ((unknown) and (width))]
+  [expression_should_be_known: height : 0em]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: ((unknown) and (height))]
+  [expression_should_be_known: height : -0]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not ((unknown) or (width))]
+  [expression_should_be_known: height : -0cm]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: ((unknown) or (height))]
+  [expression_should_be_known: height : 1px]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not ((unknown) or (height))]
+  [expression_should_be_known: height : 0.001mm]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: (width) and (not ((unknown) and (width)))]
+  [expression_should_be_known: height : 100000px]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: (width) and (not ((unknown) or (width)))]
+  [expression_should_be_known: min-height : -0]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: (width) and (not ((unknown) or (height)))]
+  [expression_should_be_known: max-height : -0]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: unknown(width)]
+  [expression_should_be_known: height : -1px]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not unknown(width)]
+  [expression_should_be_known: min-height : -1px]
     expected: FAIL
 
-  [three-valued logic: should_not_apply: not (unknown(width) or (height))]
+  [expression_should_be_known: max-height : -1px]
     expected: FAIL
 
-  [expression_should_be_unknown: overflow-block: optional-paged]
+  [expression_should_be_known: height : -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height : -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: height > 0]
+    expected: FAIL
+
+  [expression_should_be_known: height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height > 0em]
+    expected: FAIL
+
+  [expression_should_be_known: height > -0]
+    expected: FAIL
+
+  [expression_should_be_known: height > -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: height > 1px]
+    expected: FAIL
+
+  [expression_should_be_known: height > 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > height > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: height > -1px]
+    expected: FAIL
+
+  [expression_should_be_known: height > -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height > -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 0]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: height >= -0]
+    expected: FAIL
+
+  [expression_should_be_known: height >= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= height >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: height >= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: height >= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height >= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height = 0]
+    expected: FAIL
+
+  [expression_should_be_known: height = 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height = 0em]
+    expected: FAIL
+
+  [expression_should_be_known: height = -0]
+    expected: FAIL
+
+  [expression_should_be_known: height = -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: height = 1px]
+    expected: FAIL
+
+  [expression_should_be_known: height = 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height = 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: height = -1px]
+    expected: FAIL
+
+  [expression_should_be_known: height = -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height = -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 0]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: height <= -0]
+    expected: FAIL
+
+  [expression_should_be_known: height <= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= height <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: height <= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: height <= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height <= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= height < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height < 0]
+    expected: FAIL
+
+  [expression_should_be_known: height < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: height < 0em]
+    expected: FAIL
+
+  [expression_should_be_known: height < -0]
+    expected: FAIL
+
+  [expression_should_be_known: height < -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: height < 1px]
+    expected: FAIL
+
+  [expression_should_be_known: height < 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < height < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: height < -1px]
+    expected: FAIL
+
+  [expression_should_be_known: height < -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: height < -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < height < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: min-device-width : -0]
+    expected: FAIL
+
+  [expression_should_be_known: max-device-width : -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: min-device-width : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: max-device-width : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width : -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-width > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width > -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-width > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-width >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-width >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width >= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-width > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-width >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width = -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-width <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width <= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-width <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-width < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-width < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-width < -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-width <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-width < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: min-device-height : -0]
+    expected: FAIL
+
+  [expression_should_be_known: max-device-height : -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: min-device-height : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: max-device-height : -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height : -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-height > 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height > -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px > device-height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-height >= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height >= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-height > 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px >= device-height >= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height = -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-height <= 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height <= -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px <= device-height < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 0px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 0em]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < -0]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < -0cm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 0.001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-height < 100000px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < -1px]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < -0.00001mm]
+    expected: FAIL
+
+  [expression_should_be_known: device-height < -100000em]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-height <= 0px]
+    expected: FAIL
+
+  [expression_should_be_known: 0px < device-height < 0px]
+    expected: FAIL
+
+  [should_apply: all and (width: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (width = ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-width: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-width: ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-width: ${Math.ceil(value/em_size) + 1}em)]
+    expected: FAIL
+
+  [should_apply: (width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (0px < width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= width > 0px)]
+    expected: FAIL
+
+  [should_apply: (width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (width <= ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px <= width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > width > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > width >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= width > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (height = ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-height: ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-height: ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-height: ${Math.floor(value/em_size) - 1}em)]
+    expected: FAIL
+
+  [should_apply: all and (max-height: ${Math.ceil(value/em_size) + 1}em)]
+    expected: FAIL
+
+  [should_apply: (height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (height >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (0px < height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= height > 0px)]
+    expected: FAIL
+
+  [should_apply: (height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (height <= ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (height > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (height >= ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < height)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px <= height)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px <= height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > height > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > height >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= height > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (device-width: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (device-width = ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-width: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-width: ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-width: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-width: ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-width: ${Math.floor(value/em_size) - 1}em)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-width: ${Math.ceil(value/em_size) + 1}em)]
+    expected: FAIL
+
+  [should_apply: (device-width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (device-width >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (0px < device-width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= device-width > 0px)]
+    expected: FAIL
+
+  [should_apply: (device-width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-width <= ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-width > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-width >= ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-width)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px <= device-width)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-width <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px <= device-width < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > device-width > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > device-width >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= device-width > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (device-height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (device-height = ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-height: ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-height: ${value}px)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-height: ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: all and (min-device-height: ${Math.floor(value/em_size) - 1}em)]
+    expected: FAIL
+
+  [should_apply: all and (max-device-height: ${Math.ceil(value/em_size) + 1}em)]
+    expected: FAIL
+
+  [should_apply: (device-height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (device-height >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (0px < device-height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= device-height > 0px)]
+    expected: FAIL
+
+  [should_apply: (device-height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-height <= ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-height > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (device-height >= ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-height)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px <= device-height)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value - 1}px < device-height <= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px <= device-height < ${value + 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > device-height > ${value - 1}px)]
+    expected: FAIL
+
+  [should_apply: (${value + 1}px > device-height >= ${value}px)]
+    expected: FAIL
+
+  [should_apply: (${value}px >= device-height > ${value - 1}px)]
+    expected: FAIL
+
+  [width = 0, height != 0: should_apply: all and (height)]
+    expected: FAIL
+
+  [width = 0, height = 0: should_apply: all and (device-height)]
+    expected: FAIL
+
+  [width = 0, height = 0: should_apply: all and (device-width)]
+    expected: FAIL
+
+  [width != 0, height != 0: should_apply: all and (height)]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: expression_should_be_known: orientation]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: expression_should_be_known: orientation: portrait]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: expression_should_be_known: orientation: landscape]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: should_apply: (orientation)]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: should_apply: (orientation: landscape)]
+    expected: FAIL
+
+  [ratio that reduces to 59/40: should_apply: not all and (orientation: portrait)]
+    expected: FAIL
+
+  [ratio that reduces to 59/80: should_apply: (orientation)]
+    expected: FAIL
+
+  [ratio that reduces to 59/80: should_apply: not all and (orientation: landscape)]
+    expected: FAIL
+
+  [ratio that reduces to 59/80: should_apply: (orientation: portrait)]
+    expected: FAIL
+
+  [should_apply: (aspect-ratio: 59/80)]
+    expected: FAIL
+
+  [should_apply: (aspect-ratio: 177/240)]
+    expected: FAIL
+
+  [should_apply: (aspect-ratio: 413/560)]
+    expected: FAIL
+
+  [should_apply: (aspect-ratio: 5900/8000)]
+    expected: FAIL
+
+  [should_apply: (aspect-ratio)]
+    expected: FAIL
+
+  [should_apply: (min-aspect-ratio: 59/80)]
+    expected: FAIL
+
+  [should_apply: (min-aspect-ratio: 58/80)]
+    expected: FAIL
+
+  [should_apply: (min-aspect-ratio: 59/81)]
+    expected: FAIL
+
+  [should_apply: (max-aspect-ratio: 59/80)]
+    expected: FAIL
+
+  [should_apply: (max-aspect-ratio: 60/80)]
+    expected: FAIL
+
+  [should_apply: (max-aspect-ratio: 59/79)]
+    expected: FAIL
+
+  [should_apply: (device-aspect-ratio: ${real_dar})]
+    expected: FAIL
+
+  [should_apply: not all and (device-aspect-ratio: ${high_dar_1})]
+    expected: FAIL
+
+  [should_apply: not all and (device-aspect-ratio: ${low_dar_2})]
+    expected: FAIL
+
+  [should_apply: (device-aspect-ratio)]
+    expected: FAIL
+
+  [should_apply: (min-device-aspect-ratio: ${real_dar})]
+    expected: FAIL
+
+  [should_apply: not all and (min-device-aspect-ratio: ${high_dar_2})]
+    expected: FAIL
+
+  [should_apply: all and (min-device-aspect-ratio: ${low_dar_2})]
+    expected: FAIL
+
+  [should_apply: all and (max-device-aspect-ratio: ${real_dar})]
+    expected: FAIL
+
+  [should_apply: (max-device-aspect-ratio: ${high_dar_1})]
+    expected: FAIL
+
+  [should_apply: (max-device-aspect-ratio: ${high_dar_2})]
+    expected: FAIL
+
+  [should_apply: not all and (max-device-aspect-ratio: ${low_dar_2})]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1/1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1  /1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1  / \t\n1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1/\r1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 0.5]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1.0/1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1/1.0]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1.0/1.0]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 0/1]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 1/0]
+    expected: FAIL
+
+  [expression_should_be_known: max-aspect-ratio: 0/0]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1/1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1  /1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1  / \t\n1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1/\r1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 0.5]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1.0/1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1/1.0]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1.0/1.0]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 0/1]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 1/0]
+    expected: FAIL
+
+  [expression_should_be_known: device-aspect-ratio: 0/0]
+    expected: FAIL
+
+  [should_apply: all and (monochrome:0)]
+    expected: FAIL
+
+  [should_apply: all and (max-monochrome:0)]
+    expected: FAIL
+
+  [should_apply: all and (max-monochrome:1)]
+    expected: FAIL
+
+  [should_apply: all and (monochrome)]
+    expected: FAIL
+
+  [should_apply: not all and (color)]
+    expected: FAIL
+
+  [should_apply: only all and (monochrome)]
+    expected: FAIL
+
+  [expression_should_be_known: color: 1]
+    expected: FAIL
+
+  [expression_should_be_known: color: 327]
+    expected: FAIL
+
+  [expression_should_be_known: color: 0]
+    expected: FAIL
+
+  [expression_should_be_known: color: -1]
+    expected: FAIL
+
+  [expression_should_be_known: min-monochrome: 1]
+    expected: FAIL
+
+  [expression_should_be_known: min-monochrome: 327]
+    expected: FAIL
+
+  [expression_should_be_known: min-monochrome: 0]
+    expected: FAIL
+
+  [expression_should_be_known: min-monochrome: -1]
+    expected: FAIL
+
+  [expression_should_be_known: max-color-index: 1]
+    expected: FAIL
+
+  [expression_should_be_known: max-color-index: 327]
+    expected: FAIL
+
+  [expression_should_be_known: max-color-index: 0]
+    expected: FAIL
+
+  [expression_should_be_known: max-color-index: -1]
+    expected: FAIL
+
+  [should_apply: (color-index: 0)]
+    expected: FAIL
+
+  [should_apply: (min-color-index: 0)]
+    expected: FAIL
+
+  [should_apply: (max-color-index: 0)]
+    expected: FAIL
+
+  [should_apply: (max-color-index: 1)]
+    expected: FAIL
+
+  [should_apply: (max-color-index: 157)]
+    expected: FAIL
+
+  [expression_should_be_known: grid]
+    expected: FAIL
+
+  [expression_should_be_known: grid: 0]
+    expected: FAIL
+
+  [expression_should_be_known: grid: 1]
+    expected: FAIL
+
+  [should_apply: (grid: 0)]
+    expected: FAIL
+
+  [should_apply: (orientation]
+    expected: FAIL
+
+  [should_apply: not all and (grid]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-block]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-block: none]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-block: paged]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-block: scroll]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-inline]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-inline: none]
+    expected: FAIL
+
+  [expression_should_be_known: overflow-inline: scroll]
+    expected: FAIL
+
+  [expression_should_be_known: update]
+    expected: FAIL
+
+  [expression_should_be_known: update: none]
+    expected: FAIL
+
+  [expression_should_be_known: update: slow]
+    expected: FAIL
+
+  [expression_should_be_known: update: fast]
+    expected: FAIL
+
+  [expression_should_be_known: hover]
+    expected: FAIL
+
+  [expression_should_be_known: hover: hover]
+    expected: FAIL
+
+  [expression_should_be_known: hover: none]
+    expected: FAIL
+
+  [expression_should_be_known: any-hover]
+    expected: FAIL
+
+  [expression_should_be_known: any-hover: hover]
+    expected: FAIL
+
+  [expression_should_be_known: any-hover: none]
+    expected: FAIL
+
+  [expression_should_be_known: pointer]
+    expected: FAIL
+
+  [expression_should_be_known: pointer: coarse]
+    expected: FAIL
+
+  [expression_should_be_known: pointer: fine]
+    expected: FAIL
+
+  [expression_should_be_known: pointer: none]
+    expected: FAIL
+
+  [expression_should_be_known: any-pointer]
+    expected: FAIL
+
+  [expression_should_be_known: any-pointer: coarse]
+    expected: FAIL
+
+  [expression_should_be_known: any-pointer: fine]
+    expected: FAIL
+
+  [expression_should_be_known: any-pointer: none]
+    expected: FAIL
+
+  ['not' keyword: should_apply: not (height)]
+    expected: FAIL
+
+  ['not' keyword: should_apply: not ((width) and (height))]
+    expected: FAIL
+
+  [three-valued logic: should_apply: not ((unknown) and (height))]
+    expected: FAIL
+
+  [three-valued logic: should_apply: (width) and (not ((unknown) and (height)))]
+    expected: FAIL
+
+  [three-valued logic: should_apply: not (unknown(width) and (height))]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/custom-elements/builtin-coverage.html.ini b/tests/wpt/meta-legacy-layout/custom-elements/builtin-coverage.html.ini
index f38739eefec..668bdfa93bf 100644
--- a/tests/wpt/meta-legacy-layout/custom-elements/builtin-coverage.html.ini
+++ b/tests/wpt/meta-legacy-layout/custom-elements/builtin-coverage.html.ini
@@ -1,5 +1,4 @@
 [builtin-coverage.html]
-
   [Untitled]
     expected: FAIL
 
@@ -8,221 +7,333 @@
 
   [a: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [abbr: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [address: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [area: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [article: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [aside: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [audio: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [b: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [base: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [bdi: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [bdo: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [blockquote: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [body: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [br: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [button: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [canvas: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [caption: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [cite: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [code: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [col: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [colgroup: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [data: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [datalist: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [dd: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [del: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [details: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [dfn: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [dialog: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [div: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [dl: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [dt: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [em: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [embed: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [fieldset: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [figcaption: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [figure: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [footer: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [form: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h1: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h2: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h3: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h4: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h5: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [h6: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [header: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [hgroup: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [hr: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [html: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [i: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [iframe: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [img: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [input: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [ins: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [kbd: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [label: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [legend: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [li: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [link: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [main: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [map: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [mark: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [menu: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [meta: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [meter: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [nav: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [noscript: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [object: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [ol: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [optgroup: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [option: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [output: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [p: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [param: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [picture: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [pre: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [progress: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [q: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [rp: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [rt: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [ruby: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [s: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [samp: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [script: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [section: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [select: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [small: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [source: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [span: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [strong: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [style: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [sub: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [summary: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [sup: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [table: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [tbody: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [td: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [template: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [textarea: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [tfoot: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [th: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [thead: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [time: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [title: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [tr: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [track: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [u: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [ul: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [var: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [video: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
   [wbr: Operator 'new' should instantiate a customized built-in element]
     expected: FAIL
+
+  [slot: Define a customized built-in element]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLSlotElement.html.ini b/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLSlotElement.html.ini
index 06f319e7a49..c6223bd8ced 100644
--- a/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLSlotElement.html.ini
+++ b/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLSlotElement.html.ini
@@ -1,2 +1,6 @@
 [HTMLSlotElement.html]
-  expected: ERROR
+  [name on HTMLSlotElement must enqueue an attributeChanged reaction when adding name content attribute]
+    expected: FAIL
+
+  [name on HTMLSlotElement must enqueue an attributeChanged reaction when replacing an existing attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLStyleElement.html.ini b/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLStyleElement.html.ini
deleted file mode 100644
index 49c92ee6498..00000000000
--- a/tests/wpt/meta-legacy-layout/custom-elements/reactions/customized-builtins/HTMLStyleElement.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[HTMLStyleElement.html]
-  [media on HTMLStyleElement must enqueue an attributeChanged reaction when adding a new attribute]
-    expected: FAIL
-
-  [media on HTMLStyleElement must enqueue an attributeChanged reaction when replacing an existing attribute]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini b/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
index 31dfb6b786c..cc858b05dbf 100644
--- a/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/idlharness.any.js.ini
@@ -2,9 +2,6 @@
   [AbortController interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [Event interface: new Event("foo") must inherit property "composed" with the proper type]
-    expected: FAIL
-
   [EventTarget interface: new AbortController().signal must inherit property "addEventListener(DOMString, EventListener, [object Object\],[object Object\])" with the proper type]
     expected: FAIL
 
@@ -14,9 +11,6 @@
   [AbortController interface object name]
     expected: FAIL
 
-  [Event interface: attribute composed]
-    expected: FAIL
-
   [AbortSignal interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -50,9 +44,6 @@
   [AbortSignal interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [Event interface: new CustomEvent("foo") must inherit property "composed" with the proper type]
-    expected: FAIL
-
   [Stringification of new AbortController()]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini b/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
index 4ec5cc726fe..1eb7170480d 100644
--- a/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
@@ -2,27 +2,15 @@
   [EventTarget interface: new AbortController().signal must inherit property "addEventListener(DOMString, EventListener, [object Object\],[object Object\])" with the proper type]
     expected: FAIL
 
-  [Text interface: document.createTextNode("abc") must inherit property "assignedSlot" with the proper type]
-    expected: FAIL
-
   [AbortSignal must be primary interface of new AbortController().signal]
     expected: FAIL
 
-  [Element interface: element must inherit property "assignedSlot" with the proper type]
-    expected: FAIL
-
   [AbortController interface object name]
     expected: FAIL
 
-  [Event interface: attribute composed]
-    expected: FAIL
-
   [Element interface: operation after([object Object\],[object Object\])]
     expected: FAIL
 
-  [Text interface: attribute assignedSlot]
-    expected: FAIL
-
   [AbortSignal interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -53,9 +41,6 @@
   [AbortSignal interface object name]
     expected: FAIL
 
-  [Event interface: new CustomEvent("foo") must inherit property "composed" with the proper type]
-    expected: FAIL
-
   [Element interface: operation attachShadow(ShadowRootInit)]
     expected: FAIL
 
@@ -167,15 +152,9 @@
   [AbortSignal interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [Event interface: new Event("foo") must inherit property "composed" with the proper type]
-    expected: FAIL
-
   [NodeFilter interface: existence and properties of interface object]
     expected: FAIL
 
-  [Element interface: attribute assignedSlot]
-    expected: FAIL
-
   [Element interface: operation remove()]
     expected: FAIL
 
@@ -197,9 +176,6 @@
   [CharacterData interface: operation after([object Object\],[object Object\])]
     expected: FAIL
 
-  [Event interface: document.createEvent("Event") must inherit property "composed" with the proper type]
-    expected: FAIL
-
   [DocumentType interface: operation remove()]
     expected: FAIL
 
@@ -608,9 +584,6 @@
   [ShadowRoot interface: attribute delegatesFocus]
     expected: FAIL
 
-  [ShadowRoot interface: attribute slotAssignment]
-    expected: FAIL
-
   [XSLTProcessor interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
index 61c60d87a46..684e7b1aefc 100644
--- a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-from.any.js.ini
@@ -134,6 +134,12 @@
   [from(): Abort after complete does NOT call IteratorRecord#return()]
     expected: FAIL
 
+  [from(): [Symbol.iterator\] not callable AFTER SUBSCRIBE throws]
+    expected: FAIL
+
+  [from(): [Symbol.iterator\] returns null AFTER SUBSCRIBE throws]
+    expected: FAIL
+
 
 [observable-from.any.worker.html]
   [from(): Observable.from() is a function]
@@ -270,3 +276,9 @@
 
   [from(): Abort after complete does NOT call IteratorRecord#return()]
     expected: FAIL
+
+  [from(): [Symbol.iterator\] not callable AFTER SUBSCRIBE throws]
+    expected: FAIL
+
+  [from(): [Symbol.iterator\] returns null AFTER SUBSCRIBE throws]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/new-window.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/new-window.tentative.https.window.js.ini
index da97254b909..f98bae8eaa9 100644
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/new-window.tentative.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/new-window.tentative.https.window.js.ini
@@ -1,5 +1,4 @@
 [new-window.tentative.https.window.html]
-  expected: TIMEOUT
   [A blank window[target=''\][features='0'\] can trigger fetchLater.]
     expected: FAIL
 
@@ -53,3 +52,39 @@
 
   [A cross-origin window[target='_blank'\][features='2'\] can trigger fetchLater.]
     expected: TIMEOUT
+
+  [A blank window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
index f3cd0733134..494514918ce 100644
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
@@ -7,3 +7,9 @@
 
   [Permissions policy allow="deferred-fetch" allows cross-origin navigation in an iframe.]
     expected: FAIL
+
+  [Permissions policy allow="deferred-fetch" allows fetchLater() from a redirected same-origin iframe.]
+    expected: FAIL
+
+  [Permissions policy allow="deferred-fetch" disallows fetchLater() from a redirected cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
index a6ffb5ee65a..babbbad4b4b 100644
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
@@ -7,3 +7,6 @@
 
   [Default "deferred-fetch" permissions policy ["self"\] allows fetchLater() in the cross-origin iframe.]
     expected: FAIL
+
+  [Default "deferred-fetch-minimal" permissions policy ["*"\] allows fetchLater() in the cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini
index cbea9fe50e6..c27d071ac18 100644
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini
@@ -1,102 +1,2 @@
 [quota.tentative.https.window.html]
-  [A fetchLater() call accept small data in POST request of String.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of ArrayBuffer.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of FormData.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of URLSearchParams.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of Blob.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of File.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of String.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of File.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of String.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of FormData.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of URLSearchParams.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of File.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of File.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of File.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of File.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
index 0349b9df725..d4b40a4344f 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
@@ -71,14 +71,5 @@
   [sec-fetch-storage-access - source[srcset\] - Cross-site, no attributes]
     expected: FAIL
 
-  [sec-fetch-mode - source[srcset\] - attributes: crossorigin=use-credentials]
-    expected: FAIL
-
-  [sec-fetch-mode - img[srcset\] - attributes: crossorigin]
-    expected: FAIL
-
   [sec-fetch-mode - source[srcset\] - attributes: crossorigin=anonymous]
     expected: FAIL
-
-  [sec-fetch-mode - img[srcset\] - attributes: crossorigin=use-credentials]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/range/general.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/range/general.any.js.ini
index 2e2162d433b..f39f77bb768 100644
--- a/tests/wpt/meta-legacy-layout/fetch/range/general.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/range/general.any.js.ini
@@ -5,9 +5,6 @@
   [general]
     expected: FAIL
 
-  [Cross Origin Fetch with safe range header]
-    expected: FAIL
-
 
 [general.any.html]
   [Untitled]
@@ -16,9 +13,6 @@
   [general]
     expected: FAIL
 
-  [Cross Origin Fetch with safe range header]
-    expected: FAIL
-
 
 [general.any.sharedworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
index 6313c3e33dd..02a8e91ea04 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
@@ -4,3 +4,6 @@
 
   [link click]
     expected: FAIL
+
+  [form submission]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 5aef7ce66ce..324db3d9b35 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,6 +10,3 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
-
-  [load event does not fire on window.open('about:blank')]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
new file mode 100644
index 00000000000..4079a78d16a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.clear.html]
+  [Canvas test: 2d.composite.canvas.clear]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
new file mode 100644
index 00000000000..9b8a14aa5fe
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.copy.html]
+  [Canvas test: 2d.composite.canvas.copy]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
new file mode 100644
index 00000000000..20a2da80676
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-atop.html]
+  [Canvas test: 2d.composite.canvas.destination-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
new file mode 100644
index 00000000000..a1497f7d632
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-in.html]
+  [Canvas test: 2d.composite.canvas.destination-in]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
new file mode 100644
index 00000000000..bdab5db6d8a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-out.html]
+  [Canvas test: 2d.composite.canvas.destination-out]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
new file mode 100644
index 00000000000..2f0b128e4ba
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-over.html]
+  [Canvas test: 2d.composite.canvas.destination-over]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
new file mode 100644
index 00000000000..24212fa20b5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.lighter.html]
+  [Canvas test: 2d.composite.canvas.lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
new file mode 100644
index 00000000000..26b52ce07b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-atop.html]
+  [Canvas test: 2d.composite.canvas.source-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
new file mode 100644
index 00000000000..cda30c11767
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-in.html]
+  [Canvas test: 2d.composite.canvas.source-in]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
new file mode 100644
index 00000000000..57e22a58425
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-out.html]
+  [Canvas test: 2d.composite.canvas.source-out]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
new file mode 100644
index 00000000000..3e5313ea490
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-over.html]
+  [Canvas test: 2d.composite.canvas.source-over]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
new file mode 100644
index 00000000000..d790a042936
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.xor.html]
+  [Canvas test: 2d.composite.canvas.xor]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.clear.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.clear.html.ini
new file mode 100644
index 00000000000..302cddc7b78
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.clear.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.clear.html]
+  [Canvas test: 2d.composite.image.clear]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.copy.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.copy.html.ini
new file mode 100644
index 00000000000..610a0472170
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.copy.html]
+  [Canvas test: 2d.composite.image.copy]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
new file mode 100644
index 00000000000..38182bcd2f2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-atop.html]
+  [Canvas test: 2d.composite.image.destination-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
new file mode 100644
index 00000000000..a99c0937565
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-in.html]
+  [Canvas test: 2d.composite.image.destination-in]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
new file mode 100644
index 00000000000..532121882ce
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-out.html]
+  [Canvas test: 2d.composite.image.destination-out]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
new file mode 100644
index 00000000000..bf68e252e89
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-over.html]
+  [Canvas test: 2d.composite.image.destination-over]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.lighter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
new file mode 100644
index 00000000000..ac3f845a7cf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.lighter.html]
+  [Canvas test: 2d.composite.image.lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
new file mode 100644
index 00000000000..800305317cc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-atop.html]
+  [Canvas test: 2d.composite.image.source-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
new file mode 100644
index 00000000000..f3bac4acfdf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-in.html]
+  [Canvas test: 2d.composite.image.source-in]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
new file mode 100644
index 00000000000..e7996ef4a24
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-out.html]
+  [Canvas test: 2d.composite.image.source-out]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-over.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
new file mode 100644
index 00000000000..8b0ccbe6a7d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-over.html]
+  [Canvas test: 2d.composite.image.source-over]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.xor.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.xor.html.ini
new file mode 100644
index 00000000000..96070ad678d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.image.xor.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.xor.html]
+  [Canvas test: 2d.composite.image.xor]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
new file mode 100644
index 00000000000..2c46f0a0b9a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.copy.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
new file mode 100644
index 00000000000..a7acca01fa8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.destination-atop.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
new file mode 100644
index 00000000000..35b5db3cf46
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.destination-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
new file mode 100644
index 00000000000..42f259084ec
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.source-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
new file mode 100644
index 00000000000..c255d31caf8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.source-out.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
new file mode 100644
index 00000000000..5cebde631f0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.copy.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
new file mode 100644
index 00000000000..ae4eaab38cf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.destination-atop.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
new file mode 100644
index 00000000000..6b81c8a8f83
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.destination-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
new file mode 100644
index 00000000000..a776182d23e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.source-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
new file mode 100644
index 00000000000..cd9650f7534
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.source-out.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
new file mode 100644
index 00000000000..dc8137a3a4e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edge-cases.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
new file mode 100644
index 00000000000..c1d026a098f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edges.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
new file mode 100644
index 00000000000..51ffef6397a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
new file mode 100644
index 00000000000..dc8137a3a4e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edge-cases.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
new file mode 100644
index 00000000000..074dbcf4af4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edge-cases.tentative.worker.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
new file mode 100644
index 00000000000..c1d026a098f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edges.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
new file mode 100644
index 00000000000..0133a89a2ff
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position-edges.tentative.worker.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
new file mode 100644
index 00000000000..51ffef6397a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
@@ -0,0 +1,2 @@
+[2d.text.measure.caret-position.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/name-content-attribute-and-property.html.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/name-content-attribute-and-property.html.ini
index 13f6fd09fe8..a866b073e17 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/elements/name-content-attribute-and-property.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/elements/name-content-attribute-and-property.html.ini
@@ -1,18 +1,15 @@
 [name-content-attribute-and-property.html]
-  [embed element\'s name property reflects its content attribute]
+  [embed element's name property reflects its content attribute]
     expected: FAIL
 
-  [frame element\'s name property reflects its content attribute]
+  [frame element's name property reflects its content attribute]
     expected: FAIL
 
-  [map element\'s name property reflects its content attribute]
+  [map element's name property reflects its content attribute]
     expected: FAIL
 
-  [object element\'s name property reflects its content attribute]
+  [object element's name property reflects its content attribute]
     expected: FAIL
 
-  [param element\'s name property reflects its content attribute]
-    expected: FAIL
-
-  [slot element\'s name property reflects its content attribute]
+  [param element's name property reflects its content attribute]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/dom/idlharness.any.js.ini b/tests/wpt/meta-legacy-layout/html/dom/idlharness.any.js.ini
index 6551666185c..7f50b346e77 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/idlharness.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/idlharness.any.js.ini
@@ -479,6 +479,9 @@
   [WorkerNavigator interface: self.navigator must inherit property "onLine" with the proper type]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
+    expected: FAIL
+
 
 [idlharness.any.shadowrealm-in-window.html]
   expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
index f57a3e9eef5..d4d0a380c1d 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
@@ -6692,6 +6692,9 @@
   [Element interface: operation getHTML(optional GetHTMLOptions)]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.+]
   [HTMLAllCollection interface: existence and properties of interface object]
@@ -6976,24 +6979,12 @@
   [HTMLMetaElement interface: document.createElement("meta") must inherit property "scheme" with the proper type]
     expected: FAIL
 
-  [HTMLStyleElement interface: attribute media]
-    expected: FAIL
-
   [HTMLStyleElement interface: attribute blocking]
     expected: FAIL
 
-  [HTMLStyleElement interface: attribute type]
-    expected: FAIL
-
-  [HTMLStyleElement interface: document.createElement("style") must inherit property "media" with the proper type]
-    expected: FAIL
-
   [HTMLStyleElement interface: document.createElement("style") must inherit property "blocking" with the proper type]
     expected: FAIL
 
-  [HTMLStyleElement interface: document.createElement("style") must inherit property "type" with the proper type]
-    expected: FAIL
-
   [HTMLBodyElement interface: attribute link]
     expected: FAIL
 
@@ -8632,63 +8623,6 @@
   [HTMLTemplateElement interface: document.createElement("template") must inherit property "shadowRootSerializable" with the proper type]
     expected: FAIL
 
-  [HTMLSlotElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [HTMLSlotElement interface object length]
-    expected: FAIL
-
-  [HTMLSlotElement interface object name]
-    expected: FAIL
-
-  [HTMLSlotElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [HTMLSlotElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [HTMLSlotElement interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [HTMLSlotElement interface: attribute name]
-    expected: FAIL
-
-  [HTMLSlotElement interface: operation assignedNodes(optional AssignedNodesOptions)]
-    expected: FAIL
-
-  [HTMLSlotElement interface: operation assignedElements(optional AssignedNodesOptions)]
-    expected: FAIL
-
-  [HTMLSlotElement interface: operation assign((Element or Text)...)]
-    expected: FAIL
-
-  [HTMLSlotElement must be primary interface of document.createElement("slot")]
-    expected: FAIL
-
-  [Stringification of document.createElement("slot")]
-    expected: FAIL
-
-  [HTMLSlotElement interface: document.createElement("slot") must inherit property "name" with the proper type]
-    expected: FAIL
-
-  [HTMLSlotElement interface: document.createElement("slot") must inherit property "assignedNodes(optional AssignedNodesOptions)" with the proper type]
-    expected: FAIL
-
-  [HTMLSlotElement interface: calling assignedNodes(optional AssignedNodesOptions) on document.createElement("slot") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [HTMLSlotElement interface: document.createElement("slot") must inherit property "assignedElements(optional AssignedNodesOptions)" with the proper type]
-    expected: FAIL
-
-  [HTMLSlotElement interface: calling assignedElements(optional AssignedNodesOptions) on document.createElement("slot") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [HTMLSlotElement interface: document.createElement("slot") must inherit property "assign((Element or Text)...)" with the proper type]
-    expected: FAIL
-
-  [HTMLSlotElement interface: calling assign((Element or Text)...) on document.createElement("slot") with too few arguments must throw TypeError]
-    expected: FAIL
-
   [HTMLMarqueeElement interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/dom/reflection-metadata.html.ini b/tests/wpt/meta-legacy-layout/html/dom/reflection-metadata.html.ini
index 4f4a5d8a47c..29555f3562b 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/reflection-metadata.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/reflection-metadata.html.ini
@@ -4569,12 +4569,6 @@
   [style.tabIndex: IDL set to -2147483648 followed by getAttribute()]
     expected: FAIL
 
-  [style.media: typeof IDL attribute]
-    expected: FAIL
-
-  [style.media: IDL get with DOM attribute unset]
-    expected: FAIL
-
   [style.media: setAttribute() to "" followed by IDL get]
     expected: FAIL
 
@@ -4698,12 +4692,6 @@
   [style.media: IDL set to object "test-valueOf" followed by IDL get]
     expected: FAIL
 
-  [style.type: typeof IDL attribute]
-    expected: FAIL
-
-  [style.type: IDL get with DOM attribute unset]
-    expected: FAIL
-
   [style.type: setAttribute() to "" followed by IDL get]
     expected: FAIL
 
@@ -8472,186 +8460,6 @@
   [style.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [style.media: setAttribute() to ""]
-    expected: FAIL
-
-  [style.media: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [style.media: setAttribute() to undefined]
-    expected: FAIL
-
-  [style.media: setAttribute() to 7]
-    expected: FAIL
-
-  [style.media: setAttribute() to 1.5]
-    expected: FAIL
-
-  [style.media: setAttribute() to true]
-    expected: FAIL
-
-  [style.media: setAttribute() to false]
-    expected: FAIL
-
-  [style.media: setAttribute() to object "[object Object\]"]
-    expected: FAIL
-
-  [style.media: setAttribute() to NaN]
-    expected: FAIL
-
-  [style.media: setAttribute() to Infinity]
-    expected: FAIL
-
-  [style.media: setAttribute() to -Infinity]
-    expected: FAIL
-
-  [style.media: setAttribute() to "\\0"]
-    expected: FAIL
-
-  [style.media: setAttribute() to null]
-    expected: FAIL
-
-  [style.media: setAttribute() to object "test-toString"]
-    expected: FAIL
-
-  [style.media: setAttribute() to object "test-valueOf"]
-    expected: FAIL
-
-  [style.media: IDL set to ""]
-    expected: FAIL
-
-  [style.media: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [style.media: IDL set to undefined]
-    expected: FAIL
-
-  [style.media: IDL set to 7]
-    expected: FAIL
-
-  [style.media: IDL set to 1.5]
-    expected: FAIL
-
-  [style.media: IDL set to true]
-    expected: FAIL
-
-  [style.media: IDL set to false]
-    expected: FAIL
-
-  [style.media: IDL set to object "[object Object\]"]
-    expected: FAIL
-
-  [style.media: IDL set to NaN]
-    expected: FAIL
-
-  [style.media: IDL set to Infinity]
-    expected: FAIL
-
-  [style.media: IDL set to -Infinity]
-    expected: FAIL
-
-  [style.media: IDL set to "\\0"]
-    expected: FAIL
-
-  [style.media: IDL set to null]
-    expected: FAIL
-
-  [style.media: IDL set to object "test-toString"]
-    expected: FAIL
-
-  [style.media: IDL set to object "test-valueOf"]
-    expected: FAIL
-
-  [style.type: setAttribute() to ""]
-    expected: FAIL
-
-  [style.type: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [style.type: setAttribute() to undefined]
-    expected: FAIL
-
-  [style.type: setAttribute() to 7]
-    expected: FAIL
-
-  [style.type: setAttribute() to 1.5]
-    expected: FAIL
-
-  [style.type: setAttribute() to true]
-    expected: FAIL
-
-  [style.type: setAttribute() to false]
-    expected: FAIL
-
-  [style.type: setAttribute() to object "[object Object\]"]
-    expected: FAIL
-
-  [style.type: setAttribute() to NaN]
-    expected: FAIL
-
-  [style.type: setAttribute() to Infinity]
-    expected: FAIL
-
-  [style.type: setAttribute() to -Infinity]
-    expected: FAIL
-
-  [style.type: setAttribute() to "\\0"]
-    expected: FAIL
-
-  [style.type: setAttribute() to null]
-    expected: FAIL
-
-  [style.type: setAttribute() to object "test-toString"]
-    expected: FAIL
-
-  [style.type: setAttribute() to object "test-valueOf"]
-    expected: FAIL
-
-  [style.type: IDL set to ""]
-    expected: FAIL
-
-  [style.type: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [style.type: IDL set to undefined]
-    expected: FAIL
-
-  [style.type: IDL set to 7]
-    expected: FAIL
-
-  [style.type: IDL set to 1.5]
-    expected: FAIL
-
-  [style.type: IDL set to true]
-    expected: FAIL
-
-  [style.type: IDL set to false]
-    expected: FAIL
-
-  [style.type: IDL set to object "[object Object\]"]
-    expected: FAIL
-
-  [style.type: IDL set to NaN]
-    expected: FAIL
-
-  [style.type: IDL set to Infinity]
-    expected: FAIL
-
-  [style.type: IDL set to -Infinity]
-    expected: FAIL
-
-  [style.type: IDL set to "\\0"]
-    expected: FAIL
-
-  [style.type: IDL set to null]
-    expected: FAIL
-
-  [style.type: IDL set to object "test-toString"]
-    expected: FAIL
-
-  [style.type: IDL set to object "test-valueOf"]
-    expected: FAIL
-
   [link.nonce: typeof IDL attribute]
     expected: FAIL
 
@@ -9921,9 +9729,6 @@
   [title.accessKey: IDL set to "5%"]
     expected: FAIL
 
-  [style.type: setAttribute() to "5%"]
-    expected: FAIL
-
   [link.tabIndex: setAttribute() to "5%"]
     expected: FAIL
 
@@ -9951,15 +9756,9 @@
   [meta.accessKey: IDL set to "5%"]
     expected: FAIL
 
-  [style.type: IDL set to "5%"]
-    expected: FAIL
-
   [meta.accessKey: setAttribute() to "5%"]
     expected: FAIL
 
-  [style.media: IDL set to "5%"]
-    expected: FAIL
-
   [head.accessKey: setAttribute() to "5%"]
     expected: FAIL
 
@@ -9990,9 +9789,6 @@
   [link.as: setAttribute() to "sharedworKer"]
     expected: FAIL
 
-  [style.media: setAttribute() to "5%"]
-    expected: FAIL
-
   [link.nonce: IDL set to "5%"]
     expected: FAIL
 
@@ -10035,9 +9831,6 @@
   [link.as: setAttribute() to ".5"]
     expected: FAIL
 
-  [style.media: setAttribute() to ".5"]
-    expected: FAIL
-
   [style.nonce: IDL set to ".5"]
     expected: FAIL
 
@@ -10086,9 +9879,6 @@
   [link.nonce: setAttribute() to "+100"]
     expected: FAIL
 
-  [style.type: IDL set to "+100"]
-    expected: FAIL
-
   [link.as: IDL set to "tracK"]
     expected: FAIL
 
@@ -10104,9 +9894,6 @@
   [link.nonce: IDL set to "+100"]
     expected: FAIL
 
-  [style.type: setAttribute() to "+100"]
-    expected: FAIL
-
   [base.accessKey: setAttribute() to ".5"]
     expected: FAIL
 
@@ -10152,9 +9939,6 @@
   [link.accessKey: IDL set to "+100"]
     expected: FAIL
 
-  [style.media: IDL set to "+100"]
-    expected: FAIL
-
   [link.as: setAttribute() to "sharedworKer"]
     expected: FAIL
 
@@ -10185,15 +9969,9 @@
   [style.accessKey: setAttribute() to "+100"]
     expected: FAIL
 
-  [style.media: IDL set to ".5"]
-    expected: FAIL
-
   [title.accessKey: IDL set to "+100"]
     expected: FAIL
 
-  [style.type: IDL set to ".5"]
-    expected: FAIL
-
   [head.accessKey: setAttribute() to ".5"]
     expected: FAIL
 
@@ -10209,18 +9987,12 @@
   [meta.accessKey: IDL set to ".5"]
     expected: FAIL
 
-  [style.type: setAttribute() to ".5"]
-    expected: FAIL
-
   [link.as: setAttribute() to "worKer"]
     expected: FAIL
 
   [link.as: setAttribute() to "tracK"]
     expected: FAIL
 
-  [style.media: setAttribute() to "+100"]
-    expected: FAIL
-
   [link.as: setAttribute() to "xſlt"]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/dom/reflection-misc.html.ini b/tests/wpt/meta-legacy-layout/html/dom/reflection-misc.html.ini
index becbbf81115..95704704680 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/reflection-misc.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/reflection-misc.html.ini
@@ -15918,102 +15918,6 @@
   [slot.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [slot.name: typeof IDL attribute]
-    expected: FAIL
-
-  [slot.name: IDL get with DOM attribute unset]
-    expected: FAIL
-
-  [slot.name: setAttribute() to ""]
-    expected: FAIL
-
-  [slot.name: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [slot.name: setAttribute() to undefined]
-    expected: FAIL
-
-  [slot.name: setAttribute() to 7]
-    expected: FAIL
-
-  [slot.name: setAttribute() to 1.5]
-    expected: FAIL
-
-  [slot.name: setAttribute() to true]
-    expected: FAIL
-
-  [slot.name: setAttribute() to false]
-    expected: FAIL
-
-  [slot.name: setAttribute() to object "[object Object\]"]
-    expected: FAIL
-
-  [slot.name: setAttribute() to NaN]
-    expected: FAIL
-
-  [slot.name: setAttribute() to Infinity]
-    expected: FAIL
-
-  [slot.name: setAttribute() to -Infinity]
-    expected: FAIL
-
-  [slot.name: setAttribute() to "\\0"]
-    expected: FAIL
-
-  [slot.name: setAttribute() to null]
-    expected: FAIL
-
-  [slot.name: setAttribute() to object "test-toString"]
-    expected: FAIL
-
-  [slot.name: setAttribute() to object "test-valueOf"]
-    expected: FAIL
-
-  [slot.name: IDL set to ""]
-    expected: FAIL
-
-  [slot.name: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [slot.name: IDL set to undefined]
-    expected: FAIL
-
-  [slot.name: IDL set to 7]
-    expected: FAIL
-
-  [slot.name: IDL set to 1.5]
-    expected: FAIL
-
-  [slot.name: IDL set to true]
-    expected: FAIL
-
-  [slot.name: IDL set to false]
-    expected: FAIL
-
-  [slot.name: IDL set to object "[object Object\]"]
-    expected: FAIL
-
-  [slot.name: IDL set to NaN]
-    expected: FAIL
-
-  [slot.name: IDL set to Infinity]
-    expected: FAIL
-
-  [slot.name: IDL set to -Infinity]
-    expected: FAIL
-
-  [slot.name: IDL set to "\\0"]
-    expected: FAIL
-
-  [slot.name: IDL set to null]
-    expected: FAIL
-
-  [slot.name: IDL set to object "test-toString"]
-    expected: FAIL
-
-  [slot.name: IDL set to object "test-valueOf"]
-    expected: FAIL
-
   [undefinedelement.inputMode: typeof IDL attribute]
     expected: FAIL
 
@@ -16674,9 +16578,6 @@
   [dialog.tabIndex: setAttribute() to "5%"]
     expected: FAIL
 
-  [slot.name: setAttribute() to "5%"]
-    expected: FAIL
-
   [del.dateTime: IDL set to "5%"]
     expected: FAIL
 
@@ -16764,9 +16665,6 @@
   [html.accessKey: setAttribute() to "5%"]
     expected: FAIL
 
-  [slot.name: IDL set to "5%"]
-    expected: FAIL
-
   [script.accessKey: setAttribute() to "5%"]
     expected: FAIL
 
@@ -16890,9 +16788,6 @@
   [menu.accessKey: IDL set to ".5"]
     expected: FAIL
 
-  [slot.name: setAttribute() to ".5"]
-    expected: FAIL
-
   [script.accessKey: IDL set to ".5"]
     expected: FAIL
 
@@ -16947,9 +16842,6 @@
   [del.cite: IDL set to ".5"]
     expected: FAIL
 
-  [slot.name: IDL set to ".5"]
-    expected: FAIL
-
   [del.cite: setAttribute() to "+100"]
     expected: FAIL
 
@@ -17055,18 +16947,12 @@
   [script.nonce: IDL set to "+100"]
     expected: FAIL
 
-  [slot.name: setAttribute() to "+100"]
-    expected: FAIL
-
   [slot.accessKey: IDL set to "+100"]
     expected: FAIL
 
   [del.accessKey: IDL set to "+100"]
     expected: FAIL
 
-  [slot.name: IDL set to "+100"]
-    expected: FAIL
-
   [summary.tabIndex: setAttribute() to "+100"]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/styling/LinkStyle.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/styling/LinkStyle.html.ini
index 47d2fac50fc..68947d4e0d2 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/styling/LinkStyle.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/styling/LinkStyle.html.ini
@@ -5,7 +5,3 @@
 
   [The LinkStyle interface's sheet attribute must return StyleSheet object; the disabled attribute must be same as the StyleSheet's disabled attribute]
     expected: FAIL
-
-  [The media must be the same as the value of the element's media content attribute, or the empty string if it is omitted]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media.html.ini
deleted file mode 100644
index 4f712605491..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[style_media.html]
-  type: testharness
-  [The style information must be applied to the environment specified by the media attribute]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media_change.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media_change.html.ini
deleted file mode 100644
index 910515ef752..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_media_change.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[style_media_change.html]
-  type: testharness
-  [change media value dynamically]
-    expected: FAIL
-
-  [removing media attribute]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_change.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_change.html.ini
deleted file mode 100644
index ce4ccd87646..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_change.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[style_type_change.html]
-  type: testharness
-  [Check initial styleSheets length type]
-    expected: FAIL
-
-  [Change type from invalid type to valid type]
-    expected: FAIL
-
-  [Change type from valid type to invalid type]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_html.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_html.html.ini
deleted file mode 100644
index 6a05020d376..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/style_type_html.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[style_type_html.html]
-  [With a whitespace-surrounded type attribute, the style should not apply]
-    expected: FAIL
-
-  [With a charset parameter in the type attribute, the style should not apply]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html.ini
deleted file mode 100644
index 8103ea2a307..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[update-style-block-ascii-case-insensitive.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 26704422bbe..68203d2a082 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 4041e43a4fd..f9138fb999a 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/select-value-selectedOption.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/select-value-selectedOption.tentative.html.ini
new file mode 100644
index 00000000000..32d785edfa8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/select-value-selectedOption.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-value-selectedOption.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/interfaces.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/interfaces.html.ini
index f4015594b6b..824751f2dda 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/interfaces.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/interfaces.html.ini
@@ -102,15 +102,6 @@
   [Interfaces for RTC: createElement]
     expected: FAIL
 
-  [Interfaces for slot: useNS]
-    expected: FAIL
-
-  [Interfaces for slot: useParser]
-    expected: FAIL
-
-  [Interfaces for SLOT: createElement]
-    expected: FAIL
-
   [Interfaces for permission: useNS]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/invokers/idlharness.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/invokers/idlharness.tentative.html.ini
new file mode 100644
index 00000000000..7238af7327e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/invokers/idlharness.tentative.html.ini
@@ -0,0 +1,2 @@
+[idlharness.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/invokers/interestelement-interface.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/invokers/interestelement-interface.tentative.html.ini
new file mode 100644
index 00000000000..8fe4e9c2d7b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/invokers/interestelement-interface.tentative.html.ini
@@ -0,0 +1,2 @@
+[interestelement-interface.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/invokers/invokeelement-interface.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/invokers/invokeelement-interface.tentative.html.ini
new file mode 100644
index 00000000000..952e7cada9b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/invokers/invokeelement-interface.tentative.html.ini
@@ -0,0 +1,2 @@
+[invokeelement-interface.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/button-type-reset-popovertarget.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/button-type-reset-popovertarget.tentative.html.ini
deleted file mode 100644
index 8db294c3caa..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/popovers/button-type-reset-popovertarget.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[button-type-reset-popovertarget.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-css-properties.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-css-properties.tentative.html.ini
index 5fc3e9ddd42..5a0e2042d4a 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-css-properties.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-css-properties.tentative.html.ini
@@ -1,198 +1,2 @@
 [popover-css-properties.tentative.html]
-  [Property popover-show-delay value '0s']
-    expected: FAIL
-
-  [Property popover-show-delay value '0ms']
-    expected: FAIL
-
-  [Property popover-show-delay value '32s']
-    expected: FAIL
-
-  [Property popover-show-delay value '123ms']
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "0s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "0ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "32s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "123ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "inherit" should set the property value]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Property popover-hide-delay value '0s']
-    expected: FAIL
-
-  [Property popover-hide-delay value '0ms']
-    expected: FAIL
-
-  [Property popover-hide-delay value '32s']
-    expected: FAIL
-
-  [Property popover-hide-delay value '123ms']
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "0s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "0ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "32s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "123ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "inherit" should set the property value]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-types-with-hints.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-types-with-hints.tentative.html.ini
deleted file mode 100644
index b184c9f66a4..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-types-with-hints.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[popover-types-with-hints.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini b/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
index aa4b583f3d9..3f58e17f290 100644
--- a/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
+++ b/tests/wpt/meta-legacy-layout/navigation-timing/test-navigation-type-reload.html.ini
@@ -8,14 +8,5 @@
   [Reload navigationStart > Original navigationStart]
     expected: FAIL
 
-  [Reload domContentLoadedEventStart > Original domContentLoadedEventStart]
-    expected: FAIL
-
-  [Reload domInteractive > Original domInteractive]
-    expected: FAIL
-
-  [Reload fetchStart > Original fetchStart]
-    expected: FAIL
-
   [Reload domContentLoadedEventEnd > Original domContentLoadedEventEnd]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/detached-frame.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/detached-frame.html.ini
deleted file mode 100644
index c5aac72fad4..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/detached-frame.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[detached-frame.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A-A.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A-A.html.ini
deleted file mode 100644
index 3a52ab8c6bb..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A-A.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-A-A.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A.html.ini
deleted file mode 100644
index be55d35736e..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-A.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-A.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AA.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AA.html.ini
deleted file mode 100644
index 53d60ea5e29..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AA.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-AA.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AB.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AB.html.ini
deleted file mode 100644
index f2edd3bd1d8..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-AB.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-AB.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-A.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-A.html.ini
deleted file mode 100644
index f9edb91a6d9..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-A.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-B-A.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-B.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-B.html.ini
deleted file mode 100644
index fe446b62c4c..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B-B.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-B-B.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B.html.ini
deleted file mode 100644
index c37ba79c265..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/include-frames-originA-B.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[include-frames-originA-B.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/performance-entry-source.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/performance-entry-source.html.ini
deleted file mode 100644
index 9590b722a6d..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/performance-entry-source.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[performance-entry-source.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/with-filter-options-originA.html.ini b/tests/wpt/meta-legacy-layout/performance-timeline/tentative/with-filter-options-originA.html.ini
deleted file mode 100644
index 8f143701190..00000000000
--- a/tests/wpt/meta-legacy-layout/performance-timeline/tentative/with-filter-options-originA.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[with-filter-options-originA.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/shadow-dom/Extensions-to-Event-Interface.html.ini b/tests/wpt/meta-legacy-layout/shadow-dom/Extensions-to-Event-Interface.html.ini
index 88d852b3d6c..5844a570088 100644
--- a/tests/wpt/meta-legacy-layout/shadow-dom/Extensions-to-Event-Interface.html.ini
+++ b/tests/wpt/meta-legacy-layout/shadow-dom/Extensions-to-Event-Interface.html.ini
@@ -1,10 +1,4 @@
 [Extensions-to-Event-Interface.html]
-  [composed on EventInit must default to false]
-    expected: FAIL
-
-  [composed on EventInit must set the composed flag]
-    expected: FAIL
-
   [The event must propagate out of open mode shadow boundaries when the composed flag is set]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/shadow-dom/HTMLSlotElement-interface.html.ini b/tests/wpt/meta-legacy-layout/shadow-dom/HTMLSlotElement-interface.html.ini
index 858ebe7170d..ff25d8ce00f 100644
--- a/tests/wpt/meta-legacy-layout/shadow-dom/HTMLSlotElement-interface.html.ini
+++ b/tests/wpt/meta-legacy-layout/shadow-dom/HTMLSlotElement-interface.html.ini
@@ -1,19 +1,4 @@
 [HTMLSlotElement-interface.html]
-  [HTMLSlotElement must be defined on window]
-    expected: FAIL
-
-  ["name" attribute on HTMLSlotElement must reflect "name" attribute]
-    expected: FAIL
-
-  [assignedNodes() on a HTMLSlotElement must return an empty array when the slot element is not in a tree or in a document tree]
-    expected: FAIL
-
-  [assignedNodes({"flattened":false}) on a HTMLSlotElement must return an empty array when the slot element is not in a tree or in a document tree]
-    expected: FAIL
-
-  [assignedNodes({"flattened":true}) on a HTMLSlotElement must return an empty array when the slot element is not in a tree or in a document tree]
-    expected: FAIL
-
   [assignedNodes() must return the list of assigned nodes when none of the assigned nodes themselves are slots]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/shadow-dom/Slottable-mixin.html.ini b/tests/wpt/meta-legacy-layout/shadow-dom/Slottable-mixin.html.ini
index 5bde06d5006..3a3898dea3f 100644
--- a/tests/wpt/meta-legacy-layout/shadow-dom/Slottable-mixin.html.ini
+++ b/tests/wpt/meta-legacy-layout/shadow-dom/Slottable-mixin.html.ini
@@ -1,7 +1,4 @@
 [Slottable-mixin.html]
-  [assignedSlot attribute must be defined on Element and Text interfaces]
-    expected: FAIL
-
   [assignedSlot must return null when the node does not have an assigned node]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/shadow-dom/event-composed.html.ini b/tests/wpt/meta-legacy-layout/shadow-dom/event-composed.html.ini
index 3b55aeb1cb5..0034c69c43e 100644
--- a/tests/wpt/meta-legacy-layout/shadow-dom/event-composed.html.ini
+++ b/tests/wpt/meta-legacy-layout/shadow-dom/event-composed.html.ini
@@ -1,10 +1,4 @@
 [event-composed.html]
-  [A new events composed value should be set to false by default.]
-    expected: FAIL
-
-  [Users should be able to set a composed value.]
-    expected: FAIL
-
   [An event should be scoped by default]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/shadow-dom/slots.html.ini b/tests/wpt/meta-legacy-layout/shadow-dom/slots.html.ini
index aeb985ce493..b2d1b764e15 100644
--- a/tests/wpt/meta-legacy-layout/shadow-dom/slots.html.ini
+++ b/tests/wpt/meta-legacy-layout/shadow-dom/slots.html.ini
@@ -11,15 +11,6 @@
   [Slots: Slots in closed, elements only.]
     expected: FAIL
 
-  [Slots: Slots not in a shadow tree.]
-    expected: FAIL
-
-  [Slots: Slots not in a shadow tree, elements only.]
-    expected: FAIL
-
-  [Slots: Distributed nodes for Slots not in a shadow tree.]
-    expected: FAIL
-
   [Slots: Name matching]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/xhr/formdata/constructor-submitter.html.ini b/tests/wpt/meta-legacy-layout/xhr/formdata/constructor-submitter.html.ini
index 1f81e642bed..6590fc5018a 100644
--- a/tests/wpt/meta-legacy-layout/xhr/formdata/constructor-submitter.html.ini
+++ b/tests/wpt/meta-legacy-layout/xhr/formdata/constructor-submitter.html.ini
@@ -1,13 +1,4 @@
 [constructor-submitter.html]
-  [FormData construction should throw a TypeError if a non-null submitter is not a submit button]
-    expected: FAIL
-
-  [FormData construction should throw a 'NotFoundError' DOMException if a non-null submitter is not owned by the form]
-    expected: FAIL
-
-  [The constructed FormData object should contain an in-tree-order entry for a named submit button submitter]
-    expected: FAIL
-
   [The constructed FormData object should contain in-tree-order entries for an activated Image Button submitter]
     expected: FAIL
 
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 602f0ccee68..4e9c021419a 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -6106,14 +6106,14 @@
     },
     "parts": {
      "dom-parts-parseparts-002-crash.tentative.html": [
-      "bd2a0b588ba7fc6337727e3a5cb44299412a34b4",
+      "c352c50349538d2a7b45728d1daa84c226680996",
       [
        null,
        {}
       ]
      ],
      "dom-parts-parseparts-crash.tentative.html": [
-      "e0f7782e23a183ee1a81af3b602ed0daf21c9158",
+      "ad6649d854086b45a9c8c6d0d02d677396f53ba1",
       [
        null,
        {}
@@ -8926,6 +8926,13 @@
    },
    "scroll-animations": {
     "crashtests": {
+     "clip-path-with-view-timeline.html": [
+      "06c12e9bb4a1140d0f52563cff62bd971db30edc",
+      [
+       null,
+       {}
+      ]
+     ],
      "invalid-animation-range.html": [
       "43b23c93b607ac943d0c996f1baffed82dc5fbfe",
       [
@@ -9491,6 +9498,13 @@
        {}
       ]
      ],
+     "get-keyframe-fontsize-crash.html": [
+      "d9f2869d564f0f957ddef088f00fc32806607a4d",
+      [
+       null,
+       {}
+      ]
+     ],
      "infinite-active-duration.html": [
       "f92cd13942ff2cb9556863b369d02c4f79bfe3f1",
       [
@@ -25632,22 +25646,6 @@
      ]
     ]
    },
-   "resize-observer": {
-    "resize-loop-cancel-error-notification-console-manual.tentative.html": [
-     "2c0fe2c0f2875f5db5ffe47d0f072b3e1bff9dd4",
-     [
-      null,
-      {}
-     ]
-    ],
-    "resize-loop-error-notification-console-manual.tentative.html": [
-     "ef7dba83866ad067f0df42d0ad933c97986d53a0",
-     [
-      null,
-      {}
-     ]
-    ]
-   },
    "screen-orientation": {
     "page-visibility-manual.html": [
      "cc63279217806ff261195be2958194a5719cbaa1",
@@ -223489,6 +223487,32 @@
        {}
       ]
      ],
+     "scroll-buttons-003.html": [
+      "dae822892f556b2778150a78632a01080d62aedc",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-buttons-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-buttons-004.html": [
+      "f1ac00a326ea0a6ae48a1844b14026f99ada0459",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-buttons-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scroll-buttons-disabled-rtl.html": [
       "08494066bd71a70bcb3a42780d04a4d0f8cfaf51",
       [
@@ -223502,6 +223526,19 @@
        {}
       ]
      ],
+     "scroll-buttons-disabled-snapping.html": [
+      "8f6206a31c29ac05810c786532f4a7a96ea954df",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-buttons-disabled-snapping-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scroll-buttons-disabled-vertical-ltr.html": [
       "41da427cdc6f434c92d230e3418bed23284645fd",
       [
@@ -227997,6 +228034,19 @@
         {}
        ]
       ],
+      "position-sticky-column-reverse-flex.html": [
+       "29ed888fc2b943ebef42832eee44cf35b317a72e",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-column-reverse-flex-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "position-sticky-contained-by-display-table.html": [
        "e9c016e9387204d64779c98bd695097e69d62568",
        [
@@ -234222,7 +234272,7 @@
        {}
       ]
      ],
-     "has-slotted-001.tentative.html": [
+     "has-slotted-001.html": [
       "e750d97a180b5daa6eb0ac18e7178372eeaf96b6",
       [
        null,
@@ -234235,7 +234285,7 @@
        {}
       ]
      ],
-     "has-slotted-002.tentative.html": [
+     "has-slotted-002.html": [
       "729f105719b98ac791cf1f7ba9ceae88f38a4b4e",
       [
        null,
@@ -234248,7 +234298,7 @@
        {}
       ]
      ],
-     "has-slotted-003.tentative.html": [
+     "has-slotted-003.html": [
       "7578413ff3977094a5ffbcb151498a92ddc4c36d",
       [
        null,
@@ -234261,8 +234311,8 @@
        {}
       ]
      ],
-     "has-slotted-flattened-001.tentative.html": [
-      "0235f99e21f1c9ba0382e7a8936f8f1050a854fe",
+     "has-slotted-flattened-001.html": [
+      "cd6436a7145064db3555b5d316f81a191a0db614",
       [
        null,
        [
@@ -234274,8 +234324,8 @@
        {}
       ]
      ],
-     "has-slotted-flattened-002.tentative.html": [
-      "f37b6217789954240d4577b05bd5669950d72477",
+     "has-slotted-flattened-002.html": [
+      "84e4c63953ed739f7a7d7cbdb619aebaec59dbb0",
       [
        null,
        [
@@ -234287,8 +234337,21 @@
        {}
       ]
      ],
-     "has-slotted-flattened-003.tentative.html": [
-      "5f007fbd1b0fb4220a2214cb169c93a88dd2029a",
+     "has-slotted-flattened-003.html": [
+      "e16abd7be8917ae368c5e93b0b316cd33bfa78fa",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "has-slotted-flattened-004.html": [
+      "365aad154dc746c922adce568972025e1f8430b2",
       [
        null,
        [
@@ -314169,6 +314232,19 @@
         {}
        ]
       ],
+      "input-range-zero-inline-size.html": [
+       "2779a2e73efa227ed335d2fc3293dddab54023d7",
+       [
+        null,
+        [
+         [
+          "/css/css-writing-modes/forms/input-range-zero-inline-size-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "meter-appearance-native-horizontal-rtl.optional.html": [
        "65bbd653b5c7e2bfdf25595a2504a1a741c348cd",
        [
@@ -335503,6 +335579,58 @@
         ]
        },
        "text": {
+        "canvas.2d.direction.inherit.canvas.html": [
+         "c6eee5d9a8c13b45f603f9d8ac61e71f1349dc8a",
+         [
+          null,
+          [
+           [
+            "/html/canvas/element/manual/text/canvas.2d.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.direction.inherit.disconnected.canvas.html": [
+         "0499563763a8eebf6a3900a91814d5b2b70208c1",
+         [
+          null,
+          [
+           [
+            "/html/canvas/element/manual/text/canvas.2d.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.direction.inherit.document.html": [
+         "c9a3e3bdfd0a56f4ac929dcd23b4ecf0d283f30d",
+         [
+          null,
+          [
+           [
+            "/html/canvas/element/manual/text/canvas.2d.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.direction.inherit.style.html": [
+         "8405f56443ea0b66593c89fb53a15cb6c97e97e6",
+         [
+          null,
+          [
+           [
+            "/html/canvas/element/manual/text/canvas.2d.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
         "canvas.2d.disconnected.html": [
          "a1715f6663c96289adac6db909035020b6640d1c",
          [
@@ -339051,6 +339179,60 @@
           {}
          ]
         ]
+       },
+       "text": {
+        "canvas.2d.offscreen.direction.html": [
+         "422cbac3082687376c390af92c819fb7f021354f",
+         [
+          null,
+          [
+           [
+            "/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.offscreen.transferred.direction.inherit.document.html": [
+         "670a8036eaca17e9cad28992a02985093bd14bb8",
+         [
+          null,
+          [
+           [
+            "/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.offscreen.transferred.direction.inherit.html": [
+         "2e32faf863b1392549220b6984ab473fa4840ace",
+         [
+          null,
+          [
+           [
+            "/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "canvas.2d.offscreen.worker.direction.html": [
+         "c35359b5808312cc836dca4c9ae5addaeef3be47",
+         [
+          null,
+          [
+           [
+            "/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
        }
       },
       "reset": {
@@ -347778,6 +347960,19 @@
          {}
         ]
        ],
+       "dialog-popover-overlay.html": [
+        "7fa820e76ff0920562dafa09741ab1b418c15d18",
+        [
+         null,
+         [
+          [
+           "/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "dialogs-with-no-backdrop.html": [
         "fec4ba85874e898bd5f4ffc698b5881513346217",
         [
@@ -363776,7 +363971,7 @@
       []
      ],
      "docker.yml": [
-      "9b9b471c600dfb44c944bca7c0d612ddd30f7d9b",
+      "99bb68b9594652dda9329520fd87518061cf025a",
       []
      ],
      "documentation.yml": [
@@ -430555,6 +430750,10 @@
       "8caeea5c1225e8557aa4d0c00f2e01b77a0e2b1d",
       []
      ],
+     "scroll-buttons-disabled-snapping-ref.html": [
+      "7603e0ce1c6db7a39ce356405fcf88dc804f3b27",
+      []
+     ],
      "scroll-buttons-disabled-vertical-ltr-ref.html": [
       "dbc5762ed4e3f57d930d9989d575bb12fd7c5197",
       []
@@ -432162,6 +432361,10 @@
        "ccbeaa8ca7fd8c8dc301542020cc8ccd96d41da7",
        []
       ],
+      "position-sticky-column-reverse-flex-ref.html": [
+       "731c34488aa7bcb32912743c82f45f4e418dc873",
+       []
+      ],
       "position-sticky-contained-by-display-table-ref.html": [
        "32115516ef6c17577a1221d2f33f6d018ee1b368",
        []
@@ -445986,6 +446189,10 @@
        "7fe6db34073b8d3ffe668b5b1012874f1c0a33f4",
        []
       ],
+      "input-range-zero-inline-size-ref.html": [
+       "f5900394ca6517009d5fd84273b4efaf0dae1d4d",
+       []
+      ],
       "manual": {
        "support": {
         "form-controls-slr.png": [
@@ -451105,7 +451312,7 @@
    },
    "digital-credentials": {
     "META.yml": [
-     "fc8f6a62cda5062676e1fb27324739c17ac0f91e",
+     "7273f019d78464df10e4ee48f9babd1ccbc1a112",
      []
     ],
     "dc-types.ts": [
@@ -453706,7 +453913,7 @@
       []
      ],
      "syntax-mediakeysession.js": [
-      "fac31cbb3e57e9890d83f4c4fb671eaa7de11c3a",
+      "0c6d3c6c64d4ee68558141b2f8d34f18c4177076",
       []
      ],
      "syntax-mediakeysystemaccess.js": [
@@ -456238,7 +456445,7 @@
       ],
       "resources": {
        "helper.js": [
-        "5cbb183acf1d7e295ff84d17706c681c634e9b2e",
+        "502e07aa4b51f9d935aba290c711d7a71803cd91",
         []
        ],
        "permissions-policy-deferred-fetch.html": [
@@ -456247,13 +456454,37 @@
        ]
       }
      },
+     "quota": {
+      "README.md": [
+       "fc59ea73f4e46d7fc9b92ecc9e755335732bad4d",
+       []
+      ],
+      "cross-origin-iframe": {
+       "README.md": [
+        "bd802f0b2d2c8d30e97015a8d69804ccac564f5e",
+        []
+       ]
+      },
+      "resources": {
+       "helper.js": [
+        "bd9571c82f58459ec0a9f27d50370bc9ca7913b7",
+        []
+       ]
+      },
+      "same-origin-iframe": {
+       "README.md": [
+        "025422314edc35e6b84f05b63a31b607a7dcd7c0",
+        []
+       ]
+      }
+     },
      "resources": {
       "fetch-later-helper.js": [
-       "566b3e0a1a4d0d57f857f5972fc99f2bb57e742b",
+       "ef1d7090a8f5e6f81d0db9572d7d2d4cc8dd7658",
        []
       ],
       "fetch-later.html": [
-       "b569e1a076ac210d87d01b51ded0a8943476eac0",
+       "b295be116c731c5ceec2d222ecd999fc5342d5c6",
        []
       ],
       "get_beacon.py": [
@@ -457029,7 +457260,7 @@
        []
       ],
       "fledge_http_server_util.py": [
-       "92733eedf43b8d5bf84470ffa10321c3cb56ae2e",
+       "b7456282d8103b0c713bc25e5c1f1e0e6d763a0c",
        []
       ],
       "incrementer.wasm": [
@@ -462282,6 +462513,10 @@
         ]
        },
        "text": {
+        "canvas.2d.direction-ref.html": [
+         "e7f685244d9a5bbcf159f229bf405c5132287241",
+         []
+        ],
         "canvas.2d.disconnected-ref.html": [
          "b36d29b97f5e3b0065ea13ca008ce0054835efdc",
          []
@@ -463283,6 +463518,16 @@
          []
         ]
        },
+       "text": {
+        "canvas.2d.offscreen.direction-ref.html": [
+         "8949caa8486848a4d8f820752e1d73d26e2fc07d",
+         []
+        ],
+        "text-direction-worker.js": [
+         "9375ec16f231ec6f6d7d082fcd1b46ebf72a624f",
+         []
+        ]
+       },
        "the-offscreen-canvas": {
         "offscreencanvas.transferrable.sw.js": [
          "fc7265a48c393566ad8c9fe7b73281e4f5137b21",
@@ -463443,7 +463688,7 @@
        []
       ],
       "gentestutils.py": [
-       "8fa33e3975c821ce085aaf09d8b5af6e4a9b764e",
+       "ee0385fc70124185d26d16986ceafdb8348955e2",
        []
       ],
       "gentestutilsunion.py": [
@@ -463529,19 +463774,19 @@
        ]
       },
       "templates.yaml": [
-       "4ca690e2b42d4a3d5dc3736577bf3b72a61d8949",
+       "dcef1b85ecf26b951e722704376de44e5532ede6",
        []
       ],
       "yaml": {
        "element": {
         "meta.yaml": [
-         "65ef32cb31bfa7091cd5f4961b5ba48d3250b086",
+         "091f61147df62cbeb1cd1b899591fddda8028185",
          []
         ]
        },
        "offscreen": {
         "meta.yaml": [
-         "302660959a21fc4c5fceca158634fdd6f6140bc4",
+         "f6cfa90955c84a69ec3a49328c79c472d936d062",
          []
         ]
        }
@@ -464434,6 +464679,10 @@
        "b1579add2e033e9dfc6c8bb18f9e523b246326ac",
        []
       ],
+      "reporting-worker.js": [
+       "ff40749cfa6d8bab06b16ed5d9877d4608041a08",
+       []
+      ],
       "shared-worker-fetch.js.py": [
        "bf46cd291d4b955c35082e8f611b772d70267253",
        []
@@ -464446,6 +464695,10 @@
        "00b9e9395a7ec2171b3fee9d75f6ccb1d46ee60f",
        []
       ],
+      "sw.js": [
+       "57f0b41ba5b5ff6318e1e4913dfd13bdb1f237a4",
+       []
+      ],
       "worker-support.js": [
        "349b4eb9117b1c397e656435c8c1adf85964baa8",
        []
@@ -471961,6 +472214,10 @@
         "6ffd72296d8302c71866624b08b1b3213f1b5e4e",
         []
        ],
+       "dialog-popover-overlay-ref.html": [
+        "46581691ffc2e9b69f4902ca9de57b373cc88fc3",
+        []
+       ],
        "dialogs-with-no-backdrop-ref.html": [
         "4b31dc7062e697496f4edfaf98a70c0e794c6245",
         []
@@ -472283,10 +472540,6 @@
        []
       ],
       "resources": {
-       "popover-hover-hide-common.js": [
-        "9f407ef157d8a4f86c2787ed27e73e07dfb3b129",
-        []
-       ],
        "popover-invoking-attribute.js": [
         "d2911647e1520a31a33e1d8ff6bbacab7de5860d",
         []
@@ -473891,7 +474144,7 @@
       "interest-target": {
        "resources": {
         "invoker-utils.js": [
-         "4261f9c0d32fa2911a3a8ce252246e55a655655f",
+         "cedc823a5bacaee9812ea0b2edb23b00735b7529",
          []
         ]
        }
@@ -477541,7 +477794,7 @@
      []
     ],
     "html.idl": [
-     "3832a6f9b7187a0b6e5bb0b08717f09579ff7c69",
+     "25b9b457da6fe18d34161df729212b3fdfae732e",
      []
     ],
     "idle-detection.idl": [
@@ -477569,7 +477822,7 @@
      []
     ],
     "interest-invokers.tentative.idl": [
-     "f89af4d73418bc14628a33349483e435275fa71f",
+     "fe164e23575d1bf63e3325022eb02601de0d117a",
      []
     ],
     "intersection-observer.idl": [
@@ -477929,7 +478182,7 @@
      []
     ],
     "speech-api.idl": [
-     "f3967b873ffc597380585a0718c4f43406b2f281",
+     "e4ca6df5c4331c5c66aabb249dcb9fdb7323dc6f",
      []
     ],
     "storage-access.idl": [
@@ -478117,7 +478370,7 @@
      []
     ],
     "webgpu.idl": [
-     "401d2ec69b5e9b1a9eb158a110aa040621bf7790",
+     "d91a6a710b102d0d9dae24638b2d5e40c8eaa38a",
      []
     ],
     "webhid.idl": [
@@ -485902,7 +486155,7 @@
       []
      ],
      "webxr-test.js": [
-      "49938dc3ec1e7609b9bc18e10f10217e6f9c88c3",
+      "21bbc002dc45c1caae4083f8b851c7ccc8ab674f",
       []
      ],
      "webxr-test.js.headers": [
@@ -486456,16 +486709,16 @@
      "7ac32665e19a0b6c48db80a2c063f3b3e37600ab",
      []
     ],
-    "sethtml-safety.dat": [
-     "ce14d5653c614103789070ac00f79e1971ba89f9",
+    "sethtml-safety.sub.dat": [
+     "4ec50f3ea06bb29bf3e73a31f390a35215a3cd4d",
      []
     ],
-    "sethtml-tree-construction.dat": [
+    "sethtml-tree-construction.sub.dat": [
      "c5c30f613134d29030a7dbd8b03ac0f181b630bb",
      []
     ],
-    "sethtml-unsafety.dat": [
-     "cdf17df3b59f0be92ddc26676d7bfe18b0af6f68",
+    "sethtml-unsafety.sub.dat": [
+     "8f3c2dea889a936cdd54a7bdf6edbe69132a7e3f",
      []
     ],
     "support": {
@@ -505219,7 +505472,7 @@
      []
     ],
     "require-trusted-types-for-report-only.html.headers": [
-     "c6412f8d472fcfd6022b0ae485f52b3d3dedd820",
+     "8344761bdddf837ef11cc2e1b0285675765fe6ac",
      []
     ],
     "resources": {
@@ -505305,6 +505558,10 @@
       "5660deaf1e45fc5d1342baf9054693127c360a64",
       []
      ],
+     "csp-violations.js": [
+      "61b763911f7b50c2b4f7968979ce625334a7c3f4",
+      []
+     ],
      "event-handler-attributes.mjs": [
       "8d54524950b9c09d8e4dccbb369968262c3098fd",
       []
@@ -505341,10 +505598,6 @@
       "41dce761def94a328ac75f05699a6f079e0d0bee",
       []
      ],
-     "resolve-spv.js": [
-      "89e58b2a8b75e0200d145b028d032caa688f32cd",
-      []
-     ],
      "set-inner-html.js": [
       "45053d43e362e223e0ce5e6dffb4da09c0ce3f34",
       []
@@ -505375,7 +505628,7 @@
      []
     ],
     "trusted-types-report-only.html.headers": [
-     "857a8b31e86bc395e95913ee521d4fc73109c74c",
+     "383f05138fe6260ef7ac67186d336f323d3db8f4",
      []
     ],
     "trusted-types-reporting-check-report.html.sub.headers": [
@@ -506038,7 +506291,7 @@
       []
      ],
      "urltestdata.json": [
-      "0ebaf4cd4c42e785bcfafd4a49faec318c8fee4a",
+      "7669217c470a4e8ccf35a9e48bd19ed13896e48d",
       []
      ]
     },
@@ -508976,7 +509229,7 @@
       },
       "network": {
        "__init__.py": [
-        "dd0eae49ac1bfba8e4559bdb9d01d885c3cb999d",
+        "840b8086d1373852dad9c2468736b98a76044b49",
         []
        ],
        "add_intercept": {
@@ -519063,32 +519316,83 @@
       {}
      ]
     ],
-    "idbfactory_cmp.htm": [
-     "e896743ff6ef4cf8987ded93f9ae48aa5ced0812",
+    "idbfactory_cmp.any.js": [
+     "2fa4b7b6a484c7899d1100a84455eab7dda329de",
      [
-      null,
-      {}
-     ]
-    ],
-    "idbfactory_cmp2.htm": [
-     "68f87333db07f0d1799d0fa2161a025e3f143c84",
+      "IndexedDB/idbfactory_cmp.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IDBFactory.cmp()"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
      [
-      null,
-      {}
-     ]
-    ],
-    "idbfactory_cmp3.htm": [
-     "749fd7b8614913d60e2fe1635f5bd89d251f5a77",
+      "IndexedDB/idbfactory_cmp.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IDBFactory.cmp()"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
      [
-      null,
-      {}
-     ]
-    ],
-    "idbfactory_cmp4.htm": [
-     "757e7c239730c30804b40eba3301eb575c4cd58b",
+      "IndexedDB/idbfactory_cmp.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IDBFactory.cmp()"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
      [
-      null,
-      {}
+      "IndexedDB/idbfactory_cmp.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IDBFactory.cmp()"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
      ]
     ],
     "idbfactory_deleteDatabase.htm": [
@@ -520602,26 +520906,240 @@
       {}
      ]
     ],
-    "idbobjectstore-rename-abort.html": [
-     "0a7c54ee58f51927add8ed11aa5817d2b3fdbadd",
+    "idbobjectstore-rename-abort.any.js": [
+     "b285fca78320b5d45f0b7dffe6e2c6d48e17a4ff",
      [
-      null,
-      {}
-     ]
-    ],
-    "idbobjectstore-rename-errors.html": [
-     "ad2ff9a6577d05029016ec8fbef7fe3acdb74e15",
-     [
-      null,
-      {}
-     ]
-    ],
-    "idbobjectstore-rename-store.html": [
-     "97fa2e0c1fee475b006ff36df7d1099c87ac3190",
-     [
-      null,
+      "IndexedDB/idbobjectstore-rename-abort.any.html",
       {
-       "timeout": "long"
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support in aborted transactions"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-abort.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support in aborted transactions"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-abort.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support in aborted transactions"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-abort.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support in aborted transactions"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "idbobjectstore-rename-errors.any.js": [
+     "32e52ffa5f8c4982ac30fdf6eb040e11dbc077d0",
+     [
+      "IndexedDB/idbobjectstore-rename-errors.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming error handling"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-errors.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming error handling"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-errors.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming error handling"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-errors.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming error handling"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "idbobjectstore-rename-store.any.js": [
+     "5877c045bc3d39a8c161c68aa8c8c7f837584b61",
+     [
+      "IndexedDB/idbobjectstore-rename-store.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-store.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-store.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbobjectstore-rename-store.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: object store renaming support"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ]
+       ]
       }
      ]
     ],
@@ -521834,18 +522352,162 @@
       {}
      ]
     ],
-    "idbtransaction-objectStore-exception-order.html": [
-     "9b5c4ac4b94605b0d16d3ff8b98cdf73aa0a6c87",
+    "idbtransaction-objectStore-exception-order.any.js": [
+     "56856fd3134d5f933b14d0ebadbab80bc8dfbea9",
      [
-      null,
-      {}
+      "IndexedDB/idbtransaction-objectStore-exception-order.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() Exception Ordering"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-exception-order.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() Exception Ordering"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-exception-order.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() Exception Ordering"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-exception-order.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() Exception Ordering"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
-    "idbtransaction-objectStore-finished.html": [
-     "de2cad51afe1b52fcfca88b8ef590b6b9dbc9a1f",
+    "idbtransaction-objectStore-finished.any.js": [
+     "a5713d5885b2d60aac1d421a37c5014fd40c7f17",
      [
-      null,
-      {}
+      "IndexedDB/idbtransaction-objectStore-finished.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() when transaction is finished"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-finished.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() when transaction is finished"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-finished.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() when transaction is finished"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/idbtransaction-objectStore-finished.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: IDBTransaction objectStore() when transaction is finished"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
     "idbtransaction-oncomplete.htm": [
@@ -522102,40 +522764,398 @@
       {}
      ]
     ],
-    "keypath-exceptions.htm": [
-     "b0569f9294e2079d5c11bc3d6b5a6a2568302cba",
+    "keypath-exceptions.any.js": [
+     "6e945147829192b854639d3a79616e5bea71c761",
      [
-      null,
-      {}
-     ]
-    ],
-    "keypath-special-identifiers.htm": [
-     "a521ed8bb89c4357fe5bbc0ec1c0737f6ac0c7cf",
-     [
-      null,
-      {}
-     ]
-    ],
-    "keypath.htm": [
-     "06f5947d35c8d92dcf235e3b21c72ee0dd2eb0dc",
-     [
-      null,
-      {}
-     ]
-    ],
-    "keypath_invalid.htm": [
-     "6aa33c854ac14447ca922dfab2005a7342a9ac1c",
-     [
-      null,
-      {}
-     ]
-    ],
-    "keypath_maxsize.htm": [
-     "1abbc1403d4681ff287af0d07537ab5ca7924c9b",
-     [
-      null,
+      "IndexedDB/keypath-exceptions.any.html",
       {
-       "timeout": "long"
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-exceptions.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-exceptions.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-exceptions.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "keypath-special-identifiers.any.js": [
+     "7bd8114e2d82012f513adb9ba4f174e42af9bbdd",
+     [
+      "IndexedDB/keypath-special-identifiers.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-special-identifiers.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-special-identifiers.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath-special-identifiers.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "keypath.any.js": [
+     "c47dd72e8729cbbd56b9594ba752197a47e1efac",
+     [
+      "IndexedDB/keypath.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "keypath_invalid.any.js": [
+     "b755c4d16cda1991bf90fadfe44d0277033afbf0",
+     [
+      "IndexedDB/keypath_invalid.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_invalid.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_invalid.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_invalid.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "keypath_maxsize.any.js": [
+     "e20a9b1d3a9203eab2f4420f28a9abd547fac222",
+     [
+      "IndexedDB/keypath_maxsize.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_maxsize.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_maxsize.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keypath_maxsize.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Keypath"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
       }
      ]
     ],
@@ -522968,29 +523988,309 @@
       {}
      ]
     ],
-    "request-abort-ordering.html": [
-     "4374d8de7089375e312fe8c40efe4176fc71776f",
+    "request-abort-ordering.any.js": [
+     "e050d327695f08303918d0bfb9eb0fc586f97b05",
      [
-      null,
+      "IndexedDB/request-abort-ordering.any.html",
       {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request abort events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/request-abort-ordering.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request abort events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/request-abort-ordering.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request abort events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/request-abort-ordering.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request abort events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "request-event-ordering.any.js": [
+     "89c45091f1d766ed2961d8dbe0f8d0318df7e406",
+     [
+      "IndexedDB/request-event-ordering.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request result events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/request-event-ordering.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request result events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/request-event-ordering.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request result events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/request-event-ordering.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "IndexedDB: request result events are delivered in order"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
        "timeout": "long"
       }
      ]
     ],
-    "request-event-ordering.html": [
-     "71eda0dd1dfdc5a54fab4ed764e063936ac0905d",
+    "request_bubble-and-capture.any.js": [
+     "c80d7f5fd5c42bb625a0ba48bbdc995ab5d7eda1",
      [
-      null,
+      "IndexedDB/request_bubble-and-capture.any.html",
       {
-       "timeout": "long"
+       "script_metadata": [
+        [
+         "title",
+         "Bubbling and capturing of request events"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
       }
-     ]
-    ],
-    "request_bubble-and-capture.htm": [
-     "8238e2c9ca140513e365f1619c96c86706d01397",
+     ],
      [
-      null,
-      {}
+      "IndexedDB/request_bubble-and-capture.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Bubbling and capturing of request events"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/request_bubble-and-capture.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Bubbling and capturing of request events"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/request_bubble-and-capture.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Bubbling and capturing of request events"
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support-promises.js"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
     "serialize-sharedarraybuffer-throws.https.html": [
@@ -534309,7 +535609,7 @@
       ]
      ],
      "ai_translator_translate.tentative.https.any.js": [
-      "896fee9259911dfe5fb188728c405a6cbddca98b",
+      "a45fb2b621a67d97551957e7a50cfc2e08aee386",
       [
        "ai/translator/ai_translator_translate.tentative.https.any.html",
        {
@@ -542308,7 +543608,7 @@
    },
    "clear-site-data": {
     "clear-cache.https.html": [
-     "8cdaf2a55271987943dfb25a37d98295068b57b2",
+     "eab2e5975025afffd8c46011c2446e91f8c5ef92",
      [
       null,
       {
@@ -561797,6 +563097,132 @@
         {}
        ]
       ],
+      "animation-trigger-exit-range-end-computed.html": [
+       "d2baab5b2a5c23e42c377341ebba82f9fc605072",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-end-invalid.html": [
+       "111847151ef6c03db61470c746654e6705884918",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-end-valid.html": [
+       "9a41889d3396de0a83a448a99684b011bc7eadd4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-shorthand.html": [
+       "5ddc0682ea8e548ca38a24a6093932c54dd17d3a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-start-computed.html": [
+       "a48e15a578dcbb3e5b0eeab18476242f445d99ae",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-start-invalid.html": [
+       "220b8028dd312e154c4b7c63f6aa4264b138ffc5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-exit-range-start-valid.html": [
+       "11d1adb26f8983d5460a250db1a47113720b8313",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-end-computed.html": [
+       "63ee6218f12bdd23992f654a823fe66adb6879c7",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-end-invalid.html": [
+       "8d66ac661d5434d650b1fdc299f4019ade53d842",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-end-valid.html": [
+       "6d9533e26480929794d488cf66a82c5e22e2fd62",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-shorthand.html": [
+       "371a3c70d1bda76c07a1cb1be232639ef35aca52",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-start-computed.html": [
+       "7b1f9e37e62f74f6ff53e975db02fa08f4fe2a32",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-start-invalid.html": [
+       "6c056d06e9686557643760fb7c42646aaa360620",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-range-start-valid.html": [
+       "d48151b6db07693ee7157b44477be8630905a07a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-timeline-parsing.tentative.html": [
+       "5d47a1e5e45693b365e863643bf57350ba16a835",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-type-computed.tentative.html": [
+       "073758a28b94fd17326665075bfb884ace73e1a6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-type-invalid.tentative.html": [
+       "9c669021c736e17fa4fd7f3b70a40eb003eea931",
+       [
+        null,
+        {}
+       ]
+      ],
+      "animation-trigger-type-valid.tentative.html": [
+       "a94e8ec88994e36de12d25703908f0c4a0ea5ad4",
+       [
+        null,
+        {}
+       ]
+      ],
       "animation-valid.html": [
        "e0b54dca2f2655f2da3cd7fa7794cf71d3d7186f",
        [
@@ -565893,6 +567319,20 @@
          {}
         ]
        ],
+       "scroll-state-scrollable-body-001.html": [
+        "de2920a755d04ec144fa857b385c806e43de94c3",
+        [
+         null,
+         {}
+        ]
+       ],
+       "scroll-state-scrollable-body-002.html": [
+        "baf300371603257bb478cfbf6d3632f04451021c",
+        [
+         null,
+         {}
+        ]
+       ],
        "scroll-state-scrollable-change.html": [
         "0554b3d3a03754b37e51b80d6c39449a7827a78e",
         [
@@ -565921,6 +567361,13 @@
          {}
         ]
        ],
+       "scroll-state-scrollable-root.html": [
+        "bc1c71c186cd61c6effbc9c03f6bea7d93b4ec3d",
+        [
+         null,
+         {}
+        ]
+       ],
        "scroll-state-scrollable-wm.html": [
         "717205f0045869980c4710ac50d0fad35d57eca7",
         [
@@ -570212,6 +571659,13 @@
        {}
       ]
      ],
+     "font-weight-sign-function.html": [
+      "d65284fb7a8da07bca74b7c2776da8fb0f4c85d7",
+      [
+       null,
+       {}
+      ]
+     ],
      "format-specifiers-variations.html": [
       "32b8ebed67ebdfd5d10ef374e68d4effb8d9028d",
       [
@@ -576556,7 +578010,7 @@
        ]
       ],
       "clip-path-interpolation-shape.html": [
-       "763cf00ec1a35e1c24a79b5cef95ffa8f1ab7825",
+       "6d85c2a06b491bbc54e7cfba6705fd9b6af2098f",
        [
         null,
         {}
@@ -577056,6 +578510,22 @@
       }
      }
     },
+    "css-mixins": {
+     "at-function-parsing.html": [
+      "6ab77c5e4d85340da327606650113261e0ed5300",
+      [
+       null,
+       {}
+      ]
+     ],
+     "dashed-function-eval.html": [
+      "eb706ee3c9919086d006366bd16021ac6e3a2cc9",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-multicol": {
      "animation": {
       "column-count-interpolation.html": [
@@ -577122,6 +578592,27 @@
        {}
       ]
      ],
+     "getclientrects-002.html": [
+      "7efdef40e5a8dcb4e9ae6d012ec3154d42e3e622",
+      [
+       null,
+       {}
+      ]
+     ],
+     "getclientrects-003.html": [
+      "df97d6648f6ad5b0df0c0760c5f086247a00bd1c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "getclientrects-004.html": [
+      "f2519521e544d1cd5b7d1daec64c8fe18483cb8b",
+      [
+       null,
+       {}
+      ]
+     ],
      "going-out-of-flow-after-spanner.html": [
       "2fe0e42a7522647b7eca4db1e6f710a9975faaa4",
       [
@@ -577984,43 +579475,41 @@
         {}
        ]
       ],
-      "parsing": {
-       "scroll-buttons-invalid.html": [
-        "752aa3c865be5cf2c24c22ab00f97c0b375feb93",
-        [
-         null,
-         {}
-        ]
-       ],
-       "scroll-buttons-valid.html": [
-        "b4e747efadfce0f2492bf740d93fe26b23911bd5",
-        [
-         null,
-         {}
-        ]
-       ],
-       "scroll-markers-computed.html": [
-        "882ed83fe723c6984c588ae34bcdd93fd365fcdc",
-        [
-         null,
-         {}
-        ]
-       ],
-       "scroll-markers-invalid.html": [
-        "5194d5ab72b2f1126fda82dfb2c3126bcf9c6ab5",
-        [
-         null,
-         {}
-        ]
-       ],
-       "scroll-markers-valid.html": [
-        "760efc877288115388018f6d014fcca8d79863b3",
-        [
-         null,
-         {}
-        ]
+      "scroll-buttons-invalid.html": [
+       "a7306df84d6bd9695ec389a3dfa58e2c97065fe6",
+       [
+        null,
+        {}
        ]
-      },
+      ],
+      "scroll-buttons-valid.html": [
+       "a1af4c89b47b3a0df1da126954cdb9ae16fef39a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-markers-computed.html": [
+       "882ed83fe723c6984c588ae34bcdd93fd365fcdc",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-markers-invalid.html": [
+       "5194d5ab72b2f1126fda82dfb2c3126bcf9c6ab5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-markers-valid.html": [
+       "760efc877288115388018f6d014fcca8d79863b3",
+       [
+        null,
+        {}
+       ]
+      ],
       "scrollbar-gutter-invalid.html": [
        "e59790c32eb6767f3a2d9594434f7886f57a532b",
        [
@@ -578096,6 +579585,24 @@
        }
       ]
      ],
+     "scroll-button-hover-remove.html": [
+      "af000012b4ec605fb0e30a34e50bc02119a9b925",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-button-hover.html": [
+      "35ea009cee03cdd583651c59c904f5e4d2479de9",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-buttons-activation-with-columns.html": [
       "b0b8574ce37eb7d87ce2564a5c5de8409e45fe84",
       [
@@ -578187,6 +579694,33 @@
        }
       ]
      ],
+     "scroll-marker-hover-logical.html": [
+      "1b865f77885c79d7e063fd2a9984fb8526b0b93d",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-marker-hover-remove.html": [
+      "03931905eefdf862dd18480b13e298280fb3ea82",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-marker-hover.html": [
+      "12273af2bbaf7656502599fe66e6c80f5f84bff2",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-marker-selection-in-padded-scroller.html": [
       "94e84d278f2b53b475e6d072cb6f520916bdb283",
       [
@@ -580717,7 +582251,7 @@
        {}
       ]
      ],
-     "has-slotted-changing-001.tentative.html": [
+     "has-slotted-changing-001.html": [
       "5c6cce72bb7ccd9cd9b78a76bd83e4b61083adc5",
       [
        null,
@@ -580726,7 +582260,7 @@
        }
       ]
      ],
-     "has-slotted-changing-002.tentative.html": [
+     "has-slotted-changing-002.html": [
       "98c15f30c8f0968316331af9cad7521d3e02adb9",
       [
        null,
@@ -580771,6 +582305,20 @@
        }
       ]
      ],
+     "has-slotted-manual-assignment.html": [
+      "02be3861ead826914737aad9deabb3bad43eb416",
+      [
+       null,
+       {}
+      ]
+     ],
+     "has-slotted-query-selector.html": [
+      "88da744a67bab436dcbda3b1c4545d45d1b5848c",
+      [
+       null,
+       {}
+      ]
+     ],
      "host-context-parsing.html": [
       "56055ece63733e8c58c6add661566572356d67aa",
       [
@@ -589795,8 +591343,15 @@
        {}
       ]
      ],
+     "after-change-style-inherited-try-fallback.html": [
+      "9f359d57e5babe9f7bafff8942968bc108fa817b",
+      [
+       null,
+       {}
+      ]
+     ],
      "after-change-style-inherited.html": [
-      "75570a90a1947496e7171f9f64afd190d2353bb7",
+      "f80a8a69b004d937f905efa232866686d71002ab",
       [
        null,
        {}
@@ -593233,8 +594788,8 @@
        {}
       ]
      ],
-     "interactivity-inert-click.tentative.html": [
-      "0a724a929f7a8a33282db3a91f8c96b171c1ed3b",
+     "interactivity-inert-click-002.html": [
+      "80772f0552be3fc7ede1be0ad7f73ec7119bcdbb",
       [
        null,
        {
@@ -593242,8 +594797,31 @@
        }
       ]
      ],
-     "interactivity-inert-focus.tentative.html": [
-      "79b6f367d8040b09c2c3986c5b3dc24263d54c74",
+     "interactivity-inert-click.html": [
+      "c1b882c70230ffab24249f5b67240aef2c8a1e9b",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "interactivity-inert-focus.html": [
+      "af7cf7469ea5a23bc5830430e0fa76ded9df9634",
+      [
+       null,
+       {}
+      ]
+     ],
+     "interactivity-inert-html-attribute-ua.html": [
+      "1f118d56f7967227c2548ba10d0c2b5d5549d1e6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "interactivity-inert-modal-dialog-ua.html": [
+      "e8094f88a695900f59e18be0a742c8dd735c5b7b",
       [
        null,
        {}
@@ -593362,15 +594940,15 @@
         {}
        ]
       ],
-      "interactivity-computed.tentative.html": [
-       "7ead06c00451933eb30ca63f9bc6184da3488a46",
+      "interactivity-computed.html": [
+       "3806b943d7e5731da3f05cf1a316094a32051080",
        [
         null,
         {}
        ]
       ],
-      "interactivity.tentative.html": [
-       "219db2178de01bcb42762052eaf188066b9497e1",
+      "interactivity.html": [
+       "99176ef9b9ac163d8de09207229260074d907afe",
        [
         null,
         {}
@@ -595733,13 +597311,20 @@
        {}
       ]
      ],
-     "pseudo-element-animations.html": [
+     "pseudo-element-animations-rerun.html": [
       "a7c3247479d01f4044b9033726282037c1b4bc9f",
       [
        null,
        {}
       ]
      ],
+     "pseudo-element-animations.html": [
+      "b5cde702733779cba306e861ee1fe2290fe64a5e",
+      [
+       null,
+       {}
+      ]
+     ],
      "pseudo-get-computed-style.html": [
       "3e971885c398eab3d3a95b6ae16d4704b02ff23f",
       [
@@ -595993,6 +597578,20 @@
         {}
        ]
       ],
+      "input-range-block-size.html": [
+       "142a946cf562f3aa02f165277a65f6dcc55f2ed2",
+       [
+        null,
+        {}
+       ]
+      ],
+      "input-range-inline-size.html": [
+       "57068039383a89cae61595446009c383db863ee1",
+       [
+        null,
+        {}
+       ]
+      ],
       "meter-appearance-native-computed-style.optional.html": [
        "446036b73c92734f8d4099b3d9018879bdce1239",
        [
@@ -598767,6 +600366,13 @@
        {}
       ]
      ],
+     "scrollWidthHeight-overflow-visible-negative-margins.html": [
+      "26eb41466e4f97d408f966eb8ea116e9e0467a30",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrollWidthHeight.xht": [
       "18930517670c20e2a68b5d6f20a320b60c9eaf83",
       [
@@ -606454,6 +608060,13 @@
        {}
       ]
      ],
+     "MutationObserver-textContent.html": [
+      "404cc259340456364e9eb1ef2e5c90a7ff80090c",
+      [
+       null,
+       {}
+      ]
+     ],
      "Node-appendChild-cereactions-vs-script.window.js": [
       "bc0b8ad6dca55d83f1cfb9788e6ff33df96ab22a",
       [
@@ -607624,7 +609237,7 @@
     "observable": {
      "tentative": {
       "idlharness.html": [
-       "9a3842c4e67f76140957ed69ab89227eff0e76f7",
+       "ea8743528f67ac0bc9154f82b3c391bbc96eb20f",
        [
         null,
         {}
@@ -607762,7 +609375,7 @@
        ]
       ],
       "observable-from.any.js": [
-       "d90104ffcd6250fa2213b8801d761dcd1655c2c6",
+       "f305d2de670769bcc2f68cfc60639af3164d9099",
        [
         "dom/observable/tentative/observable-from.any.html",
         {}
@@ -607889,49 +609502,49 @@
     },
     "parts": {
      "basic-dom-part-declarative-brace-syntax-innerhtml.tentative.html": [
-      "932c0a392a36a5c61ae9da72a99855549e7bc882",
+      "5eb89b6f2e368052d0bb71996ed705e4173116f5",
       [
        null,
        {}
       ]
      ],
      "basic-dom-part-declarative-brace-syntax.tentative.html": [
-      "70fc471bc61204f8dadf1370654f35f121f2348f",
+      "a4e911391b1680d3c46f7408a40eeb88ace7bc01",
       [
        null,
        {}
       ]
      ],
      "basic-dom-part-objects.tentative.html": [
-      "f2199362c4d734b24d3f5edc4a2a0c8aec5ea32f",
+      "dffc1fcc2c5b18be5e1dda565082cde7123d4223",
       [
        null,
        {}
       ]
      ],
      "dom-parts-parseparts-on-body.tentative.html": [
-      "542c7b2881aa0456e578325630a8cc302406c266",
+      "57a7c60064691f1e5dafd8032e7aeb4550ed664e",
       [
        null,
        {}
       ]
      ],
      "dom-parts-parseparts-on-head.tentative.html": [
-      "e65c0d728febd3589a468947d648d83b3722e2dd",
+      "e170fc026a2c7d4cc0f100b4276ed204e7a7f46e",
       [
        null,
        {}
       ]
      ],
      "dom-parts-parseparts-on-root.tentative.html": [
-      "f3ba3eaf6bf9f118c9eb64c3c930c9977165b76e",
+      "5cb9a3c0fecb2ce41f0f42102597c82a955bf551",
       [
        null,
        {}
       ]
      ],
      "dom-parts-valid-node-types.tentative.html": [
-      "f9ed167e605ad1e2b6b1d198d1ce44906765604c",
+      "bb783797f607c71262819b01719478550bd9fd52",
       [
        null,
        {}
@@ -640653,7 +642266,7 @@
       ]
      },
      "iframe.tentative.https.window.js": [
-      "4f2610863604f0a235524a80f7988212355e5ab9",
+      "b30156b41b2ac9fc934003a83b1be97f935ef4e8",
       [
        "fetch/fetch-later/iframe.tentative.https.window.html",
        {
@@ -640675,7 +642288,7 @@
       ]
      ],
      "new-window.tentative.https.window.js": [
-      "27922f462665b550e1c5520112051178ef45782b",
+      "5a64eb596e1b78dfc7e96f8346ecc7e399e8d470",
       [
        "fetch/fetch-later/new-window.tentative.https.window.html",
        {
@@ -640705,7 +642318,7 @@
      ],
      "permissions-policy": {
       "deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js": [
-       "707d6d1fa54c10e39187a71bfb06bc987c756ae1",
+       "13870bc94b0ec7ff3066b94345dc5c163ecfe51b",
        [
         "fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.html",
         {
@@ -640822,7 +642435,7 @@
        ]
       ],
       "deferred-fetch-default-permissions-policy.tentative.https.window.js": [
-       "a4cc45ef6be4f158164b5f222ebcb4b241a138cb",
+       "4982221952ff980674f459a382858e2726f28ec5",
        [
         "fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.html",
         {
@@ -640861,7 +642474,7 @@
        ]
       ],
       "deferred-fetch-supported-by-permissions-policy.tentative.window.js": [
-       "e89f1edb8567092bcf6146d772a93789e2dbc9f8",
+       "385b0e054ed172ac778b7df961bfb0ad5f31a434",
        [
         "fetch/fetch-later/permissions-policy/deferred-fetch-supported-by-permissions-policy.tentative.window.html",
         {
@@ -640960,28 +642573,456 @@
        ]
       ]
      },
-     "quota.tentative.https.window.js": [
-      "400be4050955a96c96df49f5976cc5a8b43246ce",
-      [
-       "fetch/fetch-later/quota.tentative.https.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/get-host-info.sub.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "/fetch/fetch-later/resources/fetch-later-helper.js"
+     "quota": {
+      "accumulated-oversized-payload.tentative.https.window.js": [
+       "6439b392e2a0230a3ff819e4e80b42341dc0c389",
+       [
+        "fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/quota/resources/helper.js"
+          ]
          ]
+        }
+       ]
+      ],
+      "cross-origin-iframe": {
+       "accumulated-oversized-payload.tentative.https.window.js": [
+        "071a9c600b7a3230f7e72952521bebc695a2a447",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
         ]
-       }
+       ],
+       "empty-payload.tentative.https.window.js": [
+        "6c7becfacaf45048c69c815940460d1dbe084a67",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "max-payload.tentative.https.window.js": [
+        "480f90988bf552ca915032e3e7f0b60c59cd0604",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "multiple-iframes.tentative.https.window.js": [
+        "3538c73a3966e3a00a513fe958a69df622446232",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "oversized-payload.tentative.https.window.js": [
+        "43a605151342a9825095ed6c20e921a663e741cb",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "small-payload.tentative.https.window.js": [
+        "ad73db5516e687b1ade0f1cc3588780f15f2dd30",
+        [
+         "fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ]
+          ]
+         }
+        ]
+       ]
+      },
+      "empty-payload.tentative.https.window.js": [
+       "c2c4dd50326c0a75b2c82d152995329ccc0cd252",
+       [
+        "fetch/fetch-later/quota/empty-payload.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "max-payload.tentative.https.window.js": [
+       "8457060797ac2d140c85af6c657f79389288c356",
+       [
+        "fetch/fetch-later/quota/max-payload.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/quota/resources/helper.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "multiple-origins.tentative.https.window.js": [
+       "5849068e4d5780a31ad0562854eba818d031af75",
+       [
+        "fetch/fetch-later/quota/multiple-origins.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/quota/resources/helper.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "oversized-payload.tentative.https.window.js": [
+       "0036d040d8e201d8d621c6615e4e7c49daf45fff",
+       [
+        "fetch/fetch-later/quota/oversized-payload.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/quota/resources/helper.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "same-origin-iframe": {
+       "accumulated-oversized-payload.tentative.https.window.js": [
+        "8b894c011ad29c3e984022ec601578bcfc701e2b",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "empty-payload.tentative.https.window.js": [
+        "53cae60047eaefd2b01a3bd45c84239fa3752bf9",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "max-payload.tentative.https.window.js": [
+        "9d865eeb5ee55b80aabcc87ebbd579c3787f1ec1",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "multiple-iframes.tentative.https.window.js": [
+        "3f46f84a5fc18a1d7fbaca3fdc0a3d7b6a5f2d64",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "oversized-payload.tentative.https.window.js": [
+        "d71b87190cea15f8e439129f844bab107235237a",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/quota/resources/helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "small-payload.tentative.https.window.js": [
+        "2b20a6fc62965e0d4d8ad5a4014aeb6679653584",
+        [
+         "fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/fetch/fetch-later/resources/fetch-later-helper.js"
+           ]
+          ]
+         }
+        ]
+       ]
+      },
+      "small-payload.tentative.https.window.js": [
+       "862ca09affdb49c7e461cf9bdfc833b9c2ce09f9",
+       [
+        "fetch/fetch-later/quota/small-payload.tentative.https.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "/fetch/fetch-later/resources/fetch-later-helper.js"
+          ]
+         ]
+        }
+       ]
       ]
-     ],
+     },
      "send-on-deactivate-with-background-sync.tentative.https.window.js": [
       "881bdd23f9371ac684b4aa58c2be23ac402cf4fe",
       [
@@ -650645,7 +652686,7 @@
       ]
      ],
      "get-interest-group-auction-data.https.window.js": [
-      "205391d21ffdc39ab5bfc6ca3352fe9a5930b041",
+      "da48a843dc5a5a8eeefaae95a8fedbc00e3939dc",
       [
        "fledge/tentative/get-interest-group-auction-data.https.window.html?1-4",
        {
@@ -650697,6 +652738,10 @@
          [
           "variant",
           "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
          ]
         ],
         "timeout": "long"
@@ -650753,6 +652798,70 @@
          [
           "variant",
           "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/get-interest-group-auction-data.https.window.html?17-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver-vendor.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/ba-fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "third_party/cbor-js/cbor.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
          ]
         ],
         "timeout": "long"
@@ -650809,6 +652918,10 @@
          [
           "variant",
           "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
          ]
         ],
         "timeout": "long"
@@ -650865,6 +652978,10 @@
          [
           "variant",
           "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
          ]
         ],
         "timeout": "long"
@@ -658871,7 +660988,7 @@
       ]
      ],
      "trusted-scoring-signals.https.window.js": [
-      "ea08ded9e8e8ec6fe0f01c910952e441d7212ef4",
+      "0c3b4054395a9a8728553593c22acc5661ab37fa",
       [
        "fledge/tentative/trusted-scoring-signals.https.window.html?1-5",
        {
@@ -658942,7 +661059,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659018,7 +661139,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659094,7 +661219,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659170,7 +661299,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659246,7 +661379,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659322,7 +661459,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659398,7 +661539,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659474,7 +661619,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659550,14 +661699,18 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
        }
       ],
       [
-       "fledge/tentative/trusted-scoring-signals.https.window.html?51-last",
+       "fledge/tentative/trusted-scoring-signals.https.window.html?51-55",
        {
         "script_metadata": [
          [
@@ -659626,7 +661779,91 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.window.html?56-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver-vendor.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-45"
+         ],
+         [
+          "variant",
+          "?46-50"
+         ],
+         [
+          "variant",
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -659702,7 +661939,11 @@
          ],
          [
           "variant",
-          "?51-last"
+          "?51-55"
+         ],
+         [
+          "variant",
+          "?56-last"
          ]
         ],
         "timeout": "long"
@@ -672599,168 +674840,168 @@
       },
       "compositing": {
        "2d.composite.canvas.clear.html": [
-        "fbb7adbbb92c563a47a404a638fddf0f58265db1",
+        "9bcac1f3bfcb7745462631ea6df1bd5c2a6ab297",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.copy.html": [
-        "a769d1fa61c94ffb007d92913fd86ee6098d3b22",
+        "fad9701dfbf07f35cf43c0e9e1affa80fc1a9772",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-atop.html": [
-        "c285bfe3893f6f853be58e46b0da8416412e962b",
+        "b6f6f745a35f5bcaa1b301c37c860e1d7e849a58",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-in.html": [
-        "7089c30a0d7a84312c258dc1703b0dd605142e74",
+        "b370cd8e6d8be0adb994a07d5805786553e72b3b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-out.html": [
-        "75db37c67f6d96082090253dd40591e1f8f30025",
+        "c5c13b498002e190a87524474d9f9122e0f4b65f",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-over.html": [
-        "af0e0488a2a6409af79b9a1c0764a80c8ff358fb",
+        "186a9676170c77928225e6d47650cf0e224bc582",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.lighter.html": [
-        "9dfb7592ab93599700adb3cf15714fb87c6d9876",
+        "622e0d1bdaab93f9afb771e5d1853ce85ea49013",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-atop.html": [
-        "120cd64ce7ae8b08174f7ecfef1259ed17734f6e",
+        "fe990661fa5eb97e02114b84816d943b92f3858c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-in.html": [
-        "342413686d68b9e92c1751548dfc16c86e90af61",
+        "15679fefa272f056a1f39b6523e2c8d530d092fd",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-out.html": [
-        "f82e45775cf2c016501987bf1d1c27d7dd4c8c1a",
+        "2728477500ec0f539699ebf571429fc99841ef4e",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-over.html": [
-        "44b30c0fdd8089fb6aab3abb7f05dba069bf99be",
+        "3f8bfc3db912ac6203e98c533a489e6b5ac99818",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.xor.html": [
-        "b55a605ea4fb3436a234f41147a7650dc30341d8",
+        "ba0a3575c4fc5afbc33dcca7b0f581e52a042f7b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.clear.html": [
-        "0c353f5d6b32885cc0b10d157d5c3df1b0966a3b",
+        "b990e32b541417db7bfc532b109c87d2050767b5",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.copy.html": [
-        "afc73376ccbf01f88e1d6e28bb3621e45b685de7",
+        "960b59cd79f708cf82b12c5fa0e0615f766378a6",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-atop.html": [
-        "82e6e1a9ceb5d5e0515816466d207c0e23707473",
+        "113c9d04de09caab15f9a5f267afb485aca2931e",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-in.html": [
-        "519dec749a48fb9f9627d5729915b887c9706fd9",
+        "325fa7198b79734915c57543711275703de6bc61",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-out.html": [
-        "95c6be7846714e3bc7c451dc75fa1d3fd6290af1",
+        "4774edf25f4b1d1b51bf042d552e9c901281f64e",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-over.html": [
-        "f3b83e30f984c700490ff1ebcddd7a6d57e011b1",
+        "2474403233754cd98ad7f0e0a3d202302ff61e6b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.lighter.html": [
-        "87ddf2865728d39a533f3112c50a3f51b9d1b4a5",
+        "9cc05d68b0c7fde8f861282588c145b00b754a67",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-atop.html": [
-        "be9ccbdad4bb1d0839689fe93a545c10fd6cd86c",
+        "3698cf5363e993508e8c81af186661d7496d022c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-in.html": [
-        "e1837904637c556910faedc48abcaf52f067309b",
+        "b54bd07cb9a7444a8c14e3fc4a8a6b5647419e70",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-out.html": [
-        "e943a7eb21d0f3ef6e2abcbbef6c893248043b56",
+        "11b66cfab75ac142bfd4b6b57c7c6e39294ebc89",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-over.html": [
-        "fa5054311c204fa9f596d8c88feee915c3f3f55b",
+        "55d217c6744b2b7e534312f150ad33cc197c5bc1",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.xor.html": [
-        "3464088c48eec4f99a4d5e69cd0d3161940b5d4e",
+        "fb4e3df65f57076327e2093c7dfb390b1d84d4ba",
         [
          null,
          {}
@@ -672830,84 +675071,84 @@
         ]
        ],
        "2d.composite.image.clear.html": [
-        "1a562e27404100a2abbd11559a8d54f563d5f812",
+        "94e6dad1fbaf4d7fef3b57a20d9e9b56d010d7bf",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.copy.html": [
-        "809b8e37bb41972716d4c2ab10c61a8ec871142c",
+        "2e0e7f22d51cc41a644af5a7e069e5d89bca1aff",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-atop.html": [
-        "b23f9fab42b5f133439fdae4953aace0a11ccc1f",
+        "c2869e315c3c83fddc793019476c625f37487dbd",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-in.html": [
-        "707d3e17536ea356ed4b1b48f041c10b5d2cfab2",
+        "e5c0065ec84db64763351913defe8df28728770c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-out.html": [
-        "7bbc3c14c29ef5a1467769213b663af579db7a9f",
+        "878d52134c067e15c613a9641f4fe016e75c555c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-over.html": [
-        "88290edf8e93606e5625600199b80c331e4a819d",
+        "2918a7d7cb64a6876d726f36907de0d6b0efb311",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.lighter.html": [
-        "c5f35859c77bff2e346b08d87fb47393ec42554b",
+        "7f299a97b0b78847dcc91850419e411b5a2b4e8c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-atop.html": [
-        "204365b2453b5d9c1e44875cc9556b1b9a7d9a00",
+        "6d83a674cf3999c7228fd4aa6a7eeb216d869b9b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-in.html": [
-        "c14a5d31b13df1daaadcf541c82078992cb641d3",
+        "c3c0428d3456c14e22887af432821ef05b94a1a6",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-out.html": [
-        "ccc1b0b5b5e6cd65c6ed53ef02d467855937ad22",
+        "8a0db7b95ed03da6d61e619db6631c22365645c7",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-over.html": [
-        "e9250a351498c8ab56c2ee0ed43668332339aefb",
+        "5380a1d4a0bf28697e2e4eb96f5c595394941d73",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.xor.html": [
-        "df435be55ab2156afe28d165b616c77f3623317c",
+        "6c7bf9f026b0239fe0f7e3c57e52d66f0d4b1a6f",
         [
          null,
          {}
@@ -673180,35 +675421,35 @@
         ]
        ],
        "2d.composite.uncovered.image.copy.html": [
-        "4f8ade8a8ad1af41ec35d76a3b13581412300cd9",
+        "bdb3de546c5695384d4d047a0e01d29b209cda4a",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-atop.html": [
-        "d728a4f2fedd096a6fe649f71fec7f5737f04256",
+        "b294010d8d118954a1a832ff3846bc9662a52896",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-in.html": [
-        "644be0bdb4cd1f5952728efe7ccdbc798ab7a3c0",
+        "03bb30602f337d55456d7b387490b7266f6c833c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-in.html": [
-        "8828c42fe2036d754dffb319646894fba47551f4",
+        "1e23ead09600c9e4202ec5bff18dfd5d4b9960a5",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-out.html": [
-        "7bb4734be41a1422a79453ea63053ec394ac0d02",
+        "fa0bc40b309f343ccad9d9e587a4c8ac089b06a7",
         [
          null,
          {}
@@ -673250,35 +675491,35 @@
         ]
        ],
        "2d.composite.uncovered.pattern.copy.html": [
-        "9dd5d0bc6b0b54c361afdab69de9cbb52c305fbe",
+        "4d9ccf0df50e6f4a2f7bd3b3b5e498ac1b83dca1",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-atop.html": [
-        "a0637ffb54d8a81768ded3cc14345fdb39a19d43",
+        "f15587a449d1f02d65cb885c7d7d67e177d986da",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-in.html": [
-        "ed65ba9a05716c55f7e42764f4749b7bfcae7973",
+        "4a9387c6a4aef8050729affe326e52d3f17bd02b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-in.html": [
-        "cc42f36d59f260f08e342c97e6e373d1d4e98687",
+        "edb578c023876f8ee59bde8b10eeb77b509e9ecf",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-out.html": [
-        "b192208e5fde9494dc3e87b3edf2a9d640300f81",
+        "4b1b7ca83fdf8ec2b225861668babc4da93a232c",
         [
          null,
          {}
@@ -680734,336 +682975,336 @@
       },
       "compositing": {
        "2d.composite.canvas.clear.html": [
-        "72dc4bb6947142060f299f02bc4c53dc342b3b49",
+        "b17173a0b8952ae8d293c273d85e67b7ac3c3115",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.clear.worker.js": [
-        "2f9fb92da1e9d222482fce249e53307f5c7de8a0",
+        "d2c449e096195d04ab5dd3e43c499de5d71c82ac",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.copy.html": [
-        "cfc5a33de1b7c79bbdaba8679c4978d82e5ab809",
+        "884544199584dfb14f6fb9a27345e2ff94848c2b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.copy.worker.js": [
-        "5b071665ce4fb3ae83d357199bd2f082fc79cd88",
+        "9362cbb7ddb00c151f923b5e025c7f608bd65aa8",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.destination-atop.html": [
-        "3a1f86c8ed966501848a1d3624cf2435517c5233",
+        "e26a39290084983540f9915ddf4bccd6478081d0",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-atop.worker.js": [
-        "58828619a32383a43ecd0691c1823abcdc34478c",
+        "76774a4f85df4d9bd27effeb71ec6574524fefef",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.destination-in.html": [
-        "c8480a961dc7bd831d76c913cdee0a0d0d5b1e01",
+        "dfb57444b3187f60256d0af29e3e2570f6bde87c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-in.worker.js": [
-        "4e2ec058ecabac7a0bb22c008cb75c4ed135a692",
+        "597e4f074aeb7dc9793e5d22016fcbef73476c69",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.destination-out.html": [
-        "f35bc25e419833fa92bd8e7be31b42507612de77",
+        "76b5b08c04c28a28204b864cd378c682a943ceed",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-out.worker.js": [
-        "bc7be056a1d63d3fcc7c09b3debb9930facc8b15",
+        "bcb134ed40be14d20026d8ddacfca7f0dff3c463",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.destination-over.html": [
-        "676b43608d99a80c3c2eb4315bd448d6bbb1b6e1",
+        "0df9dc542e21dcd33eea9b3a2bf5ec696d5c5b49",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.destination-over.worker.js": [
-        "c1d15a0959189c62bd418993c5db8cbe83b52d3b",
+        "1bd55fac506e13862ed46e833a398980a447c0c9",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.lighter.html": [
-        "4c913506faf252410c1351f43b874fe0261b421c",
+        "798221d01a92a6522e5773a486d86b8caa35f70d",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.lighter.worker.js": [
-        "df494f22d333e5fd7cd420c4040126d78c8d2f71",
+        "6cb3c64820eaab3d9a390c720d3935d7ed4f2bbc",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.source-atop.html": [
-        "f6e03874001a320bb15a77b2f41df788077b1b67",
+        "72f08fde6748c14144fee55eb58a6369eedb4907",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-atop.worker.js": [
-        "781a89c1b6ca5752b865f644ef5eec8f62b50291",
+        "74a2050ca168a649e33ece7e570712d3042e416d",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.source-in.html": [
-        "ea7acd8bbbc4e9255c657e126723d3fac5765091",
+        "2b8fafa7b446fecff6314195cdf888fbc86ac90c",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-in.worker.js": [
-        "484399acfccf2e3ad96a6f642ced3151e1ffec9d",
+        "f9e63d57874bc0488b9d5606a80e548eb3d8a538",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.source-out.html": [
-        "7b2de941de1712c1f0f8321720b668e40c37fc2f",
+        "185ed298d6ebc0cd8f0677e65ad404e9676fd56d",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-out.worker.js": [
-        "d0d6cc12e95301705e68eb53b8a35c33bdd07822",
+        "300926c9cd427b77b4e595d8e929aa9baa62a617",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.source-over.html": [
-        "fe833737eefd6c3b940bfc358e982d992e250db4",
+        "f37338b66250aab80066703509b2f936a028f5e1",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.source-over.worker.js": [
-        "848fbf3beccc89a85d9febc99f930818075ea112",
+        "dbbec70c5f0093298880fe4daad5e9981a9afe09",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.html",
          {}
         ]
        ],
        "2d.composite.canvas.xor.html": [
-        "d89e6de267fb7fbc0f551312192f63fdae248d8f",
+        "db1af5399cdda30674c5350536c8096c73ce22d8",
         [
          null,
          {}
         ]
        ],
        "2d.composite.canvas.xor.worker.js": [
-        "250bba4baccfaf08fd249b694c107ee742790794",
+        "b6e33df894ce626b94d88b7713452aac333a1cc4",
         [
          "html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.clear.html": [
-        "ba555feeb94b0577070d0659fcd1e8f6c2a6e304",
+        "7bf385e0002f5071ac3d123abacabf9b6387dbe9",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.clear.worker.js": [
-        "abae05ac241219252438cd06c537e5e3bac11004",
+        "ba85656feb1cb5f0caf3f9fdf8c13d44dca32b5f",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.copy.html": [
-        "061a2560034a9904dcf653c3f5f579622e6f779b",
+        "053ab46ed777865dd6a4b67aef5e00b229d90ab9",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.copy.worker.js": [
-        "dfebd98a6b701676682217ffcfcc6f552ec23ddf",
+        "f6ec2a5f0a716dd7cf4ecf7fd85b01138f89559b",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.destination-atop.html": [
-        "19b05ef098a2efa58e8b9026d9ba8a3ebcd8b497",
+        "54089dc47100ee5f34edf32388c1df5de9a9b0be",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-atop.worker.js": [
-        "9c8fa79c5aadcbe366ce4a3e1230655bdab7bfea",
+        "19459117b51a377a2be02ef37639c4361f5943d4",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.destination-in.html": [
-        "f57414616d51bba55ab7a634e75a79e36a5af3db",
+        "5aa3ae5eb232c6585b862633897adbd45e9bf684",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-in.worker.js": [
-        "a98624f82485ebe1eeb2d77b02447ef36d0ce745",
+        "b0b1c71abb31c362ec0de123099a089edc7d9020",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.destination-out.html": [
-        "bdf8c7bc905c4df5a3bd3de3cb7068ea30fd05b3",
+        "8b201109b82935a67baeda0884dda51f266d2ec8",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-out.worker.js": [
-        "0cf915d1c7796d51372bb5a30585c17b2ca7291f",
+        "3fad74e4739182b6ebb3497c338302c2bdbae0a6",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.destination-over.html": [
-        "4c484b667df162b85a6266ed0924c4e1f6d5611e",
+        "47b99c2e87f137ccefc390420d3c731d2d26c0bc",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.destination-over.worker.js": [
-        "b1b5eee6f4e1248f03536d51308045c0b469f2d6",
+        "9e5cb738a474e52f4c374b160a5febb2ec796759",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.lighter.html": [
-        "8a1ed3f21492763372ea55302fdc26c1d9dd4906",
+        "2c1d60bbaba624eb3fe1f22cc277880ebdbf58d6",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.lighter.worker.js": [
-        "8576d9db7c4c77f93200254a9c78831429c633ce",
+        "5da6bb8602d9ada15a972a2429833f8dff04c3ff",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.source-atop.html": [
-        "0bc3e975e29d3206a12ab1c243eadfe4605156b9",
+        "9fe31e892ece916be84468ae09816e061a52e533",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-atop.worker.js": [
-        "fd220f52b3ce8742c5145a0e359d6033fe34b903",
+        "21aa591ca34f1a758bb269caff60a83477b2bddb",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.source-in.html": [
-        "f91862bf707445e8260f92857784f2e9e80ae90a",
+        "a8ae684294a24de0c270ad7235195f9fdba7e128",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-in.worker.js": [
-        "0c61fb779456303739f15b3bc2ae53e406946723",
+        "ea9d5b64d01abd5abfdd3eebd164ef73a52baa49",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.source-out.html": [
-        "b93ebf368d0cb2f81dda8f09424cfbec0a0ec7e8",
+        "2284d05b424d57d79c0fcfdde815a97de8f49fa8",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-out.worker.js": [
-        "ec57663af18a8796c627ab424110ec2c758ebaa4",
+        "97d85978745e7e5c883ca450470a0536ccafc7e4",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.source-over.html": [
-        "90125c003a1c951ba76a0faed1768db32703cae8",
+        "98ec1da6a40e0e457ecf41e271ae745e8d626dc7",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.source-over.worker.js": [
-        "15c322ee597db05ea2317e35579c02926bc4542e",
+        "e4ff4a3dd835f4b522ed9a2f0a17e4eb0d9c0260",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.html",
          {}
         ]
        ],
        "2d.composite.clip.xor.html": [
-        "d35b53c9e4430455cf604ea28d41517fbf75a439",
+        "102b3857fc2376f51101c9fae25ebfd648a41dec",
         [
          null,
          {}
         ]
        ],
        "2d.composite.clip.xor.worker.js": [
-        "30bae44aa995c32b2f0c09141b158f3b46ddd9e2",
+        "d3b39219810467a13304465d274bcd92ffb63a40",
         [
          "html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.html",
          {}
@@ -681196,168 +683437,168 @@
         ]
        ],
        "2d.composite.image.clear.html": [
-        "2582a6bfaf0c729d5d06cf2553522513de33e364",
+        "cf7720a1701536bc624464c9a1406a887189ff1f",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.clear.worker.js": [
-        "f152cee739b5b5e37ab9921c7679a1268d1d0816",
+        "e60b521f6a93ef03c138d96b757145eee1b24b74",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.clear.worker.html",
          {}
         ]
        ],
        "2d.composite.image.copy.html": [
-        "d0fe687a1df6d9d911a4995ecc561756a035b8e3",
+        "9645e2ada2d782e64511a51a7bb6585f3fb6de2a",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.copy.worker.js": [
-        "05ccab1711632032501996d648656ac9de6aae0c",
+        "a6b90d892e8e0de58605b11d174a2c661e12d220",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.copy.worker.html",
          {}
         ]
        ],
        "2d.composite.image.destination-atop.html": [
-        "78d352ea6e532678e4f0f6c34de7fb1b02ffcaf7",
+        "100921a4ab3e5dfcd7a54e0aa5a3ec0f9594a671",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-atop.worker.js": [
-        "43648142d50c6f27b5c110599a6b5ea3a6878bd7",
+        "99962b16fc4d806f1780042c8cb84e0d25f69dc6",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.image.destination-in.html": [
-        "8f8e188a950bd34a1a817891c7aeb9bbf5504e46",
+        "b81df3e2efa988d1c107d41f160306ebabe00962",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-in.worker.js": [
-        "2787237c569cff871385e97ee36b9449670726ad",
+        "39d11f567f562caec49a4dd6312d189f1bca2a30",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.html",
          {}
         ]
        ],
        "2d.composite.image.destination-out.html": [
-        "410a019ec7a53438342468b91181fe716a1a2101",
+        "76c028129876f8f44eb48adfa085f8547ebbe9a2",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-out.worker.js": [
-        "e030f533a051c449883fd85bc6eb04b6639e6da3",
+        "843652a86b813cf352cfb45c72f058b48382b84e",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.html",
          {}
         ]
        ],
        "2d.composite.image.destination-over.html": [
-        "c9e33da8855ad6bdaf543b36c988cee52be44e4f",
+        "e17fe382f9e0557845107e2a043c253c337642a0",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.destination-over.worker.js": [
-        "964df4ae8bc022cfdc2bd64c99106d086f6d9f09",
+        "3bb9d4ee37213662cf1517f4f63975ec7bee82d1",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.html",
          {}
         ]
        ],
        "2d.composite.image.lighter.html": [
-        "15176dc36665b16d11ba4147ac8d8f3c8ce3ee59",
+        "ebe4eda9ec518ba4ab3146d63c0b5e7ce34f1417",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.lighter.worker.js": [
-        "f3828b6411d8a7b318844a60dbe9f0376de99f38",
+        "d361064a1ce43f561061e741c3b084a6b5076997",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.html",
          {}
         ]
        ],
        "2d.composite.image.source-atop.html": [
-        "9d8b850972e999a008760e038a00ace8a10e67f3",
+        "19b42105f7edb245005ac8909569a61a086c28b9",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-atop.worker.js": [
-        "7b1618e3f96c67d0c77c5f0e6421868204ec93b1",
+        "067bbfa682e6940f4be3e889d9037abc72597b7a",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.image.source-in.html": [
-        "1d63fc17df12d95df7d7583a9e3c505e9185bc25",
+        "5fd392ec754989b78115d6b692dec816f809e90a",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-in.worker.js": [
-        "9accfb35c465e541adfe07d1054aa8f530d8ecab",
+        "7b5ffbc63277859d94c1f5096d4fb94b16ff3e21",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.html",
          {}
         ]
        ],
        "2d.composite.image.source-out.html": [
-        "5ab29d018f0c458b1083963c0bcac995082adb1d",
+        "38b23d9b1524da5cb200bfdebfc5d82348bf30f8",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-out.worker.js": [
-        "8e8d9116bb1b1d286925df83db85ec2d5e562555",
+        "fe785a5e24af5b58a94b8391172e3b79ad932b19",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.html",
          {}
         ]
        ],
        "2d.composite.image.source-over.html": [
-        "55ad292bf39631001075fc0cccd6218a5f73a62d",
+        "5371724d488d1bc3efc4f2a1b8340ee66da9da78",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.source-over.worker.js": [
-        "679aa19ef9820aa626309da5ef3bc1607e3455a2",
+        "a9304b305efdab3950e202b63656e3e74f6f656e",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.html",
          {}
         ]
        ],
        "2d.composite.image.xor.html": [
-        "edc42d5b0575d39a97db281ac3f86b650426dea3",
+        "f0a28e24fe906979eace75f2072cdffaa442fe5d",
         [
          null,
          {}
         ]
        ],
        "2d.composite.image.xor.worker.js": [
-        "83a04928b5d417677bdfdcfacf6123828b2b852f",
+        "c8822bc98f5ad930f8cf56f9ff2a5a80d10399d6",
         [
          "html/canvas/offscreen/compositing/2d.composite.image.xor.worker.html",
          {}
@@ -681906,70 +684147,70 @@
         ]
        ],
        "2d.composite.uncovered.image.copy.html": [
-        "4311bb390031347f5e3054d4b07f3b343bf5aa25",
+        "566e5abb477d844f8aab1ce1ccf4b1975f251b88",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.copy.worker.js": [
-        "0e56b4f71d499b2935def0be81c8eaaada71c517",
+        "e93962ce6d6eb9d48b75edfa5f0466875e4e05a7",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-atop.html": [
-        "6453ff3c572409c90d6b76ecb44752f5900ff6e4",
+        "0e014c80f3d39ba3c81cb3cd1a58a26819d072a8",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-atop.worker.js": [
-        "4c4a0a4c951fa5942df538532f103e8024ea878c",
+        "3cea3620424f878be6ac100315fb31271f7b1739",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-in.html": [
-        "aebd6f86d816a10c88d8738c1456d3e7d82593c1",
+        "3a3ac4a400c3ad3610e9217ac6f561fcb9666603",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.destination-in.worker.js": [
-        "af1dc50c9bbde88c2c68e4bde209b3a9d8ab4588",
+        "d96c112d646362f4b3d6970e18c8894e0867f8c6",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-in.html": [
-        "95d23038a8bdffcdcc754138808eff9716d4c913",
+        "0b54d39320c649c3fb3ada3bcc6b83704b596b4b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-in.worker.js": [
-        "490ce4d0012de3b0d4d8cf3fc57e3846c6b95fce",
+        "5b6bad7d38c2edfee91d1a99a7389f7f37d0e208",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-out.html": [
-        "573ab8acdb034eba8769cda8c2a637051ffc92a7",
+        "bae97a6779f50b68c3c73fa2ded15177c6cefc1b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.image.source-out.worker.js": [
-        "3647e34574be8619f860e5e52ccc56ec65cb62c9",
+        "fa44cb7556de195f172c16eafec63ed790c327ec",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.html",
          {}
@@ -682046,70 +684287,70 @@
         ]
        ],
        "2d.composite.uncovered.pattern.copy.html": [
-        "bf15282f873800598d0992d3a3e1961e5ea16825",
+        "e9a0d85d95258e0cb71f724060c90a05046e8b11",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.copy.worker.js": [
-        "a5944be695407a8c9273b7099398110073386e96",
+        "bd59189e6d3784e29b5b3b8474a2314437582bbf",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-atop.html": [
-        "015d6b6c8d161713f360596e8e010a4ae92594e3",
+        "a2250a897202589d0196981bde6bcc92cb099389",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-atop.worker.js": [
-        "c34c748059ae242f8c27b534d142545d0d30cac7",
+        "17ebb53db00f94e6a4acc37824c32e4edc03cb50",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-in.html": [
-        "2747f851a5b2589fa962df6e5da5d90fc9047359",
+        "558e14aab0b7b31b2ffad26f75ee39fbb7bf75e1",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.destination-in.worker.js": [
-        "10042455a79632322abe36fa34f6beb1f7fe957d",
+        "62ae7f569d7dc7e605f3aefb3d0eefcb62924c31",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-in.html": [
-        "edcd6bf6a2b64b43166b280e6f5e95693fec06b7",
+        "63b432c065d320fe1a2680b66a1be1868e345a2f",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-in.worker.js": [
-        "c658da8c991f8695b681af07737ca458df41f40c",
+        "03a3b2f072f3db6af67a946b6bed4508f1a7b0ae",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.html",
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-out.html": [
-        "35e7b589ea92754c0560a27a89f2dc98b0e227c4",
+        "a714dc648ce66c62694ff19c382d700f6b97026b",
         [
          null,
          {}
         ]
        ],
        "2d.composite.uncovered.pattern.source-out.worker.js": [
-        "86baf476febad997d6a63e654d192cfe122d01dd",
+        "0fff24429130136285845d4772cde864a86e9beb",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.html",
          {}
@@ -698775,7 +701016,7 @@
       ]
      ],
      "reporting-subresource-corp.tentative.https.html": [
-      "0530956080bb3d027fc1f88ed23572f0e7b9ba02",
+      "6be3c35ad7ab749f52c4cd20d348bea21dfad448",
       [
        null,
        {
@@ -699401,7 +701642,7 @@
         ]
        ],
        "dir-auto-dynamic-changes.window.js": [
-        "26dd584869f5976678ea1b35ba1a981ebf034844",
+        "bb58548754c8ba83893a392f18f39dd46b33b20c",
         [
          "html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.html",
          {
@@ -707512,7 +709753,7 @@
         ]
        ],
        "toBlob-cross-realm-callback-report-exception.html": [
-        "393170baad8a1a93b5d89b6f505d45c40e85a8a2",
+        "cbf060d4d0c6e2d7b1c57fbf7bccd849fef3e2ca",
         [
          null,
          {}
@@ -712361,6 +714602,15 @@
           {}
          ]
         ],
+        "select-picker-hover-active-pseudo.tentative.html": [
+         "4f3570b065ff674072294095948e63db859399dd",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
         "select-pseudo-open.tentative.html": [
          "21dd0aef2aa3afb5b07ebff6ddf7e71366f49c31",
          [
@@ -714001,13 +716251,6 @@
         }
        ]
       ],
-      "popover-css-properties.tentative.html": [
-       "93d388b02b533f8e8719ef8a9b54293f45a5cffd",
-       [
-        null,
-        {}
-       ]
-      ],
       "popover-document-open.html": [
        "80ac86acedab246d5ceff8b54d57feb7e957d642",
        [
@@ -714023,7 +716266,7 @@
        ]
       ],
       "popover-focus-2.html": [
-       "552c8d8206b7b682f422bc8a5e2017f66983d198",
+       "5fc8e7adf9804027a6a5a87bec15cd4a5c26b99f",
        [
         null,
         {
@@ -714051,55 +716294,6 @@
         }
        ]
       ],
-      "popover-hover-hang.tentative.html": [
-       "7868fa71a55b2e5be6fc07a68de43f341e53b31f",
-       [
-        null,
-        {
-         "testdriver": true
-        }
-       ]
-      ],
-      "popover-hover-hide-hide.tentative.html": [
-       "57ca5723de562cc97b886e1410119596eefee313",
-       [
-        null,
-        {
-         "testdriver": true,
-         "timeout": "long"
-        }
-       ]
-      ],
-      "popover-hover-hide-hover.tentative.html": [
-       "d0036c0fe7b14b619a0c6562caf53713a478f6a7",
-       [
-        null,
-        {
-         "testdriver": true,
-         "timeout": "long"
-        }
-       ]
-      ],
-      "popover-hover-hide-show.tentative.html": [
-       "7b3fa2b30238df6e5f464b39bb246e7bef6ac241",
-       [
-        null,
-        {
-         "testdriver": true,
-         "timeout": "long"
-        }
-       ]
-      ],
-      "popover-hover-hide-toggle.tentative.html": [
-       "d6d4079e7e02be9cf6f6efde435fe4f1d0678d57",
-       [
-        null,
-        {
-         "testdriver": true,
-         "timeout": "long"
-        }
-       ]
-      ],
       "popover-invoker-reset.html": [
        "bfc79fd629171606b5d5d9a4224522e4bb4137ef",
        [
@@ -714297,16 +716491,6 @@
         {}
        ]
       ],
-      "popover-target-action-hover.tentative.html": [
-       "b03ec78ebf12e49775bf0636c78a803d97a1c19d",
-       [
-        null,
-        {
-         "testdriver": true,
-         "timeout": "long"
-        }
-       ]
-      ],
       "popover-target-element-disabled.html": [
        "d5c951768c083aa0fea3c6d473c9a370f386f31b",
        [
@@ -719043,15 +721227,22 @@
        ]
       },
       "interest-target": {
+       "idlharness.tentative.html": [
+        "72859ca6ca8c8de3a0b695eb5e877f316bfefa8d",
+        [
+         null,
+         {}
+        ]
+       ],
        "interestelement-interface.tentative.html": [
-        "bc68dc54577f445d399ad2cc364cd4c02cb4d16d",
+        "41616d97bd0a26b53ac82570f98a40c675dbcd0c",
         [
          null,
          {}
         ]
        ],
        "interestevent-dispatch-shadow.tentative.html": [
-        "9911357e94dd403a9b97b04ef7cf8eb8162ced50",
+        "146f7fb5ec4e301dce0f08391950f1ae44011f04",
         [
          null,
          {
@@ -719060,7 +721251,7 @@
         ]
        ],
        "interestevent-interface.tentative.html": [
-        "9ed95a6a0289831c1c5dc2b6530e389a1a6c48ce",
+        "b5b4193f1da5c4cf28b6a4e6d1a4cdd3504c44c4",
         [
          null,
          {
@@ -719069,7 +721260,7 @@
         ]
        ],
        "interesttarget-anchor-event-dispatch.tentative.html": [
-        "88a54c21f83bb144c2f9d8263e1159d7e7261f65",
+        "931ea1cfdef7823ec4a96517207fb213369c204d",
         [
          null,
          {
@@ -719078,7 +721269,7 @@
         ]
        ],
        "interesttarget-area-event-dispatch.tentative.html": [
-        "5573235082617a9dd10bd253d0ed25b772adc551",
+        "eadc8fb1759a38c041579fc2c9b671c8eb6633eb",
         [
          null,
          {
@@ -719086,8 +721277,18 @@
          }
         ]
        ],
+       "interesttarget-basic-delays.tentative.html": [
+        "eb5d9b6a855aad4be2a6008fd4f3918a9fe85fb3",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
        "interesttarget-button-event-dispatch.tentative.html": [
-        "a9d68bb03fdd5476e776e1ecfbe0facfbccccbe7",
+        "6057f4ca60fe260b6572b7b54c993210731d86ae",
         [
          null,
          {
@@ -719095,8 +721296,25 @@
          }
         ]
        ],
+       "interesttarget-css-properties.tentative.html": [
+        "b91614b163c88f301b5c2198f568286044ee4f9c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "interesttarget-hide-delay.tentative.html": [
+        "a1499b83752e0dae25db30cedeec1dd128eac632",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
        "interesttarget-on-popover-behavior.tentative.html": [
-        "cbb5e4014eed14a6da35219de02f9d46aa7b9643",
+        "40027f0cccceab1a8f1c0dc32bb941d9547446ab",
         [
          null,
          {
@@ -719104,8 +721322,18 @@
          }
         ]
        ],
+       "interesttarget-show-delay.tentative.html": [
+        "599d61f91a8c2849bd2a549b1d86878405380f39",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
        "interesttarget-svg-a-event-dispatch.tentative.html": [
-        "8208c8d56af9ddc95ceb401d411c14c76f20747f",
+        "31a59f5c281fdda5497edd6256ac556b282cf6de",
         [
          null,
          {
@@ -733714,7 +735942,14 @@
        ]
       ]
      }
-    }
+    },
+    "waiting-for-audio.html": [
+     "e76c6e97b906e776ea76d8f4c66b6790a238b0f0",
+     [
+      null,
+      {}
+     ]
+    ]
    },
    "mediacapture-extensions": {
     "GUM-backgroundBlur.https.html": [
@@ -763479,14 +765714,14 @@
      ]
     ],
     "sethtml-safety.tentative.html": [
-     "d7a10c0477be80773f63d491e04db620d4d8b180",
+     "8a7f3ac64d97d40d75d378816b698215ebaa2bcd",
      [
       null,
       {}
      ]
     ],
     "sethtml-tree-construction.tentative.html": [
-     "bae406ef703346adaf31790f84c030b25acc2cae",
+     "5c693dbf3c90dc59c9a9a3ac0281fc1f33f36d85",
      [
       null,
       {}
@@ -766328,6 +768563,13 @@
        {}
       ]
      ],
+     "setting-effect.html": [
+      "2644ec02a97cecc04cae1e2303b67f0865f70f86",
+      [
+       null,
+       {}
+      ]
+     ],
      "setting-playback-rate.html": [
       "e7e96a27e1ff3961b66139fb5fae6d2ac82e9fff",
       [
@@ -767687,6 +769929,13 @@
         {}
        ]
       ],
+      "Selection-getComposedRanges-range-update.html": [
+       "15f07305b0dfd507a4b22f7ad950f602a39f6c5a",
+       [
+        null,
+        {}
+       ]
+      ],
       "Selection-getComposedRanges-slot.html": [
        "d9664b0e1505fad35444628d707de390fac0e11f",
        [
@@ -791061,6 +793310,13 @@
         }
        ]
       ],
+      "inline.html": [
+       "f40a8f127c7b07d8d0314d747a014a9b262cf48d",
+       [
+        null,
+        {}
+       ]
+      ],
       "path.window.js": [
        "f4d311183e305477026c42861a38ed55ed53a740",
        [
@@ -795156,7 +797412,7 @@
      ]
     ],
     "TrustedTypePolicyFactory-createPolicy-cspTests-none.html": [
-     "badaf989eb74978f0ac6d3ca173ed0a64fcbc585",
+     "a75b50f8f002e2398cf072f3a9ad4e42bc4e31ff",
      [
       null,
       {}
@@ -795170,7 +797426,7 @@
      ]
     ],
     "TrustedTypePolicyFactory-createPolicy-cspTests.html": [
-     "979de1e8145cb730cd646163a0d1166fc5777105",
+     "f84634a1408d20c99ea2fbe4b96b8bb580e4a65d",
      [
       null,
       {}
@@ -795577,14 +797833,14 @@
      ]
     ],
     "require-trusted-types-for-report-only.html": [
-     "25b4440ef4117010bb7da7c8f3ad87f01d3bf55f",
+     "0b1d141fb3ac149b8d77677d21dd849923d6fbc5",
      [
       null,
       {}
      ]
     ],
     "require-trusted-types-for.html": [
-     "b0dcd9cc930024f51fbfb2c522fe04a9ddcdb9e5",
+     "c6dfbcbfb4871d2bb87b5590524cc3503fdc479d",
      [
       null,
       {}
@@ -795633,21 +797889,21 @@
      ]
     ],
     "trusted-types-eval-reporting-no-unsafe-eval.html": [
-     "92604c96718a01abef60e1186e68334c8537b0f7",
+     "5e2087a1c6b8273b0640ad647d777633ec6c4133",
      [
       null,
       {}
      ]
     ],
     "trusted-types-eval-reporting-report-only.html": [
-     "a81f5a45789389e9d08ec16262ec878e51682179",
+     "226db176bd8d03a7674a2f1fa4360d4049e15f23",
      [
       null,
       {}
      ]
     ],
     "trusted-types-eval-reporting.html": [
-     "e7c7245f9e415e08a0d327a4b7b17effebdfd555",
+     "2fc889549ec28e2e0ee1a8d7e44fd438a7289585",
      [
       null,
       {}
@@ -795675,7 +797931,7 @@
      ]
     ],
     "trusted-types-report-only.html": [
-     "fcb77841163d9a09774497d2b8588f85c2a42b06",
+     "f4386f832f43f57b82c52edc5e7dbe16308b6255",
      [
       null,
       {}
@@ -795689,7 +797945,7 @@
      ]
     ],
     "trusted-types-reporting.html": [
-     "96c9dd72813a7b480e65374144f63e6ad487ea4e",
+     "2ea5855e054637c4abc03ae7a468cfeccf035047",
      [
       null,
       {
@@ -795698,21 +797954,21 @@
      ]
     ],
     "trusted-types-source-file-path.html": [
-     "6e87c25a7f0998a2117de2f73f4adc3df9b024b5",
+     "edb1d5d68e9331a6c46a2bb0b733bff8751b1914",
      [
       null,
       {}
      ]
     ],
     "trusted-types-svg-script-set-href.html": [
-     "e437df360db5ec1866a84b6fa8a528bc32c04ab8",
+     "f339ba119a1b6bfa5368007db13cb338c368bd90",
      [
       null,
       {}
      ]
     ],
     "trusted-types-svg-script.html": [
-     "2fca03906ab3a4d5ab8bd9c9914601bb8fdad386",
+     "4fc3b710eb620c752ab50386ded8c16c75b5060f",
      [
       null,
       {}
@@ -819870,7 +822126,7 @@
      ]
     ],
     "image-decoder.https.any.js": [
-     "78eea763aaae2d1801946673c31ccdace0011a2e",
+     "1b3fabbfc4ae1879f816b01dac2c771d2cec2a69",
      [
       "webcodecs/image-decoder.https.any.html",
       {
@@ -819903,7 +822159,7 @@
      ]
     ],
     "per-frame-qp-encoding.https.any.js": [
-     "c4c49d81e55bab3a4a9009a8970aeea6224cdd5c",
+     "3669edc630bc4c008c42642c415e1775047cbd5c",
      [
       "webcodecs/per-frame-qp-encoding.https.any.html?av1",
       {
@@ -826715,7 +828971,7 @@
       ]
      ],
      "arg_min_max.https.any.js": [
-      "27425c9f35f5dfb30ed4dee173128e10ddb2e974",
+      "d047582ce7b56165bb456a245b59f51161d8b685",
       [
        "webnn/conformance_tests/arg_min_max.https.any.html?cpu",
        {
@@ -838346,7 +840602,7 @@
       ]
      ],
      "pooling.https.any.js": [
-      "d6d5a2a7afacda57da834c716bb128388adb14a5",
+      "e474faa241e1bbfb8e9c6d15c8a8d17023aae215",
       [
        "webnn/conformance_tests/pooling.https.any.html?cpu",
        {
@@ -860187,7 +862443,7 @@
      ]
     ],
     "RTCRtpTransceiver-setCodecPreferences.html": [
-     "b3129b49869fec05f351ff3403f785eb2fe1fcc3",
+     "407e855edbd2b05c88e1163ed76bb953e47eabda",
      [
       null,
       {}
@@ -860597,7 +862853,7 @@
       ]
      ],
      "h264-unidirectional-codec-offer.https.html": [
-      "08640e1f62f9b2bc39b6fd387b95ee6282bcdb08",
+      "708d59e52423dae56f05ca04f913938831ac3844",
       [
        null,
        {}
@@ -906479,7 +908735,7 @@
        },
        "context_destroyed": {
         "context_destroyed.py": [
-         "17f7acf2f9b68911b1c9fb2cf882918edf894a6a",
+         "ac964b67687805fa53d75e97e1cdc8f24c718479",
          [
           null,
           {}
@@ -907182,7 +909438,7 @@
          ]
         ],
         "files.py": [
-         "df91861752cf4cdc3ff267535d939b0127ca2994",
+         "8ebc8eafebab52b2189be10d0e4f3a6fc66fc857",
          [
           null,
           {}
@@ -907206,7 +909462,7 @@
         ]
        ],
        "navigation.py": [
-        "bced811a66ec4baf6e3f68e140fd5bdb105b4f5c",
+        "a16e2c52a617aedc2d86fa2922870d363c456294",
         [
          null,
          {}
@@ -907251,7 +909507,7 @@
          ]
         ],
         "stacktrace.py": [
-         "f9aab697bd802cdcb84e83933fd7a2139ed7c031",
+         "cd7c8434e772dd4f71516215123e021809f8479d",
          [
           null,
           {}
@@ -907313,7 +909569,7 @@
        },
        "auth_required": {
         "auth_required.py": [
-         "89fbb09fd54d4079b5a1f2795b792b8fccabeacf",
+         "96cecdf6b2a82352f69dee38b6796aa6dd079b8e",
          [
           null,
           {}
@@ -907329,7 +909585,7 @@
        },
        "before_request_sent": {
         "before_request_sent.py": [
-         "ebc3bf8fa86b2fec02737d23f1cd04a71d90321f",
+         "1449ec00bb1342385d7b834fc21a46d0497f362d",
          [
           null,
           {}
@@ -907492,7 +909748,7 @@
        },
        "fetch_error": {
         "fetch_error.py": [
-         "6beb33f7d69a189cd92d9e9ca371002e2b68369c",
+         "bdb66722ce9d231d0214d177f107a1dd3c5288cd",
          [
           null,
           {}
@@ -907572,7 +909828,7 @@
        },
        "response_completed": {
         "response_completed.py": [
-         "812df763bd680f8a7c934edfd1518f688b4e7d40",
+         "127416d8de41740b2b7199c93d1256f110c28ecb",
          [
           null,
           {}
@@ -907588,7 +909844,7 @@
        },
        "response_started": {
         "response_started.py": [
-         "25f1179f07af86920cdbd2ed1a236c95f5aff9b8",
+         "6ab3e1c3cace1069705f2bf979e843315ec39ca9",
          [
           null,
           {}
@@ -908061,7 +910317,7 @@
          ]
         ],
         "subscription_id.py": [
-         "36a57111f6d503aad3467162c2db102a5608a89d",
+         "d0e869e52d7e2c9dac1e2b3aacf3fb7ab6ddbfb8",
          [
           null,
           {}
@@ -908084,7 +910340,14 @@
          ]
         ],
         "invalid.py": [
-         "0b13e949673c198f89aba72388b4230cd8bc0a5b",
+         "3d532c8f28c6e5885a62cd17ae2d2e82cb47aaa8",
+         [
+          null,
+          {}
+         ]
+        ],
+        "subscriptions.py": [
+         "b79621ff5a1cac9d5f3bb50eedb4e1f2429f5e15",
          [
           null,
           {}
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
new file mode 100644
index 00000000000..3e054c75da9
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
@@ -0,0 +1,81 @@
+[animation-trigger-exit-range-end-computed.html]
+  [Property animation-trigger-exit-range-end value 'initial']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'COVER 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'COVER 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover 120%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value '0']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value '120%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value '120px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover -42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'contain 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit calc(41% + 1%)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit-crossing 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit 1%, cover 2%, contain 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit 1%, cover 2%, contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'entry 42px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'entry-crossing 42px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'contain calc(10% + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'entry 1em']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit calc(1em + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'exit']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
new file mode 100644
index 00000000000..d7a2b6934f9
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
@@ -0,0 +1,72 @@
+[animation-trigger-exit-range-end-valid.html]
+  [e.style['animation-trigger-exit-range-end'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover 120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "120px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover -42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "contain 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit 1%, cover 2%, contain 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit 1%, cover 2%, contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit-crossing 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "entry 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "entry-crossing 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "contain calc(10px + 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "entry 1em" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit calc(1em + 10px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "entry 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "exit" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
new file mode 100644
index 00000000000..27bdc461c08
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
@@ -0,0 +1,318 @@
+[animation-trigger-exit-range-shorthand.html]
+  [e.style['animation-trigger-exit-range'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry-crossing" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit-crossing" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry, exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 0% entry 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry-crossing 0% entry-crossing 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit 0% exit 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit-crossing 0% exit-crossing 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover 0% cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain 0% contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry calc(10% - 10%) entry calc(50% + 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry-crossing 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit-crossing 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 50px exit 100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit calc(10% + 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover 50% entry 50%, contain 50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal 100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "100px normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "10% normal" should set the property value]
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'normal normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry-crossing']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit-crossing']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry, exit']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry 0% entry 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry-crossing 0% entry-crossing 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit 0% exit 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit-crossing 0% exit-crossing 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'cover 0% cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'contain 0% contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry calc(10% - 10%) entry calc(50% + 50%)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'cover 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'contain 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry-crossing 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit-crossing 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry 50px exit 100px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'exit calc(10% + 50px)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry 50% exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'cover 50% entry 50%, contain 50% exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'entry 10em exit 20em']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value '10em exit 20em']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value 'normal 100px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value '100px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value '100px normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value '10% normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range value '10% calc(70% + 10% * sign(100em - 1px))']
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal normal" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal normal" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal normal" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 100%" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 100%" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 100%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 10%" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 10%" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal entry 10%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain 100% contain 0%" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain 100% contain 0%" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "contain 100% contain 0%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 10% exit 20%" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 10% exit 20%" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 10% exit 20%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry calc(10% + 10px) exit 20px" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry calc(10% + 10px) exit 20px" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry calc(10% + 10px) exit 20px" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry, exit" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry, exit" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry, exit" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 0%, exit" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 0%, exit" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "entry 0%, exit" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit calc(10% + 50px)" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit calc(10% + 50px)" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "exit calc(10% + 50px)" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "100px" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "100px" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "100px" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "10%" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "10%" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "10%" should not set unrelated longhands]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
new file mode 100644
index 00000000000..d8aa4b5aca5
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
@@ -0,0 +1,81 @@
+[animation-trigger-exit-range-start-computed.html]
+  [Property animation-trigger-exit-range-start value 'initial']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'COVER 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'COVER 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover 120%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value '0']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value '120%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value '120px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover -42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'contain 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit calc(41% + 1%)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit 1%, cover 2%, contain 0%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit 1%, cover 2%, contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit-crossing 42%']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'entry 42px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'entry-crossing 42px']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'contain calc(10% + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'entry 1em']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit calc(1em + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'exit']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
new file mode 100644
index 00000000000..fbac72e6ce1
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
@@ -0,0 +1,75 @@
+[animation-trigger-exit-range-start-valid.html]
+  [e.style['animation-trigger-exit-range-start'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover 120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "120px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover -42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "contain 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit 1%, cover 2%, contain 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit 1%, cover 2%, contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit-crossing 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "entry 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "entry-crossing 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "contain calc(10px + 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "entry 1em" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit calc(1em + 10px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "entry 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "cover calc(sign(100em - 1px) * 1%)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-computed.html.ini
new file mode 100644
index 00000000000..0d9cbedeff3
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-computed.html.ini
@@ -0,0 +1,81 @@
+[animation-trigger-range-end-computed.html]
+  [Property animation-trigger-range-end value 'initial']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'COVER 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'COVER 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover 120%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value '0']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value '120%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value '120px']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover -42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'contain 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit calc(41% + 1%)']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit-crossing 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit 1%, cover 2%, contain 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit 1%, cover 2%, contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'entry 42px']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'entry-crossing 42px']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'contain calc(10% + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'entry 1em']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit calc(1em + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-range-end value 'exit']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-valid.html.ini
new file mode 100644
index 00000000000..262197a997f
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-end-valid.html.ini
@@ -0,0 +1,72 @@
+[animation-trigger-range-end-valid.html]
+  [e.style['animation-trigger-range-end'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover 120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "120px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover -42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "contain 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit 1%, cover 2%, contain 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit 1%, cover 2%, contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit-crossing 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "entry 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "entry-crossing 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "contain calc(10px + 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "entry 1em" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit calc(1em + 10px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "entry 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-end'\] = "exit" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-shorthand.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-shorthand.html.ini
new file mode 100644
index 00000000000..6664d623fe2
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-shorthand.html.ini
@@ -0,0 +1,318 @@
+[animation-trigger-range-shorthand.html]
+  [e.style['animation-trigger-range'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry-crossing" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit-crossing" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry, exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 0% entry 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry-crossing 0% entry-crossing 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit 0% exit 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit-crossing 0% exit-crossing 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover 0% cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain 0% contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry calc(10% - 10%) entry calc(50% + 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry-crossing 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit-crossing 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 50px exit 100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit calc(10% + 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover 50% entry 50%, contain 50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "50% exit 50%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal 100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "100px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "100px normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "10% normal" should set the property value]
+    expected: FAIL
+
+  [Property animation-trigger-range value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'normal normal']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry-crossing']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit-crossing']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry, exit']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry 0% entry 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry-crossing 0% entry-crossing 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit 0% exit 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit-crossing 0% exit-crossing 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'cover 0% cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'contain 0% contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry calc(10% - 10%) entry calc(50% + 50%)']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'cover 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'contain 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry-crossing 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit-crossing 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry 50px exit 100px']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'exit calc(10% + 50px)']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry 50% exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'cover 50% entry 50%, contain 50% exit 50%']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'entry 10em exit 20em']
+    expected: FAIL
+
+  [Property animation-trigger-range value '10em exit 20em']
+    expected: FAIL
+
+  [Property animation-trigger-range value 'normal 100px']
+    expected: FAIL
+
+  [Property animation-trigger-range value '100px']
+    expected: FAIL
+
+  [Property animation-trigger-range value '100px normal']
+    expected: FAIL
+
+  [Property animation-trigger-range value '10% normal']
+    expected: FAIL
+
+  [Property animation-trigger-range value '10% calc(70% + 10% * sign(100em - 1px))']
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal normal" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal normal" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal normal" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 100%" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 100%" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 100%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 10%" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 10%" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "normal entry 10%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "cover" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain 100% contain 0%" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain 100% contain 0%" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "contain 100% contain 0%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 10% exit 20%" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 10% exit 20%" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 10% exit 20%" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry calc(10% + 10px) exit 20px" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry calc(10% + 10px) exit 20px" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry calc(10% + 10px) exit 20px" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry, exit" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry, exit" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry, exit" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 0%, exit" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 0%, exit" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "entry 0%, exit" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit calc(10% + 50px)" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit calc(10% + 50px)" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "exit calc(10% + 50px)" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "100px" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "100px" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "100px" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "10%" should set animation-trigger-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "10%" should set animation-trigger-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-range'\] = "10%" should not set unrelated longhands]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-computed.html.ini
new file mode 100644
index 00000000000..d53de83e9e4
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-computed.html.ini
@@ -0,0 +1,81 @@
+[animation-trigger-range-start-computed.html]
+  [Property animation-trigger-range-start value 'initial']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'normal']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'COVER 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'COVER 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover 120%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value '0']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value '120%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value '120px']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover -42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'contain 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit calc(41% + 1%)']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit 1%, cover 2%, contain 0%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit 1%, cover 2%, contain 100%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit-crossing 42%']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'entry 42px']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'entry-crossing 42px']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'contain calc(10% + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'entry 1em']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit calc(1em + 10px)']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'cover']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'contain']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'entry']
+    expected: FAIL
+
+  [Property animation-trigger-range-start value 'exit']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-valid.html.ini
new file mode 100644
index 00000000000..7946da01c60
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-range-start-valid.html.ini
@@ -0,0 +1,75 @@
+[animation-trigger-range-start-valid.html]
+  [e.style['animation-trigger-range-start'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover 120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "120%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "120px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover -42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "contain 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit 1%, cover 2%, contain 0%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit 1%, cover 2%, contain 100%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit-crossing 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "entry 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "entry-crossing 42px" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "contain calc(10px + 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "entry 1em" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit calc(1em + 10px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "entry 42%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "entry" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "exit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-range-start'\] = "cover calc(sign(100em - 1px) * 1%)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html.ini
new file mode 100644
index 00000000000..d9e489b9db1
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html.ini
@@ -0,0 +1,147 @@
+[animation-trigger-timeline-parsing.tentative.html]
+  [e.style['animation-trigger-timeline'\] = "initial" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "inherit" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "unset" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "revert" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "auto, auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "none, none" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "auto, none" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "none, auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "--test" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "--test1, --test2" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "--test1, --test2, none, --test3, auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll()" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = " scroll() " should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(block)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(inline)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(x)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(y)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(root)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(nearest)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(self)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(inline nearest)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(nearest inline)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(block self)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(self block)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "scroll(y root)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view()" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = " view() " should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(block)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(inline)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(x)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y 1px 2px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y 1px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y auto)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y auto auto)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(y auto 1px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px 2px y)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px y)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(auto x)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px 2px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px 1px)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(1px auto)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(auto calc(1% + 1px))" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(2em calc(1% + 1em))" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(auto)" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-timeline'\] = "view(auto auto)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-computed.tentative.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-computed.tentative.html.ini
new file mode 100644
index 00000000000..8064c7ae79a
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-computed.tentative.html.ini
@@ -0,0 +1,3 @@
+[animation-trigger-type-computed.tentative.html]
+  [Property animation-trigger-type value 'once, repeat, alternate, state']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-valid.tentative.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-valid.tentative.html.ini
new file mode 100644
index 00000000000..1cbd271fcab
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-type-valid.tentative.html.ini
@@ -0,0 +1,21 @@
+[animation-trigger-type-valid.tentative.html]
+  [e.style['animation-trigger-type'\] = "once" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "repeat" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "alternate" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "state" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "once, repeat" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "once, repeat, alternate" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-type'\] = "once, repeat, alternate, state" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html.ini
new file mode 100644
index 00000000000..fe5ec79e0aa
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html.ini
@@ -0,0 +1,2 @@
+[scroll-state-scrollable-body-001.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html.ini
new file mode 100644
index 00000000000..63992555ed6
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html.ini
@@ -0,0 +1,2 @@
+[scroll-state-scrollable-body-002.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html.ini
new file mode 100644
index 00000000000..adf981eabc4
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html.ini
@@ -0,0 +1,2 @@
+[scroll-state-scrollable-root.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-fonts/font-weight-sign-function.html.ini b/tests/wpt/meta/css/css-fonts/font-weight-sign-function.html.ini
new file mode 100644
index 00000000000..a3c8e360678
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/font-weight-sign-function.html.ini
@@ -0,0 +1,9 @@
+[font-weight-sign-function.html]
+  [Property font-weight value 'calc(sign(1rem - 1px) * 10)']
+    expected: FAIL
+
+  [Property font-weight value 'calc(sign(1rem - 1px) * -10000)']
+    expected: FAIL
+
+  [Property font-weight value 'calc(sign(1rem - 1px) * 10000)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini b/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
new file mode 100644
index 00000000000..3a49b1c181e
--- /dev/null
+++ b/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
@@ -0,0 +1,207 @@
+[at-function-parsing.html]
+  [@function --foo() is valid]
+    expected: FAIL
+
+  [@function --foo( ) is valid]
+    expected: FAIL
+
+  [@function --foo(--x) is valid]
+    expected: FAIL
+
+  [@function --foo( --x ) is valid]
+    expected: FAIL
+
+  [@function --foo () is invalid]
+    expected: FAIL
+
+  [@function --foo (--x) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x auto) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <angle>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <color>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <custom-ident>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <image>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <integer>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length-percentage>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <number>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <percentage>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <resolution>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <string>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <time>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <url>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-function>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-list>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(auto)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(<length>)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(<length> | auto)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(none | auto)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(*)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x, --y) is valid]
+    expected: FAIL
+
+  [@function --foo(--x, --y, --z) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length>, --y, --z) is valid]
+    expected: FAIL
+
+  [@function --foo(--x, --y <number>, --z <angle>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x : 10px) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length>: 10px) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length>: 10px, --y) is valid]
+    expected: FAIL
+
+  [@function --foo(--x, --y <length>: 10px) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(<length> | auto): auto) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(<length> | auto) : auto) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <angle>: 10px) is valid]
+    expected: FAIL
+
+  [@function --foo(--x: 10px !important) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x <length>#) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <length>+) is valid]
+    expected: FAIL
+
+  [@function --foo(--x type(<length>+)) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-function>#) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-function>+) is valid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-list>#) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x <transform-list>+) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x *) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x !) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x 50px) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x <length> | auto) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x none | auto) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x <dino>) is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns type(*) is valid]
+    expected: FAIL
+
+  [@function --foo(--x) returns <length> is valid]
+    expected: FAIL
+
+  [@function --foo(--x) returns <length>+ is valid]
+    expected: FAIL
+
+  [@function --foo(--x) returns type(<length>) is valid]
+    expected: FAIL
+
+  [@function --foo(--x) returns type(<length> | auto) is valid]
+    expected: FAIL
+
+  [@function --foo(--x) returns type(foo | bar) is valid]
+    expected: FAIL
+
+  [@function --foo(--x) ! is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) length is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns  is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns * is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns <transform-list># is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns <transform-list>+ is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returns auto | none is invalid]
+    expected: FAIL
+
+  [@function --foo(--x): <length> is invalid]
+    expected: FAIL
+
+  [@function --foo(--x): length is invalid]
+    expected: FAIL
+
+  [@function --foo(--x) returneth <length> is invalid]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-mixins/dashed-function-eval.html.ini b/tests/wpt/meta/css/css-mixins/dashed-function-eval.html.ini
new file mode 100644
index 00000000000..a96214a8f23
--- /dev/null
+++ b/tests/wpt/meta/css/css-mixins/dashed-function-eval.html.ini
@@ -0,0 +1,105 @@
+[dashed-function-eval.html]
+  [Literal result]
+    expected: FAIL
+
+  [Literal result, typed return]
+    expected: FAIL
+
+  [Literal result, typed return, calc]
+    expected: FAIL
+
+  [Literal result, typed return, mismatch]
+    expected: FAIL
+
+  [Missing result descriptor]
+    expected: FAIL
+
+  [Literal result, empty]
+    expected: FAIL
+
+  [result cascading behavior]
+    expected: FAIL
+
+  [Another dashed-function in result]
+    expected: FAIL
+
+  [Unused argument]
+    expected: FAIL
+
+  [Single parameter]
+    expected: FAIL
+
+  [Multiple parameters]
+    expected: FAIL
+
+  [Single parameter, typed]
+    expected: FAIL
+
+  [Typed parameter with calc()]
+    expected: FAIL
+
+  [Untyped parameter with calc()]
+    expected: FAIL
+
+  [Various typed parameters]
+    expected: FAIL
+
+  [Parameter with complex type (auto)]
+    expected: FAIL
+
+  [Parameter with complex type (px)]
+    expected: FAIL
+
+  [Passing argument to inner function]
+    expected: FAIL
+
+  [var() in argument resolved before call]
+    expected: FAIL
+
+  [var() in argument resolved before call, typed]
+    expected: FAIL
+
+  [Single parameter with default value]
+    expected: FAIL
+
+  [Multiple parameters with defaults]
+    expected: FAIL
+
+  [Multiple parameters with defaults, typed]
+    expected: FAIL
+
+  [Unused local]
+    expected: FAIL
+
+  [Local does not affect outer scope]
+    expected: FAIL
+
+  [Substituting local in result]
+    expected: FAIL
+
+  [Substituting multiple locals in result]
+    expected: FAIL
+
+  [Local referring to another local]
+    expected: FAIL
+
+  [Locals appearing after result]
+    expected: FAIL
+
+  [Locals cascading behavior]
+    expected: FAIL
+
+  [Custom properties are visible inside function]
+    expected: FAIL
+
+  [Parameter shadows custom property]
+    expected: FAIL
+
+  [Local shadows parameter]
+    expected: FAIL
+
+  [Missing only argument]
+    expected: FAIL
+
+  [Missing one argument of several]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-buttons-valid.html.ini b/tests/wpt/meta/css/css-overflow/parsing/scroll-buttons-valid.html.ini
similarity index 88%
rename from tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-buttons-valid.html.ini
rename to tests/wpt/meta/css/css-overflow/parsing/scroll-buttons-valid.html.ini
index 0cab1174854..a26572901cf 100644
--- a/tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-buttons-valid.html.ini
+++ b/tests/wpt/meta/css/css-overflow/parsing/scroll-buttons-valid.html.ini
@@ -23,6 +23,21 @@
   ["::scroll-button(block-end)" should be a valid selector]
     expected: FAIL
 
+  ["::scroll-button(*)" should be a valid selector]
+    expected: FAIL
+
+  ["::scroll-button( up)" should be a valid selector]
+    expected: FAIL
+
+  ["::scroll-button(up )" should be a valid selector]
+    expected: FAIL
+
+  ["::scroll-button( *)" should be a valid selector]
+    expected: FAIL
+
+  ["::scroll-button(* )" should be a valid selector]
+    expected: FAIL
+
   ["::scroll-button(up):focus" should be a valid selector]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-markers-computed.html.ini b/tests/wpt/meta/css/css-overflow/parsing/scroll-markers-computed.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-markers-computed.html.ini
rename to tests/wpt/meta/css/css-overflow/parsing/scroll-markers-computed.html.ini
diff --git a/tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-markers-valid.html.ini b/tests/wpt/meta/css/css-overflow/parsing/scroll-markers-valid.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-overflow/parsing/parsing/scroll-markers-valid.html.ini
rename to tests/wpt/meta/css/css-overflow/parsing/scroll-markers-valid.html.ini
diff --git a/tests/wpt/meta/css/css-overflow/scroll-buttons-003.html.ini b/tests/wpt/meta/css/css-overflow/scroll-buttons-003.html.ini
new file mode 100644
index 00000000000..f6dcb84e884
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-buttons-003.html.ini
@@ -0,0 +1,2 @@
+[scroll-buttons-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-buttons-004.html.ini b/tests/wpt/meta/css/css-overflow/scroll-buttons-004.html.ini
new file mode 100644
index 00000000000..8d10f1da220
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-buttons-004.html.ini
@@ -0,0 +1,2 @@
+[scroll-buttons-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-buttons-disabled-snapping.html.ini b/tests/wpt/meta/css/css-overflow/scroll-buttons-disabled-snapping.html.ini
new file mode 100644
index 00000000000..35d10862abf
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-buttons-disabled-snapping.html.ini
@@ -0,0 +1,2 @@
+[scroll-buttons-disabled-snapping.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-tables/table-cell-overflow-auto-scrolled.html.ini b/tests/wpt/meta/css/css-tables/table-cell-overflow-auto-scrolled.html.ini
new file mode 100644
index 00000000000..55805c45ee2
--- /dev/null
+++ b/tests/wpt/meta/css/css-tables/table-cell-overflow-auto-scrolled.html.ini
@@ -0,0 +1,2 @@
+[table-cell-overflow-auto-scrolled.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/after-change-style-inherited-try-fallback.html.ini b/tests/wpt/meta/css/css-transitions/after-change-style-inherited-try-fallback.html.ini
new file mode 100644
index 00000000000..4d9e031dd40
--- /dev/null
+++ b/tests/wpt/meta/css/css-transitions/after-change-style-inherited-try-fallback.html.ini
@@ -0,0 +1,3 @@
+[after-change-style-inherited-try-fallback.html]
+  [Position fallback correctly applied to after-change style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/after-change-style-inherited.html.ini b/tests/wpt/meta/css/css-transitions/after-change-style-inherited.html.ini
index 2d014b1a529..e58632ef1c7 100644
--- a/tests/wpt/meta/css/css-transitions/after-change-style-inherited.html.ini
+++ b/tests/wpt/meta/css/css-transitions/after-change-style-inherited.html.ini
@@ -7,3 +7,9 @@
 
   [Start inner transitions based on inherited after-change color and word-spacing from two different ancestors]
     expected: FAIL
+
+  [@starting-style rules should not apply to after-change style]
+    expected: FAIL
+
+  [@container rules apply to after-change style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/interactivity-inert-focus.tentative.html.ini b/tests/wpt/meta/css/css-ui/interactivity-inert-focus.html.ini
similarity index 51%
rename from tests/wpt/meta/css/css-ui/interactivity-inert-focus.tentative.html.ini
rename to tests/wpt/meta/css/css-ui/interactivity-inert-focus.html.ini
index e38d83a2896..4d69196564f 100644
--- a/tests/wpt/meta/css/css-ui/interactivity-inert-focus.tentative.html.ini
+++ b/tests/wpt/meta/css/css-ui/interactivity-inert-focus.html.ini
@@ -1,3 +1,3 @@
-[interactivity-inert-focus.tentative.html]
+[interactivity-inert-focus.html]
   [Try focus inert input]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/interactivity-inert-html-attribute-ua.html.ini b/tests/wpt/meta/css/css-ui/interactivity-inert-html-attribute-ua.html.ini
new file mode 100644
index 00000000000..cb80148457d
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/interactivity-inert-html-attribute-ua.html.ini
@@ -0,0 +1,12 @@
+[interactivity-inert-html-attribute-ua.html]
+  [[inert\] { interactivity: inert }]
+    expected: FAIL
+
+  [[inert\] { interactivity: inert } inherited]
+    expected: FAIL
+
+  [Author interactivity:auto overrides inherited UA [inert\] { interactivity: inert }]
+    expected: FAIL
+
+  [Author interactivity:auto overrides UA [inert\] { interactivity: inert }]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/interactivity-inert-modal-dialog-ua.html.ini b/tests/wpt/meta/css/css-ui/interactivity-inert-modal-dialog-ua.html.ini
new file mode 100644
index 00000000000..5a488db36a3
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/interactivity-inert-modal-dialog-ua.html.ini
@@ -0,0 +1,15 @@
+[interactivity-inert-modal-dialog-ua.html]
+  [UA dialog:modal interactivity rule]
+    expected: FAIL
+
+  [UA dialog:modal inert rule wins over [inert\] rule]
+    expected: FAIL
+
+  [UA dialog:modal rule overriding inherited [inert\] 'interactivity:inert' rule]
+    expected: FAIL
+
+  [UA [inert\] rule overriding inherited dialog:modal 'interactivity:auto' rule]
+    expected: FAIL
+
+  [Author 'interactivity:inert' overrides UA dialog:modal 'interactivity:auto' rule]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/interactivity-computed.tentative.html.ini b/tests/wpt/meta/css/css-ui/parsing/interactivity-computed.html.ini
similarity index 99%
rename from tests/wpt/meta/css/css-ui/parsing/interactivity-computed.tentative.html.ini
rename to tests/wpt/meta/css/css-ui/parsing/interactivity-computed.html.ini
index 47e5e701f31..4ab1e1a3d1f 100644
--- a/tests/wpt/meta/css/css-ui/parsing/interactivity-computed.tentative.html.ini
+++ b/tests/wpt/meta/css/css-ui/parsing/interactivity-computed.html.ini
@@ -1,4 +1,4 @@
-[interactivity-computed.tentative.html]
+[interactivity-computed.html]
   [Property interactivity value 'auto']
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-ui/parsing/interactivity.tentative.html.ini b/tests/wpt/meta/css/css-ui/parsing/interactivity.html.ini
similarity index 94%
rename from tests/wpt/meta/css/css-ui/parsing/interactivity.tentative.html.ini
rename to tests/wpt/meta/css/css-ui/parsing/interactivity.html.ini
index 1684fcbd542..b7115db5502 100644
--- a/tests/wpt/meta/css/css-ui/parsing/interactivity.tentative.html.ini
+++ b/tests/wpt/meta/css/css-ui/parsing/interactivity.html.ini
@@ -1,4 +1,4 @@
-[interactivity.tentative.html]
+[interactivity.html]
   [e.style['interactivity'\] = "auto" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
index d2b92ccca5a..8064d52e0c7 100644
--- a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
+++ b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
@@ -134,6 +134,12 @@
   [from(): Abort after complete does NOT call IteratorRecord#return()]
     expected: FAIL
 
+  [from(): [Symbol.iterator\] not callable AFTER SUBSCRIBE throws]
+    expected: FAIL
+
+  [from(): [Symbol.iterator\] returns null AFTER SUBSCRIBE throws]
+    expected: FAIL
+
 
 [observable-from.any.html]
   [from(): Observable.from() is a function]
@@ -270,3 +276,9 @@
 
   [from(): Abort after complete does NOT call IteratorRecord#return()]
     expected: FAIL
+
+  [from(): [Symbol.iterator\] not callable AFTER SUBSCRIBE throws]
+    expected: FAIL
+
+  [from(): [Symbol.iterator\] returns null AFTER SUBSCRIBE throws]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/new-window.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/new-window.tentative.https.window.js.ini
index da97254b909..f98bae8eaa9 100644
--- a/tests/wpt/meta/fetch/fetch-later/new-window.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/fetch-later/new-window.tentative.https.window.js.ini
@@ -1,5 +1,4 @@
 [new-window.tentative.https.window.html]
-  expected: TIMEOUT
   [A blank window[target=''\][features='0'\] can trigger fetchLater.]
     expected: FAIL
 
@@ -53,3 +52,39 @@
 
   [A cross-origin window[target='_blank'\][features='2'\] can trigger fetchLater.]
     expected: TIMEOUT
+
+  [A blank window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target=''\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target=''\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target='_blank'\][features=''\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A blank window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A same-origin window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
+
+  [A cross-origin window[target='_blank'\][features='popup'\] can trigger fetchLater.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
index f3cd0733134..494514918ce 100644
--- a/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js.ini
@@ -7,3 +7,9 @@
 
   [Permissions policy allow="deferred-fetch" allows cross-origin navigation in an iframe.]
     expected: FAIL
+
+  [Permissions policy allow="deferred-fetch" allows fetchLater() from a redirected same-origin iframe.]
+    expected: FAIL
+
+  [Permissions policy allow="deferred-fetch" disallows fetchLater() from a redirected cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
index a6ffb5ee65a..babbbad4b4b 100644
--- a/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js.ini
@@ -7,3 +7,6 @@
 
   [Default "deferred-fetch" permissions policy ["self"\] allows fetchLater() in the cross-origin iframe.]
     expected: FAIL
+
+  [Default "deferred-fetch-minimal" permissions policy ["*"\] allows fetchLater() in the cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini
deleted file mode 100644
index cbea9fe50e6..00000000000
--- a/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini
+++ /dev/null
@@ -1,102 +0,0 @@
-[quota.tentative.https.window.html]
-  [A fetchLater() call accept small data in POST request of String.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of ArrayBuffer.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of FormData.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of URLSearchParams.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of Blob.]
-    expected: FAIL
-
-  [A fetchLater() call accept small data in POST request of File.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of String.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call takes up the per-origin quota for its body of File.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of String.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of FormData.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of URLSearchParams.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call does not accept empty data in POST request of File.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [A single fetchLater() call is not allowed to exceed per-origin quota for its body of File.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call is not allowed to exceed per-origin quota for its body of File.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of String.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of ArrayBuffer.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of FormData.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of URLSearchParams.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of Blob.]
-    expected: FAIL
-
-  [The 2nd fetchLater() call to another origin does not exceed per-origin quota for its body of File.]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..7e8ce796939
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,3 @@
+[accumulated-oversized-payload.tentative.https.window.html]
+  [The 2nd fetchLater(same-origin) call in the top-level document is not allowed to exceed per-origin quota for its POST body of String.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..ef2b2ba4659
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,3 @@
+[accumulated-oversized-payload.tentative.https.window.html]
+  [The 2nd fetchLater(same-origin) call in a default cross-origin child iframe has its owned per-origin quota for a request POST body of String.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..f771f079982
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js.ini
@@ -0,0 +1,19 @@
+[empty-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() does not accept empty POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of ArrayBuffer in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts a non-empty POST request body of FormData in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of URLSearchParams in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of Blob in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of File in a default cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..3efe794ff69
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js.ini
@@ -0,0 +1,13 @@
+[max-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() accepts max payload in a parent-frame-origin POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() rejects max+1 payload in a parent-frame-origin POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts max payload in a self-frame-origin POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() rejects max+1 payload in a self-frame-origin POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js.ini
new file mode 100644
index 00000000000..6528835fb86
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js.ini
@@ -0,0 +1,3 @@
+[multiple-iframes.tentative.https.window.html]
+  [fetchLater() request quota are delegated to cross-origin iframes and not shared, even if they are same origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..5aff34a1a85
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,19 @@
+[oversized-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of ArrayBuffer in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of FormData in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of URLSearchParams in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of Blob in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=8193\] exceeding per-origin quota in a POST request body of File in a default cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..80707ecb2ed
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js.ini
@@ -0,0 +1,19 @@
+[small-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() accepts payload[size=20\] in a POST request body of String in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of ArrayBuffer in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of FormData in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of URLSearchParams in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of Blob in a default cross-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of File in a default cross-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/empty-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/empty-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..d02839eeebb
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/empty-payload.tentative.https.window.js.ini
@@ -0,0 +1,25 @@
+[empty-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() does not accept an empty POST request body of String.]
+    expected: FAIL
+
+  [fetchLater() does not accept an empty POST request body of ArrayBuffer.]
+    expected: FAIL
+
+  [fetchLater() does not accept an empty POST request body of URLSearchParams.]
+    expected: FAIL
+
+  [fetchLater() does not accept an empty POST request body of Blob.]
+    expected: FAIL
+
+  [fetchLater() does not accept an empty POST request body of File.]
+    expected: FAIL
+
+  [fetchLater() accept a GET request.]
+    expected: FAIL
+
+  [fetchLater() accept a DELETE request.]
+    expected: FAIL
+
+  [fetchLater() accept a PUT request.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/max-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/max-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..a39bb1bb85d
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/max-payload.tentative.https.window.js.ini
@@ -0,0 +1,6 @@
+[max-payload.tentative.https.window.html]
+  [fetchLater() accepts max payload in a POST request body of String.]
+    expected: FAIL
+
+  [fetchLater() rejects max+1 payload in a POST request body of String.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js.ini
new file mode 100644
index 00000000000..da1f2fd6e5a
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js.ini
@@ -0,0 +1,18 @@
+[multiple-origins.tentative.https.window.html]
+  [fetchLater() has per-request-origin quota for its POST body of String.]
+    expected: FAIL
+
+  [fetchLater() has per-request-origin quota for its POST body of ArrayBuffer.]
+    expected: FAIL
+
+  [fetchLater() has per-request-origin quota for its POST body of FormData.]
+    expected: FAIL
+
+  [fetchLater() has per-request-origin quota for its POST body of URLSearchParams.]
+    expected: FAIL
+
+  [fetchLater() has per-request-origin quota for its POST body of Blob.]
+    expected: FAIL
+
+  [fetchLater() has per-request-origin quota for its POST body of File.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..b722c69f994
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,18 @@
+[oversized-payload.tentative.https.window.html]
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of String.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of ArrayBuffer.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of FormData.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of URLSearchParams.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of Blob.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of File.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..1a76ff7c3a1
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,3 @@
+[accumulated-oversized-payload.tentative.https.window.html]
+  [The 2nd fetchLater(same-origin) call in a same-origin child iframe is not allowed to exceed per-origin quota for its POST body of String.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..ff382468d24
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js.ini
@@ -0,0 +1,18 @@
+[empty-payload.tentative.https.window.html]
+  [fetchLater() does not accept empty POST request body of String in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of ArrayBuffer in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts a non-empty POST request body of FormData in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of URLSearchParams in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of Blob in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept empty POST request body of File in same-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..38b9ade3bf9
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js.ini
@@ -0,0 +1,7 @@
+[max-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() accepts max payload in a POST request body of String in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() rejects max+1 payload in a POST request body of String in same-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js.ini
new file mode 100644
index 00000000000..20dff54a6b2
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js.ini
@@ -0,0 +1,3 @@
+[multiple-iframes.tentative.https.window.html]
+  [fetchLater() request quota are shared by same-origin iframes and root.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..967a5e13445
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js.ini
@@ -0,0 +1,19 @@
+[oversized-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of String in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of ArrayBuffer in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of FormData in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of URLSearchParams in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of Blob in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() does not accept payload[size=65537\] exceeding per-origin quota in a POST request body of File in same-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..4f3e8035808
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js.ini
@@ -0,0 +1,19 @@
+[small-payload.tentative.https.window.html]
+  expected: ERROR
+  [fetchLater() accepts payload[size=20\] in a POST request body of String in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of ArrayBuffer in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of FormData in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of URLSearchParams in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of Blob in same-origin iframe.]
+    expected: FAIL
+
+  [fetchLater() accepts payload[size=20\] in a POST request body of File in same-origin iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota/small-payload.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota/small-payload.tentative.https.window.js.ini
new file mode 100644
index 00000000000..7ce30aea5fe
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota/small-payload.tentative.https.window.js.ini
@@ -0,0 +1,18 @@
+[small-payload.tentative.https.window.html]
+  [fetchLater() accepts small payload in a POST request body of String.]
+    expected: FAIL
+
+  [fetchLater() accepts small payload in a POST request body of ArrayBuffer.]
+    expected: FAIL
+
+  [fetchLater() accepts small payload in a POST request body of FormData.]
+    expected: FAIL
+
+  [fetchLater() accepts small payload in a POST request body of URLSearchParams.]
+    expected: FAIL
+
+  [fetchLater() accepts small payload in a POST request body of Blob.]
+    expected: FAIL
+
+  [fetchLater() accepts small payload in a POST request body of File.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
index 2254c59cae9..af4a680bb7a 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
@@ -49,3 +49,6 @@
 
   [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
     expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
deleted file mode 100644
index 3e07e6b7d1f..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[empty-iframe-load-event.html]
-  [Check execution order from nested timeout]
-    expected: FAIL
-
-  [Check execution order on load handler]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 5f9a07f92f0..dc1144214ef 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -4,3 +4,6 @@
 
   [Navigating to a different document with form submission]
     expected: FAIL
+
+  [Navigating to a different document with link click]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
deleted file mode 100644
index 4ecd6d9f753..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-cross-origin.sub.window.html]
-  [Cross-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
new file mode 100644
index 00000000000..4079a78d16a
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.clear.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.clear.html]
+  [Canvas test: 2d.composite.canvas.clear]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
new file mode 100644
index 00000000000..9b8a14aa5fe
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.copy.html]
+  [Canvas test: 2d.composite.canvas.copy]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
new file mode 100644
index 00000000000..20a2da80676
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-atop.html]
+  [Canvas test: 2d.composite.canvas.destination-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
new file mode 100644
index 00000000000..a1497f7d632
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-in.html]
+  [Canvas test: 2d.composite.canvas.destination-in]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
new file mode 100644
index 00000000000..bdab5db6d8a
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-out.html]
+  [Canvas test: 2d.composite.canvas.destination-out]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
new file mode 100644
index 00000000000..2f0b128e4ba
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.destination-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.destination-over.html]
+  [Canvas test: 2d.composite.canvas.destination-over]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
new file mode 100644
index 00000000000..24212fa20b5
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.lighter.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.lighter.html]
+  [Canvas test: 2d.composite.canvas.lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
new file mode 100644
index 00000000000..26b52ce07b8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-atop.html]
+  [Canvas test: 2d.composite.canvas.source-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
new file mode 100644
index 00000000000..cda30c11767
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-in.html]
+  [Canvas test: 2d.composite.canvas.source-in]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
new file mode 100644
index 00000000000..57e22a58425
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-out.html]
+  [Canvas test: 2d.composite.canvas.source-out]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
new file mode 100644
index 00000000000..3e5313ea490
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.source-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.source-over.html]
+  [Canvas test: 2d.composite.canvas.source-over]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
new file mode 100644
index 00000000000..d790a042936
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.canvas.xor.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.canvas.xor.html]
+  [Canvas test: 2d.composite.canvas.xor]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.clear.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.clear.html.ini
new file mode 100644
index 00000000000..302cddc7b78
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.clear.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.clear.html]
+  [Canvas test: 2d.composite.image.clear]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.copy.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.copy.html.ini
new file mode 100644
index 00000000000..610a0472170
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.copy.html]
+  [Canvas test: 2d.composite.image.copy]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
new file mode 100644
index 00000000000..38182bcd2f2
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-atop.html]
+  [Canvas test: 2d.composite.image.destination-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
new file mode 100644
index 00000000000..a99c0937565
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-in.html]
+  [Canvas test: 2d.composite.image.destination-in]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
new file mode 100644
index 00000000000..532121882ce
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-out.html]
+  [Canvas test: 2d.composite.image.destination-out]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
new file mode 100644
index 00000000000..bf68e252e89
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.destination-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.destination-over.html]
+  [Canvas test: 2d.composite.image.destination-over]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.lighter.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
new file mode 100644
index 00000000000..ac3f845a7cf
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.lighter.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.lighter.html]
+  [Canvas test: 2d.composite.image.lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
new file mode 100644
index 00000000000..800305317cc
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-atop.html]
+  [Canvas test: 2d.composite.image.source-atop]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
new file mode 100644
index 00000000000..f3bac4acfdf
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-in.html]
+  [Canvas test: 2d.composite.image.source-in]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
new file mode 100644
index 00000000000..e7996ef4a24
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-out.html]
+  [Canvas test: 2d.composite.image.source-out]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-over.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
new file mode 100644
index 00000000000..8b0ccbe6a7d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.source-over.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.source-over.html]
+  [Canvas test: 2d.composite.image.source-over]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.xor.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.xor.html.ini
new file mode 100644
index 00000000000..96070ad678d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.image.xor.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.image.xor.html]
+  [Canvas test: 2d.composite.image.xor]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
new file mode 100644
index 00000000000..2c46f0a0b9a
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.copy.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
new file mode 100644
index 00000000000..a7acca01fa8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.destination-atop.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
new file mode 100644
index 00000000000..35b5db3cf46
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.destination-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
new file mode 100644
index 00000000000..42f259084ec
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.source-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
new file mode 100644
index 00000000000..c255d31caf8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.image.source-out.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
new file mode 100644
index 00000000000..5cebde631f0
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.copy.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
new file mode 100644
index 00000000000..ae4eaab38cf
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.destination-atop.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
new file mode 100644
index 00000000000..6b81c8a8f83
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.destination-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
new file mode 100644
index 00000000000..a776182d23e
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.source-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
new file mode 100644
index 00000000000..cd9650f7534
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html.ini
@@ -0,0 +1,3 @@
+[2d.composite.uncovered.pattern.source-out.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
index 5d2657041d1..7e036a1c4e4 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
@@ -1,5 +1,5 @@
 [createImageBitmap-transfer.html]
-  expected: ERROR
+  expected: TIMEOUT
   [Transfer ImageBitmap created from a vector HTMLImageElement]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html.ini
new file mode 100644
index 00000000000..641466e2efe
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.direction.inherit.canvas.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html.ini
new file mode 100644
index 00000000000..e9a9563c60a
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.direction.inherit.disconnected.canvas.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html.ini
new file mode 100644
index 00000000000..4cbf36b13d3
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.direction.inherit.document.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html.ini
new file mode 100644
index 00000000000..7bd9a875903
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.direction.inherit.style.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
new file mode 100644
index 00000000000..5cdcce07c65
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.disconnected.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html.ini
new file mode 100644
index 00000000000..f75841ed095
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.direction.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html.ini
new file mode 100644
index 00000000000..512cf5009ed
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.transferred.direction.inherit.document.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html.ini
new file mode 100644
index 00000000000..f00c57645a4
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.transferred.direction.inherit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html.ini
new file mode 100644
index 00000000000..032f934ffeb
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.worker.direction.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini b/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
index f7ad7c80178..e6e755c4126 100644
--- a/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
+++ b/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
@@ -8,3 +8,39 @@
 
   [destination: script]
     expected: FAIL
+
+  [[dedicated worker\] same-origin]
+    expected: FAIL
+
+  [[dedicated worker\] blocked by CORP: same-origin]
+    expected: FAIL
+
+  [[dedicated worker\] blocked due to DIP]
+    expected: FAIL
+
+  [[dedicated worker\] blocked during redirect]
+    expected: FAIL
+
+  [[shared worker\] same-origin]
+    expected: FAIL
+
+  [[shared worker\] blocked by CORP: same-origin]
+    expected: FAIL
+
+  [[shared worker\] blocked due to DIP]
+    expected: FAIL
+
+  [[shared worker\] blocked during redirect]
+    expected: FAIL
+
+  [[between service worker and page\] same-origin]
+    expected: FAIL
+
+  [[between service worker and page\] blocked by CORP: same-origin]
+    expected: FAIL
+
+  [[between service worker and page\] blocked due to DIP]
+    expected: FAIL
+
+  [[between service worker and page\] blocked during redirect]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/idlharness.any.js.ini b/tests/wpt/meta/html/dom/idlharness.any.js.ini
index 3cccad9d350..c1e4f6c3085 100644
--- a/tests/wpt/meta/html/dom/idlharness.any.js.ini
+++ b/tests/wpt/meta/html/dom/idlharness.any.js.ini
@@ -251,6 +251,9 @@
   [WorkerNavigator interface: self.navigator must inherit property "onLine" with the proper type]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
+    expected: FAIL
+
 
 [idlharness.any.shadowrealm-in-window.html]
   expected: ERROR
diff --git a/tests/wpt/meta/html/dom/idlharness.https.html.ini b/tests/wpt/meta/html/dom/idlharness.https.html.ini
index ae8c5fba665..13460de7f7a 100644
--- a/tests/wpt/meta/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta/html/dom/idlharness.https.html.ini
@@ -5918,6 +5918,9 @@
   [Element interface: operation getHTML(optional GetHTMLOptions)]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.+]
   [HTMLAllCollection interface: existence and properties of interface object]
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index c6f1e5d7d84..a6591b318dc 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/popovers/popover-css-properties.tentative.html.ini b/tests/wpt/meta/html/semantics/popovers/popover-css-properties.tentative.html.ini
deleted file mode 100644
index 5fc3e9ddd42..00000000000
--- a/tests/wpt/meta/html/semantics/popovers/popover-css-properties.tentative.html.ini
+++ /dev/null
@@ -1,198 +0,0 @@
-[popover-css-properties.tentative.html]
-  [Property popover-show-delay value '0s']
-    expected: FAIL
-
-  [Property popover-show-delay value '0ms']
-    expected: FAIL
-
-  [Property popover-show-delay value '32s']
-    expected: FAIL
-
-  [Property popover-show-delay value '123ms']
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "0s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "0ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "32s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "123ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-show-delay'\] = "inherit" should set the property value]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Property popover-hide-delay value '0s']
-    expected: FAIL
-
-  [Property popover-hide-delay value '0ms']
-    expected: FAIL
-
-  [Property popover-hide-delay value '32s']
-    expected: FAIL
-
-  [Property popover-hide-delay value '123ms']
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "0s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "0ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "32s" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "123ms" should set the property value]
-    expected: FAIL
-
-  [e.style['popover-hide-delay'\] = "inherit" should set the property value]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [CSS Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
-    expected: FAIL
-
-  [Web Animations: property <popover-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/interest-target/idlharness.tentative.html.ini b/tests/wpt/meta/html/semantics/the-button-element/interest-target/idlharness.tentative.html.ini
new file mode 100644
index 00000000000..b4c88d884e7
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/the-button-element/interest-target/idlharness.tentative.html.ini
@@ -0,0 +1,54 @@
+[idlharness.tentative.html]
+  [InterestEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [InterestEvent interface object length]
+    expected: FAIL
+
+  [InterestEvent interface object name]
+    expected: FAIL
+
+  [InterestEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [InterestEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [InterestEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [InterestEvent interface: attribute source]
+    expected: FAIL
+
+  [InterestEvent must be primary interface of new InterestEvent("interest")]
+    expected: FAIL
+
+  [Stringification of new InterestEvent("interest")]
+    expected: FAIL
+
+  [InterestEvent interface: new InterestEvent("interest") must inherit property "source" with the proper type]
+    expected: FAIL
+
+  [HTMLAnchorElement interface: attribute interestTargetElement]
+    expected: FAIL
+
+  [HTMLAnchorElement interface: document.createElement("a") must inherit property "interestTargetElement" with the proper type]
+    expected: FAIL
+
+  [HTMLAreaElement interface: attribute interestTargetElement]
+    expected: FAIL
+
+  [HTMLAreaElement interface: document.createElement("area") must inherit property "interestTargetElement" with the proper type]
+    expected: FAIL
+
+  [HTMLButtonElement interface: attribute interestTargetElement]
+    expected: FAIL
+
+  [HTMLButtonElement interface: document.createElement("button") must inherit property "interestTargetElement" with the proper type]
+    expected: FAIL
+
+  [SVGAElement interface: attribute interestTargetElement]
+    expected: FAIL
+
+  [SVGAElement interface: document.createElementNS("http://www.w3.org/2000/svg", "a") must inherit property "interestTargetElement" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini b/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
new file mode 100644
index 00000000000..3b191e683e4
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
@@ -0,0 +1,198 @@
+[interesttarget-css-properties.tentative.html]
+  [Property interest-target-show-delay value '0s']
+    expected: FAIL
+
+  [Property interest-target-show-delay value '0ms']
+    expected: FAIL
+
+  [Property interest-target-show-delay value '32s']
+    expected: FAIL
+
+  [Property interest-target-show-delay value '123ms']
+    expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "0s" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "0ms" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "32s" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "123ms" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "inherit" should set the property value]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-show-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [Property interest-target-hide-delay value '0s']
+    expected: FAIL
+
+  [Property interest-target-hide-delay value '0ms']
+    expected: FAIL
+
+  [Property interest-target-hide-delay value '32s']
+    expected: FAIL
+
+  [Property interest-target-hide-delay value '123ms']
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "0s" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "0ms" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "32s" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "123ms" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "inherit" should set the property value]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Transitions: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [CSS Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-1.5) should be [0s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (-0.3) should be [0.7s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0) should be [1s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (0.5) should be [1.5s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1) should be [2s\]]
+    expected: FAIL
+
+  [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini b/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
new file mode 100644
index 00000000000..f08fa168226
--- /dev/null
+++ b/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
@@ -0,0 +1,2 @@
+[Selection-getComposedRanges-range-update.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/subresource-integrity/signatures/tentative/inline.html.ini b/tests/wpt/meta/subresource-integrity/signatures/tentative/inline.html.ini
new file mode 100644
index 00000000000..059a37c90c2
--- /dev/null
+++ b/tests/wpt/meta/subresource-integrity/signatures/tentative/inline.html.ini
@@ -0,0 +1,12 @@
+[inline.html]
+  [valid `signature`, no `integrity` => blocked]
+    expected: FAIL
+
+  [valid `signature`, invalid `integrity` => blocked]
+    expected: FAIL
+
+  [multiple `signature`, no `integrity` => blocked]
+    expected: FAIL
+
+  [multiple `signature`, invalid `integrity` => blocked]
+    expected: FAIL
diff --git a/tests/wpt/meta/webmessaging/without-ports/018.html.ini b/tests/wpt/meta/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index b7b36c1d3a4..00000000000
--- a/tests/wpt/meta/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/tests/.github/workflows/docker.yml b/tests/wpt/tests/.github/workflows/docker.yml
index 9b9b471c600..99bb68b9594 100644
--- a/tests/wpt/tests/.github/workflows/docker.yml
+++ b/tests/wpt/tests/.github/workflows/docker.yml
@@ -40,7 +40,7 @@ jobs:
             latest
             type=raw,value=${{ inputs.tag }}
       - name: Build and push the Docker image
-        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
+        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
         with:
           context: ./tools/docker
           push: true
diff --git a/tests/wpt/tests/IndexedDB/idbfactory_cmp.any.js b/tests/wpt/tests/IndexedDB/idbfactory_cmp.any.js
new file mode 100644
index 00000000000..2fa4b7b6a48
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/idbfactory_cmp.any.js
@@ -0,0 +1,99 @@
+// META: global=window,worker
+// META: title=IDBFactory.cmp()
+// META: script=resources/support-promises.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbfactory-cmp
+// Spec: http://w3c.github.io/IndexedDB/#key-construct
+
+'use strict';
+
+// Test cmp() with valid keys. These tests verify that cmp() returns the correct
+// comparison value.
+test(function() {
+  let greater = indexedDB.cmp(2, 1);
+  let equal = indexedDB.cmp(2, 2);
+  let less = indexedDB.cmp(1, 2);
+
+  assert_equals(greater, 1, 'greater');
+  assert_equals(equal, 0, 'equal');
+  assert_equals(less, -1, 'less');
+}, 'IDBFactory.cmp() - compared keys return correct value');
+
+// Test cmp() with invalid keys. These tests verify that cmp() throws an
+// exception when given invalid input.
+test(function() {
+  assert_throws_js(TypeError, function() {
+    indexedDB.cmp();
+  });
+}, 'IDBFactory.cmp() - no argument');
+
+test(function() {
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(null, null);
+  });
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(1, null);
+  });
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(null, 1);
+  });
+}, 'IDBFactory.cmp() - null');
+
+test(function() {
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(NaN, NaN);
+  });
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(1, NaN);
+  });
+  assert_throws_dom('DataError', function() {
+    indexedDB.cmp(NaN, 1);
+  });
+}, 'IDBFactory.cmp() - NaN');
+
+// Test cmp() with keys of different types. These tests verify that cmp()
+// correctly compares keys of different types.
+test(function() {
+  assert_equals(indexedDB.cmp([0], new Uint8Array([0])), 1, 'Array > Binary');
+}, 'Array vs. Binary');
+
+test(function() {
+  assert_equals(indexedDB.cmp(new Uint8Array([0]), '0'), 1, 'Binary > String');
+}, 'Binary vs. String');
+
+test(function() {
+  assert_equals(indexedDB.cmp('', new Date(0)), 1, 'String > Date');
+}, 'String vs. Date');
+
+test(function() {
+  assert_equals(indexedDB.cmp(new Date(0), 0), 1, 'Date > Number');
+}, 'Date vs. Number');
+
+// Test cmp() with binary keys. These tests verify that cmp() correctly compares
+// binary keys.
+test(function() {
+  assert_equals(
+      indexedDB.cmp(new Int8Array([-1]), new Uint8Array([0])), 1,
+      '255(-1) shall be larger than 0');
+}, 'Compare in unsigned octet values (in the range [0, 255])');
+
+test(function() {
+  assert_equals(
+      indexedDB.cmp(
+          new Uint8Array([255, 254, 253]), new Uint8Array([255, 253, 254])),
+      1, '[255, 254, 253] shall be larger than [255, 253, 254]');
+}, 'Compare values of the same length');
+
+test(function() {
+  assert_equals(
+      indexedDB.cmp(
+          new Uint8Array([255, 254]), new Uint8Array([255, 253, 254])),
+      1, '[255, 254] shall be larger than [255, 253, 254]');
+}, 'Compare values of different lengths');
+
+test(function() {
+  assert_equals(
+      indexedDB.cmp(
+          new Uint8Array([255, 253, 254]), new Uint8Array([255, 253])),
+      1, '[255, 253, 254] shall be larger than [255, 253]');
+}, 'Compare when values in the range of their minimal length are the same');
diff --git a/tests/wpt/tests/IndexedDB/idbfactory_cmp.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp.htm
deleted file mode 100644
index e896743ff6e..00000000000
--- a/tests/wpt/tests/IndexedDB/idbfactory_cmp.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>IDBFactory.cmp() - compared keys return correct value</title>
-<link rel="author" title="Microsoft" href="http://www.microsoft.com">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-
-<script>
-    test(function() {
-        var greater = window.indexedDB.cmp(2, 1);
-        var equal = window.indexedDB.cmp(2, 2);
-        var less = window.indexedDB.cmp(1, 2);
-
-        assert_equals(greater, 1, "greater");
-        assert_equals(equal, 0, "equal");
-        assert_equals(less, -1, "less");
-    }, "IDBFactory.cmp()");
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm
deleted file mode 100644
index 68f87333db0..00000000000
--- a/tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>IDBFactory.cmp() - invalid key</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="https://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#widl-IDBFactory-cmp-short-any-first-any-second">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-<div id=log></div>
-<script>
-    test( function() {
-        assert_throws_js(TypeError, function() {
-            indexedDB.cmp();
-        });
-    }, "IDBFactory.cmp() - no argument");
-
-    test( function() {
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(null, null);
-        });
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(1, null);
-        });
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(null, 1);
-        });
-    }, "IDBFactory.cmp() - null");
-
-    test( function() {
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(NaN, NaN);
-        });
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(1, NaN);
-        });
-        assert_throws_dom("DataError", function() {
-            indexedDB.cmp(NaN, 1);
-        });
-    }, "IDBFactory.cmp() - NaN");
-</script>
-
diff --git a/tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm
deleted file mode 100644
index 749fd7b8614..00000000000
--- a/tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>IDBFactory.cmp() - compared keys in different types</title>
-<link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="help" href="http://w3c.github.io/IndexedDB/#key-construct">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-
-<script>
-  test(function() {
-    assert_equals(indexedDB.cmp([0], new Uint8Array([0])), 1, "Array > Binary");
-  }, "Array v.s. Binary");
-
-  test(function() {
-    assert_equals(indexedDB.cmp(new Uint8Array([0]), "0"), 1, "Binary > String");
-  }, "Binary v.s. String");
-
-  test(function() {
-    assert_equals(indexedDB.cmp("", new Date(0)), 1, "String > Date");
-  }, "String v.s. Date");
-
-  test(function() {
-    assert_equals(indexedDB.cmp(new Date(0), 0), 1, "Date > Number");
-  }, "Date v.s. Number");
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm
deleted file mode 100644
index 757e7c23973..00000000000
--- a/tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>IDBFactory.cmp() - comparison of binary keys</title>
-<link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="help" href="http://w3c.github.io/IndexedDB/#key-construct">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-
-<script>
-  test(function() {
-    assert_equals(indexedDB.cmp(new Int8Array([-1]), new Uint8Array([0])), 1,
-    "255(-1) shall be larger than 0");
-  }, "Compare in unsigned octet values (in the range [0, 255])");
-
-  test(function() {
-    assert_equals(indexedDB.cmp(
-        new Uint8Array([255, 254, 253]),
-        new Uint8Array([255, 253, 254])),
-        1,
-        "[255, 254, 253] shall be larger than [255, 253, 254]");
-  }, "Compare values in then same length");
-
-  test(function() {
-    assert_equals(indexedDB.cmp(
-        new Uint8Array([255, 254]),
-        new Uint8Array([255, 253, 254])),
-        1,
-        "[255, 254] shall be larger than [255, 253, 254]");
-  }, "Compare values in different lengths");
-
-  test(function() {
-    assert_equals(indexedDB.cmp(
-        new Uint8Array([255, 253, 254]),
-        new Uint8Array([255, 253])),
-        1,
-        "[255, 253, 254] shall be larger than [255, 253]");
-  }, "Compare when the values in the range of their minimal length are the same");
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.any.js
new file mode 100644
index 00000000000..b285fca7832
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.any.js
@@ -0,0 +1,135 @@
+// META: global=window,worker
+// META: title=IndexedDB: object store renaming support in aborted transactions
+// META: script=resources/support-promises.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name
+
+'use strict';
+
+promise_test(testCase => {
+  const dbName = databaseName(testCase);
+  let bookStore = null;
+  let bookStore2 = null;
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                bookStore = transaction.objectStore('books');
+                bookStore.name = 'renamed_books';
+
+                transaction.abort();
+
+                assert_equals(
+                    bookStore.name, 'books',
+                    'IDBObjectStore.name should not reflect the rename any more ' +
+                        'immediately after transaction.abort() returns');
+                assert_array_equals(
+                    database.objectStoreNames, ['books'],
+                    'IDBDatabase.objectStoreNames should not reflect the rename ' +
+                        'any more immediately after transaction.abort() returns');
+                assert_array_equals(
+                    transaction.objectStoreNames, ['books'],
+                    'IDBTransaction.objectStoreNames should not reflect the ' +
+                        'rename any more immediately after transaction.abort() returns');
+              }))
+      .then(event => {
+        assert_equals(
+            bookStore.name, 'books',
+            'IDBObjectStore.name should not reflect the rename any more ' +
+                'after the versionchange transaction is aborted');
+        const request = indexedDB.open(dbName, 1);
+        return promiseForRequest(testCase, request);
+      })
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books'],
+            'IDBDatabase.objectStoreNames should not reflect the rename ' +
+                'after the versionchange transaction is aborted');
+
+        const transaction = database.transaction('books', 'readonly');
+        bookStore2 = transaction.objectStore('books');
+        return checkStoreContents(
+                   testCase, bookStore2,
+                   'Aborting an object store rename transaction should not change ' +
+                       'the store\'s records')
+            .then(() => database.close());
+      })
+      .then(() => {
+        assert_equals(
+            bookStore.name, 'books',
+            'IDBObjectStore used in aborted rename transaction should not ' +
+                'reflect the rename after the transaction is aborted');
+        assert_equals(
+            bookStore2.name, 'books',
+            'IDBObjectStore obtained after an aborted rename transaction ' +
+                'should not reflect the rename');
+      });
+}, 'IndexedDB object store rename in aborted transaction');
+
+promise_test(testCase => {
+  const dbName = databaseName(testCase);
+  let notBookStore = null;
+  return createDatabase(testCase, (database, transaction) => {})
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                notBookStore = createNotBooksStore(testCase, database);
+                notBookStore.name = 'not_books_renamed';
+                notBookStore.name = 'not_books_renamed_again';
+
+                transaction.abort();
+
+                assert_equals(
+                    notBookStore.name, 'not_books_renamed_again',
+                    'IDBObjectStore.name should reflect the last rename ' +
+                        'immediately after transaction.abort() returns');
+                assert_array_equals(
+                    database.objectStoreNames, [],
+                    'IDBDatabase.objectStoreNames should not reflect the creation ' +
+                        'or the rename any more immediately after transaction.abort() ' +
+                        'returns');
+                assert_array_equals(
+                    transaction.objectStoreNames, [],
+                    'IDBTransaction.objectStoreNames should not reflect the ' +
+                        'creation or the rename any more immediately after ' +
+                        'transaction.abort() returns');
+                assert_array_equals(
+                    notBookStore.indexNames, [],
+                    'IDBObjectStore.indexNames for the newly created store ' +
+                        'should be empty immediately after transaction.abort() ' +
+                        'returns');
+              }))
+      .then(event => {
+        assert_equals(
+            notBookStore.name, 'not_books_renamed_again',
+            'IDBObjectStore.name should reflect the last rename after the ' +
+                'versionchange transaction is aborted');
+        assert_array_equals(
+            notBookStore.indexNames, [],
+            'IDBObjectStore.indexNames for the newly created store ' +
+                'should be empty after the versionchange transaction is aborted ' +
+                'returns');
+        const request = indexedDB.open(dbName, 1);
+        return promiseForRequest(testCase, request);
+      })
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, [],
+            'IDBDatabase.objectStoreNames should not reflect the creation or ' +
+                'the rename after the versionchange transaction is aborted');
+
+        database.close();
+      });
+}, 'IndexedDB object store creation and rename in an aborted transaction');
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html
deleted file mode 100644
index 0a7c54ee58f..00000000000
--- a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>IndexedDB: object store renaming support in aborted transactions</title>
-<link rel="help"
-      href="https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support-promises.js"></script>
-<script>
-'use strict';
-
-promise_test(testCase => {
-    const dbName = databaseName(testCase);
-    let bookStore = null, bookStore2 = null;
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        bookStore = transaction.objectStore('books');
-        bookStore.name = 'renamed_books';
-
-        transaction.abort();
-
-        assert_equals(
-            bookStore.name, 'books',
-            'IDBObjectStore.name should not reflect the rename any more ' +
-            'immediately after transaction.abort() returns');
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'IDBDatabase.objectStoreNames should not reflect the rename ' +
-            'any more immediately after transaction.abort() returns');
-        assert_array_equals(
-            transaction.objectStoreNames, ['books'],
-            'IDBTransaction.objectStoreNames should not reflect the ' +
-            'rename any more immediately after transaction.abort() returns');
-    })).then(event => {
-        assert_equals(bookStore.name, 'books',
-                'IDBObjectStore.name should not reflect the rename any more ' +
-                'after the versionchange transaction is aborted');
-        const request = indexedDB.open(dbName, 1);
-        return promiseForRequest(testCase, request);
-    }).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'IDBDatabase.objectStoreNames should not reflect the rename ' +
-            'after the versionchange transaction is aborted');
-
-        const transaction = database.transaction('books', 'readonly');
-        bookStore2 = transaction.objectStore('books');
-        return checkStoreContents(
-            testCase, bookStore2,
-            'Aborting an object store rename transaction should not change ' +
-            "the store's records").then(() => database.close());
-    }).then(() => {
-        assert_equals(
-            bookStore.name, 'books',
-            'IDBObjectStore used in aborted rename transaction should not ' +
-            'reflect the rename after the transaction is aborted');
-        assert_equals(
-            bookStore2.name, 'books',
-            'IDBObjectStore obtained after an aborted rename transaction ' +
-            'should not reflect the rename');
-    });
-}, 'IndexedDB object store rename in aborted transaction');
-
-promise_test(testCase => {
-    const dbName = databaseName(testCase);
-    let notBookStore = null;
-    return createDatabase(testCase, (database, transaction) => {
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        notBookStore = createNotBooksStore(testCase, database);
-        notBookStore.name = 'not_books_renamed';
-        notBookStore.name = 'not_books_renamed_again';
-
-        transaction.abort();
-
-        assert_equals(
-            notBookStore.name, 'not_books_renamed_again',
-            'IDBObjectStore.name should reflect the last rename ' +
-            'immediately after transaction.abort() returns');
-        assert_array_equals(
-            database.objectStoreNames, [],
-            'IDBDatabase.objectStoreNames should not reflect the creation ' +
-            'or the rename any more immediately after transaction.abort() ' +
-            'returns');
-        assert_array_equals(
-            transaction.objectStoreNames, [],
-            'IDBTransaction.objectStoreNames should not reflect the ' +
-            'creation or the rename any more immediately after ' +
-            'transaction.abort() returns');
-        assert_array_equals(notBookStore.indexNames, [],
-            'IDBObjectStore.indexNames for the newly created store ' +
-            'should be empty immediately after transaction.abort() ' +
-            'returns');
-    })).then(event => {
-        assert_equals(
-            notBookStore.name, 'not_books_renamed_again',
-            'IDBObjectStore.name should reflect the last rename after the ' +
-            'versionchange transaction is aborted');
-        assert_array_equals(notBookStore.indexNames, [],
-            'IDBObjectStore.indexNames for the newly created store ' +
-            'should be empty after the versionchange transaction is aborted ' +
-            'returns');
-        const request = indexedDB.open(dbName, 1);
-        return promiseForRequest(testCase, request);
-    }).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, [],
-            'IDBDatabase.objectStoreNames should not reflect the creation or ' +
-            'the rename after the versionchange transaction is aborted');
-
-        database.close();
-    });
-}, 'IndexedDB object store creation and rename in an aborted transaction');
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.any.js
new file mode 100644
index 00000000000..32e52ffa5f8
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.any.js
@@ -0,0 +1,144 @@
+// META: global=window,worker
+// META: title=IndexedDB: object store renaming error handling
+// META: script=resources/support-promises.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name
+
+'use strict';
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+                database.deleteObjectStore('books');
+                assert_throws_dom(
+                    'InvalidStateError', () => store.name = 'renamed_books');
+              }))
+      .then(database => {
+        database.close();
+      });
+}, 'IndexedDB deleted object store rename throws');
+
+promise_test(testCase => {
+  return createDatabase(testCase, (database, transaction) => {
+           createBooksStore(testCase, database);
+         }).then(database => {
+    const transaction = database.transaction('books', 'readonly');
+    const store = transaction.objectStore('books');
+    assert_throws_dom('InvalidStateError', () => store.name = 'renamed_books');
+    database.close();
+  });
+}, 'IndexedDB object store rename throws in a readonly transaction');
+
+promise_test(testCase => {
+  return createDatabase(testCase, (database, transaction) => {
+           createBooksStore(testCase, database);
+         }).then(database => {
+    const transaction = database.transaction('books', 'readwrite');
+    const store = transaction.objectStore('books');
+
+    assert_throws_dom('InvalidStateError', () => store.name = 'renamed_books');
+    database.close();
+  });
+}, 'IndexedDB object store rename throws in a readwrite transaction');
+
+promise_test(testCase => {
+  let bookStore = null;
+  return createDatabase(testCase, (database, transaction) => {
+           bookStore = createBooksStore(testCase, database);
+         }).then(database => {
+    assert_throws_dom('TransactionInactiveError', () => {
+      bookStore.name = 'renamed_books';
+    });
+    database.close();
+  });
+}, 'IndexedDB object store rename throws in an inactive transaction');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+               createNotBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+                assert_throws_dom(
+                    'ConstraintError', () => store.name = 'not_books');
+                assert_array_equals(
+                    database.objectStoreNames, ['books', 'not_books'],
+                    'A store rename that throws an exception should not change the ' +
+                        'store\'s IDBDatabase.objectStoreNames');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books', 'not_books'],
+            'Committing a transaction with a failed store rename attempt ' +
+                'should not change the store\'s IDBDatabase.objectStoreNames');
+        const transaction = database.transaction('books', 'readonly');
+        const store = transaction.objectStore('books');
+        return checkStoreContents(
+                   testCase, store,
+                   'Committing a transaction with a failed rename attempt should ' +
+                       'not change the store\'s contents')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename to the name of another store throws');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+                let exception = {name: 'Custom stringifying error'};
+                assert_throws_exactly(exception, () => {
+                  store.name = {
+                    toString: () => {
+                      throw exception;
+                    }
+                  };
+                }, 'IDBObjectStore rename should re-raise toString() exception');
+                assert_array_equals(
+                    database.objectStoreNames, ['books'],
+                    'A store rename that throws an exception should not change the ' +
+                        'store\'s IDBDatabase.objectStoreNames');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books'],
+            'Committing a transaction with a failed store rename attempt ' +
+                'should not change the store\'s IDBDatabase.objectStoreNames');
+        const transaction = database.transaction('books', 'readonly');
+        const store = transaction.objectStore('books');
+        return checkStoreContents(
+                   testCase, store,
+                   'Committing a transaction with a failed rename attempt should ' +
+                       'not change the store\'s contents')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename handles exceptions when stringifying names');
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html
deleted file mode 100644
index ad2ff9a6577..00000000000
--- a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<title>IndexedDB: object store renaming error handling</title>
-<link rel="help"
-      href="https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support-promises.js"></script>
-<script>
-'use strict';
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        database.deleteObjectStore('books');
-        assert_throws_dom('InvalidStateError', () => store.name = 'renamed_books');
-    })).then(database => {
-        database.close();
-    });
-}, 'IndexedDB deleted object store rename throws');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        const transaction = database.transaction('books', 'readonly');
-        const store = transaction.objectStore('books');
-        assert_throws_dom('InvalidStateError', () => store.name = 'renamed_books');
-        database.close();
-    });
-}, 'IndexedDB object store rename throws in a readonly transaction');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        const transaction = database.transaction('books', 'readwrite');
-        const store = transaction.objectStore('books');
-
-        assert_throws_dom('InvalidStateError', () => store.name = 'renamed_books');
-        database.close();
-    });
-}, 'IndexedDB object store rename throws in a readwrite transaction');
-
-promise_test(testCase => {
-    let bookStore = null;
-    return createDatabase(testCase, (database, transaction) => {
-        bookStore = createBooksStore(testCase, database);
-    }).then(database => {
-        assert_throws_dom('TransactionInactiveError',
-            () => { bookStore.name = 'renamed_books'; });
-        database.close();
-    });
-}, 'IndexedDB object store rename throws in an inactive transaction');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-        createNotBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        assert_throws_dom('ConstraintError', () => store.name = 'not_books');
-        assert_array_equals(
-            database.objectStoreNames, ['books', 'not_books'],
-            'A store rename that throws an exception should not change the ' +
-            "store's IDBDatabase.objectStoreNames");
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books', 'not_books'],
-            'Committing a transaction with a failed store rename attempt ' +
-            "should not change the store's IDBDatabase.objectStoreNames");
-        const transaction = database.transaction('books', 'readonly');
-        const store = transaction.objectStore('books');
-        return checkStoreContents(
-            testCase, store,
-            'Committing a transaction with a failed rename attempt should ' +
-            "not change the store's contents").then(() => database.close());
-    });
-}, 'IndexedDB object store rename to the name of another store throws');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        var exception = { name: 'Custom stringifying error' }
-        assert_throws_exactly(
-            exception,
-            () => {
-              store.name = {
-                toString: () => { throw exception; }
-              };
-            }, 'IDBObjectStore rename should re-raise toString() exception');
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'A store rename that throws an exception should not change the ' +
-            "store's IDBDatabase.objectStoreNames");
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'Committing a transaction with a failed store rename attempt ' +
-            "should not change the store's IDBDatabase.objectStoreNames");
-        const transaction = database.transaction('books', 'readonly');
-        const store = transaction.objectStore('books');
-        return checkStoreContents(
-            testCase, store,
-            'Committing a transaction with a failed rename attempt should ' +
-            "not change the store's contents").then(() => database.close());
-    });
-}, 'IndexedDB object store rename handles exceptions when stringifying names');
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.any.js
new file mode 100644
index 00000000000..5877c045bc3
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.any.js
@@ -0,0 +1,435 @@
+// META: global=window,worker
+// META: title=IndexedDB: object store renaming support
+// META: script=resources/support-promises.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name
+
+'use strict';
+
+// Renames the 'books' store to 'renamed_books'.
+//
+// Returns a promise that resolves to an IndexedDB database. The caller must
+// close the database.
+const renameBooksStore = (testCase) => {
+  return migrateDatabase(testCase, 2, (database, transaction) => {
+    const store = transaction.objectStore('books');
+    store.name = 'renamed_books';
+  });
+};
+
+promise_test(testCase => {
+  let bookStore = null;
+  let bookStore2 = null;
+  let renamedBookStore = null;
+  let renamedBookStore2 = null;
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               bookStore = createBooksStore(testCase, database);
+             })
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books'],
+            'Test setup should have created a "books" object store');
+        const transaction = database.transaction('books', 'readonly');
+        bookStore2 = transaction.objectStore('books');
+        return checkStoreContents(
+                   testCase, bookStore2,
+                   'The store should have the expected contents before any renaming')
+            .then(() => database.close());
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                renamedBookStore = transaction.objectStore('books');
+                renamedBookStore.name = 'renamed_books';
+
+                assert_equals(
+                    renamedBookStore.name, 'renamed_books',
+                    'IDBObjectStore name should change immediately after a rename');
+                assert_array_equals(
+                    database.objectStoreNames, ['renamed_books'],
+                    'IDBDatabase.objectStoreNames should immediately reflect the ' +
+                        'rename');
+                assert_array_equals(
+                    transaction.objectStoreNames, ['renamed_books'],
+                    'IDBTransaction.objectStoreNames should immediately reflect the ' +
+                        'rename');
+                assert_equals(
+                    transaction.objectStore('renamed_books'), renamedBookStore,
+                    'IDBTransaction.objectStore should return the renamed object ' +
+                        'store when queried using the new name immediately after the ' +
+                        'rename');
+                assert_throws_dom(
+                    'NotFoundError', () => transaction.objectStore('books'),
+                    'IDBTransaction.objectStore should throw when queried using the ' +
+                        'renamed object store\'s old name immediately after the rename');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['renamed_books'],
+            'IDBDatabase.objectStoreNames should still reflect the rename ' +
+                'after the versionchange transaction commits');
+        const transaction = database.transaction('renamed_books', 'readonly');
+        renamedBookStore2 = transaction.objectStore('renamed_books');
+        return checkStoreContents(
+                   testCase, renamedBookStore2,
+                   'Renaming an object store should not change its records')
+            .then(() => database.close());
+      })
+      .then(() => {
+        assert_equals(
+            bookStore.name, 'books',
+            'IDBObjectStore obtained before the rename transaction should ' +
+                'not reflect the rename');
+        assert_equals(
+            bookStore2.name, 'books',
+            'IDBObjectStore obtained before the rename transaction should ' +
+                'not reflect the rename');
+        assert_equals(
+            renamedBookStore.name, 'renamed_books',
+            'IDBObjectStore used in the rename transaction should keep ' +
+                'reflecting the new name after the transaction is committed');
+        assert_equals(
+            renamedBookStore2.name, 'renamed_books',
+            'IDBObjectStore obtained after the rename transaction should ' +
+                'reflect the new name');
+      });
+}, 'IndexedDB object store rename in new transaction');
+
+promise_test(testCase => {
+  let renamedBookStore = null;
+  let renamedBookStore2 = null;
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               renamedBookStore = createBooksStore(testCase, database);
+               renamedBookStore.name = 'renamed_books';
+
+               assert_equals(
+                   renamedBookStore.name, 'renamed_books',
+                   'IDBObjectStore name should change immediately after a rename');
+               assert_array_equals(
+                   database.objectStoreNames, ['renamed_books'],
+                   'IDBDatabase.objectStoreNames should immediately reflect the ' +
+                       'rename');
+               assert_array_equals(
+                   transaction.objectStoreNames, ['renamed_books'],
+                   'IDBTransaction.objectStoreNames should immediately reflect the ' +
+                       'rename');
+               assert_equals(
+                   transaction.objectStore('renamed_books'), renamedBookStore,
+                   'IDBTransaction.objectStore should return the renamed object ' +
+                       'store when queried using the new name immediately after the ' +
+                       'rename');
+               assert_throws_dom(
+                   'NotFoundError', () => transaction.objectStore('books'),
+                   'IDBTransaction.objectStore should throw when queried using the ' +
+                       'renamed object store\'s old name immediately after the rename');
+             })
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['renamed_books'],
+            'IDBDatabase.objectStoreNames should still reflect the rename ' +
+                'after the versionchange transaction commits');
+        const transaction = database.transaction('renamed_books', 'readonly');
+        renamedBookStore2 = transaction.objectStore('renamed_books');
+        return checkStoreContents(
+                   testCase, renamedBookStore2,
+                   'Renaming an object store should not change its records')
+            .then(() => database.close());
+      })
+      .then(() => {
+        assert_equals(
+            renamedBookStore.name, 'renamed_books',
+            'IDBObjectStore used in the rename transaction should keep ' +
+                'reflecting the new name after the transaction is committed');
+        assert_equals(
+            renamedBookStore2.name, 'renamed_books',
+            'IDBObjectStore obtained after the rename transaction should ' +
+                'reflect the new name');
+      });
+}, 'IndexedDB object store rename in the transaction where it is created');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        const transaction = database.transaction('books', 'readonly');
+        const store = transaction.objectStore('books');
+        return checkStoreIndexes(
+                   testCase, store,
+                   'The object store index should have the expected contens before ' +
+                       'any renaming')
+            .then(() => database.close());
+      })
+      .then(() => renameBooksStore(testCase))
+      .then(database => {
+        const transaction = database.transaction('renamed_books', 'readonly');
+        const store = transaction.objectStore('renamed_books');
+        return checkStoreIndexes(
+                   testCase, store,
+                   'Renaming an object store should not change its indexes')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename covers index');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        const transaction = database.transaction('books', 'readwrite');
+        const store = transaction.objectStore('books');
+        return checkStoreGenerator(
+                   testCase, store, 345679,
+                   'The object store key generator should have the expected state ' +
+                       'before any renaming')
+            .then(() => database.close());
+      })
+      .then(() => renameBooksStore(testCase))
+      .then(database => {
+        const transaction = database.transaction('renamed_books', 'readwrite');
+        const store = transaction.objectStore('renamed_books');
+        return checkStoreGenerator(
+                   testCase, store, 345680,
+                   'Renaming an object store should not change the state of its key ' +
+                       'generator')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename covers key generator');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+                store.name = 'books';
+                assert_array_equals(
+                    database.objectStoreNames, ['books'],
+                    'Renaming a store to the same name should not change ' +
+                        'the store\'s IDBDatabase.objectStoreNames');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books'],
+            'Committing a transaction that renames a store to the same name ' +
+                'should not change the store\'s IDBDatabase.objectStoreNames');
+        const transaction = database.transaction('books', 'readonly');
+        const store = transaction.objectStore('books');
+        return checkStoreContents(
+                   testCase, store,
+                   'Committing a transaction that renames a store to the same name ' +
+                       'should not change the store\'s contents')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename to the same name succeeds');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+               createNotBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+                database.deleteObjectStore('not_books');
+                store.name = 'not_books';
+                assert_array_equals(
+                    database.objectStoreNames, ['not_books'],
+                    'IDBDatabase.objectStoreNames should immediately reflect the ' +
+                        'rename');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['not_books'],
+            'IDBDatabase.objectStoreNames should still reflect the rename ' +
+                'after the versionchange transaction commits');
+        const transaction = database.transaction('not_books', 'readonly');
+        const store = transaction.objectStore('not_books');
+        return checkStoreContents(
+                   testCase, store,
+                   'Renaming an object store should not change its records')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename to the name of a deleted store succeeds');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+               createNotBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const bookStore = transaction.objectStore('books');
+                const notBookStore = transaction.objectStore('not_books');
+
+                transaction.objectStore('books').name = 'tmp';
+                transaction.objectStore('not_books').name = 'books';
+                transaction.objectStore('tmp').name = 'not_books';
+
+                assert_array_equals(
+                    database.objectStoreNames, ['books', 'not_books'],
+                    'IDBDatabase.objectStoreNames should immediately reflect the swap');
+
+                assert_equals(
+                    transaction.objectStore('books'), notBookStore,
+                    'IDBTransaction.objectStore should return the original "books" ' +
+                        'store when queried with "not_books" after the swap');
+                assert_equals(
+                    transaction.objectStore('not_books'), bookStore,
+                    'IDBTransaction.objectStore should return the original ' +
+                        '"not_books" store when queried with "books" after the swap');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['books', 'not_books'],
+            'IDBDatabase.objectStoreNames should still reflect the swap ' +
+                'after the versionchange transaction commits');
+        const transaction = database.transaction('not_books', 'readonly');
+        const store = transaction.objectStore('not_books');
+        assert_array_equals(
+            store.indexNames, ['by_author', 'by_title'],
+            '"not_books" index names should still reflect the swap after the ' +
+                'versionchange transaction commits');
+        return checkStoreContents(
+                   testCase, store,
+                   'Swapping two object stores should not change their records')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store swapping via renames succeeds');
+
+promise_test(testCase => {
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        database.close();
+      })
+      .then(
+          () => migrateDatabase(
+              testCase, 2,
+              (database, transaction) => {
+                const store = transaction.objectStore('books');
+
+                store.name = 42;
+                assert_equals(
+                    store.name, '42',
+                    'IDBObjectStore name should change immediately after a ' +
+                        'rename to a number');
+                assert_array_equals(
+                    database.objectStoreNames, ['42'],
+                    'IDBDatabase.objectStoreNames should immediately reflect the ' +
+                        'stringifying rename');
+
+                store.name = true;
+                assert_equals(
+                    store.name, 'true',
+                    'IDBObjectStore name should change immediately after a ' +
+                        'rename to a boolean');
+
+                store.name = {};
+                assert_equals(
+                    store.name, '[object Object]',
+                    'IDBObjectStore name should change immediately after a ' +
+                        'rename to an object');
+
+                store.name = () => null;
+                assert_equals(
+                    store.name, '() => null',
+                    'IDBObjectStore name should change immediately after a ' +
+                        'rename to a function');
+
+                store.name = undefined;
+                assert_equals(
+                    store.name, 'undefined',
+                    'IDBObjectStore name should change immediately after a ' +
+                        'rename to undefined');
+              }))
+      .then(database => {
+        assert_array_equals(
+            database.objectStoreNames, ['undefined'],
+            'IDBDatabase.objectStoreNames should reflect the last rename ' +
+                'after the versionchange transaction commits');
+        const transaction = database.transaction('undefined', 'readonly');
+        const store = transaction.objectStore('undefined');
+        return checkStoreContents(
+                   testCase, store,
+                   'Renaming an object store should not change its records')
+            .then(() => database.close());
+      });
+}, 'IndexedDB object store rename stringifies non-string names');
+
+for (let escapedName of ['', '\\u0000', '\\uDC00\\uD800'])
+  ((escapedName) => {
+    const name = JSON.parse('"' + escapedName + '"');
+    promise_test(testCase => {
+      return createDatabase(
+                 testCase,
+                 (database, transaction) => {
+                   createBooksStore(testCase, database);
+                 })
+          .then(database => {
+            database.close();
+          })
+          .then(
+              () => migrateDatabase(
+                  testCase, 2,
+                  (database, transaction) => {
+                    const store = transaction.objectStore('books');
+
+                    store.name = name;
+                    assert_equals(
+                        store.name, name,
+                        'IDBObjectStore name should change immediately after the ' +
+                            'rename');
+                    assert_array_equals(
+                        database.objectStoreNames, [name],
+                        'IDBDatabase.objectStoreNames should immediately reflect the ' +
+                            'rename');
+                  }))
+          .then(database => {
+            assert_array_equals(
+                database.objectStoreNames, [name],
+                'IDBDatabase.objectStoreNames should reflect the rename ' +
+                    'after the versionchange transaction commits');
+            const transaction = database.transaction(name, 'readonly');
+            const store = transaction.objectStore(name);
+            return checkStoreContents(
+                       testCase, store,
+                       'Renaming an object store should not change its records')
+                .then(() => database.close());
+          });
+    }, 'IndexedDB object store can be renamed to "' + escapedName + '"');
+  })(escapedName);
diff --git a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html
deleted file mode 100644
index 97fa2e0c1fe..00000000000
--- a/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html
+++ /dev/null
@@ -1,369 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<meta name="timeout" content="long">
-<title>IndexedDB: object store renaming support</title>
-<link rel="help"
-      href="https://w3c.github.io/IndexedDB/#dom-idbobjectstore-name">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support-promises.js"></script>
-<script>
-'use strict';
-
-// Renames the 'books' store to 'renamed_books'.
-//
-// Returns a promise that resolves to an IndexedDB database. The caller must
-// close the database.
-const renameBooksStore = (testCase) => {
-    return migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        store.name = 'renamed_books';
-    });
-};
-
-promise_test(testCase => {
-    let bookStore = null, bookStore2 = null;
-    let renamedBookStore = null, renamedBookStore2 = null;
-    return createDatabase(testCase, (database, transaction) => {
-        bookStore = createBooksStore(testCase, database);
-    }).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'Test setup should have created a "books" object store');
-        const transaction = database.transaction('books', 'readonly');
-        bookStore2 = transaction.objectStore('books');
-        return checkStoreContents(
-            testCase, bookStore2,
-            'The store should have the expected contents before any renaming').
-            then(() => database.close());
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        renamedBookStore = transaction.objectStore('books');
-        renamedBookStore.name = 'renamed_books';
-
-        assert_equals(
-            renamedBookStore.name, 'renamed_books',
-            'IDBObjectStore name should change immediately after a rename');
-        assert_array_equals(
-            database.objectStoreNames, ['renamed_books'],
-            'IDBDatabase.objectStoreNames should immediately reflect the ' +
-            'rename');
-        assert_array_equals(
-            transaction.objectStoreNames, ['renamed_books'],
-            'IDBTransaction.objectStoreNames should immediately reflect the ' +
-            'rename');
-        assert_equals(
-            transaction.objectStore('renamed_books'), renamedBookStore,
-            'IDBTransaction.objectStore should return the renamed object ' +
-            'store when queried using the new name immediately after the ' +
-            'rename');
-        assert_throws_dom(
-            'NotFoundError', () => transaction.objectStore('books'),
-            'IDBTransaction.objectStore should throw when queried using the ' +
-            "renamed object store's old name immediately after the rename");
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['renamed_books'],
-            'IDBDatabase.objectStoreNames should still reflect the rename ' +
-            'after the versionchange transaction commits');
-        const transaction = database.transaction('renamed_books', 'readonly');
-        renamedBookStore2 = transaction.objectStore('renamed_books');
-        return checkStoreContents(
-            testCase, renamedBookStore2,
-            'Renaming an object store should not change its records').then(
-            () => database.close());
-    }).then(() => {
-        assert_equals(
-            bookStore.name, 'books',
-            'IDBObjectStore obtained before the rename transaction should ' +
-            'not reflect the rename');
-        assert_equals(
-            bookStore2.name, 'books',
-            'IDBObjectStore obtained before the rename transaction should ' +
-            'not reflect the rename');
-        assert_equals(
-            renamedBookStore.name, 'renamed_books',
-            'IDBObjectStore used in the rename transaction should keep ' +
-            'reflecting the new name after the transaction is committed');
-        assert_equals(
-            renamedBookStore2.name, 'renamed_books',
-            'IDBObjectStore obtained after the rename transaction should ' +
-            'reflect the new name');
-    });
-}, 'IndexedDB object store rename in new transaction');
-
-promise_test(testCase => {
-    let renamedBookStore = null, renamedBookStore2 = null;
-    return createDatabase(testCase, (database, transaction) => {
-        renamedBookStore = createBooksStore(testCase, database);
-        renamedBookStore.name = 'renamed_books';
-
-        assert_equals(
-            renamedBookStore.name, 'renamed_books',
-            'IDBObjectStore name should change immediately after a rename');
-        assert_array_equals(
-            database.objectStoreNames, ['renamed_books'],
-            'IDBDatabase.objectStoreNames should immediately reflect the ' +
-            'rename');
-        assert_array_equals(
-            transaction.objectStoreNames, ['renamed_books'],
-            'IDBTransaction.objectStoreNames should immediately reflect the ' +
-            'rename');
-        assert_equals(
-            transaction.objectStore('renamed_books'), renamedBookStore,
-            'IDBTransaction.objectStore should return the renamed object ' +
-            'store when queried using the new name immediately after the ' +
-            'rename');
-        assert_throws_dom(
-            'NotFoundError', () => transaction.objectStore('books'),
-            'IDBTransaction.objectStore should throw when queried using the ' +
-            "renamed object store's old name immediately after the rename");
-    }).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['renamed_books'],
-            'IDBDatabase.objectStoreNames should still reflect the rename ' +
-            'after the versionchange transaction commits');
-        const transaction = database.transaction('renamed_books', 'readonly');
-        renamedBookStore2 = transaction.objectStore('renamed_books');
-        return checkStoreContents(
-            testCase, renamedBookStore2,
-            'Renaming an object store should not change its records').then(
-            () => database.close());
-    }).then(() => {
-        assert_equals(
-            renamedBookStore.name, 'renamed_books',
-            'IDBObjectStore used in the rename transaction should keep ' +
-            'reflecting the new name after the transaction is committed');
-        assert_equals(
-            renamedBookStore2.name, 'renamed_books',
-            'IDBObjectStore obtained after the rename transaction should ' +
-            'reflect the new name');
-    });
-}, 'IndexedDB object store rename in the transaction where it is created');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        const transaction = database.transaction('books', 'readonly');
-        const store = transaction.objectStore('books');
-        return checkStoreIndexes(
-            testCase, store,
-            'The object store index should have the expected contens before ' +
-            'any renaming').then(
-            () => database.close());
-    }).then(() => renameBooksStore(testCase)
-    ).then(database => {
-        const transaction = database.transaction('renamed_books', 'readonly');
-        const store = transaction.objectStore('renamed_books');
-        return checkStoreIndexes(
-            testCase, store,
-            'Renaming an object store should not change its indexes').then(
-            () => database.close());
-    });
-}, 'IndexedDB object store rename covers index');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        const transaction = database.transaction('books', 'readwrite');
-        const store = transaction.objectStore('books');
-        return checkStoreGenerator(
-            testCase, store, 345679,
-            'The object store key generator should have the expected state ' +
-            'before any renaming').then(() => database.close());
-    }).then(() => renameBooksStore(testCase)
-    ).then(database => {
-        const transaction = database.transaction('renamed_books', 'readwrite');
-        const store = transaction.objectStore('renamed_books');
-        return checkStoreGenerator(
-            testCase, store, 345680,
-            'Renaming an object store should not change the state of its key ' +
-            'generator').then(() => database.close());
-    });
-}, 'IndexedDB object store rename covers key generator');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        store.name = 'books';
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'Renaming a store to the same name should not change ' +
-            "the store's IDBDatabase.objectStoreNames");
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books'],
-            'Committing a transaction that renames a store to the same name ' +
-            "should not change the store's IDBDatabase.objectStoreNames");
-        const transaction = database.transaction('books', 'readonly');
-        const store = transaction.objectStore('books');
-        return checkStoreContents(
-            testCase, store,
-            'Committing a transaction that renames a store to the same name ' +
-            "should not change the store's contents").then(
-            () => database.close());
-    });
-}, 'IndexedDB object store rename to the same name succeeds');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-        createNotBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-        database.deleteObjectStore('not_books');
-        store.name = 'not_books';
-        assert_array_equals(
-            database.objectStoreNames, ['not_books'],
-            'IDBDatabase.objectStoreNames should immediately reflect the ' +
-            'rename');
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['not_books'],
-            'IDBDatabase.objectStoreNames should still reflect the rename ' +
-            'after the versionchange transaction commits');
-        const transaction = database.transaction('not_books', 'readonly');
-        const store = transaction.objectStore('not_books');
-        return checkStoreContents(
-            testCase, store,
-            'Renaming an object store should not change its records').then(
-            () => database.close());
-    });
-}, 'IndexedDB object store rename to the name of a deleted store succeeds');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-        createNotBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const bookStore = transaction.objectStore('books');
-        const notBookStore = transaction.objectStore('not_books');
-
-        transaction.objectStore('books').name = 'tmp';
-        transaction.objectStore('not_books').name = 'books';
-        transaction.objectStore('tmp').name = 'not_books';
-
-        assert_array_equals(
-            database.objectStoreNames, ['books', 'not_books'],
-            'IDBDatabase.objectStoreNames should immediately reflect the swap');
-
-        assert_equals(
-            transaction.objectStore('books'), notBookStore,
-            'IDBTransaction.objectStore should return the original "books" ' +
-            'store when queried with "not_books" after the swap');
-        assert_equals(
-            transaction.objectStore('not_books'), bookStore,
-            'IDBTransaction.objectStore should return the original ' +
-            '"not_books" store when queried with "books" after the swap');
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['books', 'not_books'],
-            'IDBDatabase.objectStoreNames should still reflect the swap ' +
-            'after the versionchange transaction commits');
-        const transaction = database.transaction('not_books', 'readonly');
-        const store = transaction.objectStore('not_books');
-        assert_array_equals(
-            store.indexNames, ['by_author', 'by_title'],
-            '"not_books" index names should still reflect the swap after the ' +
-            'versionchange transaction commits');
-        return checkStoreContents(
-            testCase, store,
-            'Swapping two object stores should not change their records').then(
-            () => database.close());
-    });
-}, 'IndexedDB object store swapping via renames succeeds');
-
-promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-        createBooksStore(testCase, database);
-    }).then(database => {
-        database.close();
-    }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-        const store = transaction.objectStore('books');
-
-        store.name = 42;
-        assert_equals(store.name, '42',
-            'IDBObjectStore name should change immediately after a ' +
-            'rename to a number');
-        assert_array_equals(
-            database.objectStoreNames, ['42'],
-            'IDBDatabase.objectStoreNames should immediately reflect the ' +
-            'stringifying rename');
-
-        store.name = true;
-        assert_equals(store.name, 'true',
-            'IDBObjectStore name should change immediately after a ' +
-            'rename to a boolean');
-
-        store.name = {};
-        assert_equals(store.name, '[object Object]',
-            'IDBObjectStore name should change immediately after a ' +
-            'rename to an object');
-
-        store.name = () => null;
-        assert_equals(store.name, '() => null',
-            'IDBObjectStore name should change immediately after a ' +
-            'rename to a function');
-
-        store.name = undefined;
-        assert_equals(store.name, 'undefined',
-            'IDBObjectStore name should change immediately after a ' +
-            'rename to undefined');
-    })).then(database => {
-        assert_array_equals(
-            database.objectStoreNames, ['undefined'],
-            'IDBDatabase.objectStoreNames should reflect the last rename ' +
-            'after the versionchange transaction commits');
-        const transaction = database.transaction('undefined', 'readonly');
-        const store = transaction.objectStore('undefined');
-        return checkStoreContents(
-            testCase, store,
-            'Renaming an object store should not change its records').then(
-            () => database.close());
-    });
-}, 'IndexedDB object store rename stringifies non-string names');
-
-for (let escapedName of ['', '\\u0000', '\\uDC00\\uD800']) ((escapedName) => {
-  const name = JSON.parse('"' + escapedName + '"');
-  promise_test(testCase => {
-      return createDatabase(testCase, (database, transaction) => {
-          createBooksStore(testCase, database);
-      }).then(database => {
-          database.close();
-      }).then(() => migrateDatabase(testCase, 2, (database, transaction) => {
-          const store = transaction.objectStore('books');
-
-          store.name = name;
-          assert_equals(store.name, name,
-              'IDBObjectStore name should change immediately after the ' +
-              'rename');
-          assert_array_equals(
-              database.objectStoreNames, [name],
-              'IDBDatabase.objectStoreNames should immediately reflect the ' +
-              'rename');
-      })).then(database => {
-          assert_array_equals(
-              database.objectStoreNames, [name],
-              'IDBDatabase.objectStoreNames should reflect the rename ' +
-              'after the versionchange transaction commits');
-          const transaction = database.transaction(name, 'readonly');
-          const store = transaction.objectStore(name);
-          return checkStoreContents(
-              testCase, store,
-              'Renaming an object store should not change its records').then(
-              () => database.close());
-      });
-  }, 'IndexedDB object store can be renamed to "' + escapedName + '"');
-})(escapedName);
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.any.js b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.any.js
new file mode 100644
index 00000000000..56856fd3134
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.any.js
@@ -0,0 +1,23 @@
+// META: global=window,worker
+// META: title=IndexedDB: IDBTransaction objectStore() Exception Ordering
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbtransaction-objectstore
+
+'use strict';
+
+indexeddb_test(
+    (t, db) => {
+        const store = db.createObjectStore('s');
+    },
+    (t, db) => {
+        const tx = db.transaction('s', 'readonly');
+        tx.oncomplete = t.step_func(() => {
+            assert_throws_dom('InvalidStateError', () => { tx.objectStore('nope'); },
+                '"finished" check (InvalidStateError) should precede ' +
+                '"name in scope" check (NotFoundError)');
+            t.done();
+        });
+    },
+    'IDBTransaction.objectStore exception order: InvalidStateError vs. NotFoundError'
+);
\ No newline at end of file
diff --git a/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html
deleted file mode 100644
index 9b5c4ac4b94..00000000000
--- a/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>IndexedDB: IDBTransaction objectStore() Exception Ordering</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#dom-idbtransaction-objectstore">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-<script>
-
-indexeddb_test(
-  (t, db) => {
-    const store = db.createObjectStore('s');
-  },
-  (t, db) => {
-    const tx = db.transaction('s', 'readonly');
-    tx.oncomplete = t.step_func(() => {
-        assert_throws_dom('InvalidStateError', () => { tx.objectStore('nope'); },
-                          '"finished" check (InvalidStateError) should precede ' +
-                          '"name in scope" check (NotFoundError)');
-      t.done();
-    });
-  },
-  'IDBTransaction.objectStore exception order: InvalidStateError vs. NotFoundError'
-);
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.html b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.any.js
similarity index 51%
rename from tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.html
rename to tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.any.js
index de2cad51afe..a5713d5885b 100644
--- a/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.html
+++ b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.any.js
@@ -1,11 +1,10 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>IndexedDB: IDBTransaction objectStore() when transaction is finished</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#dom-idbtransaction-objectstore">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-<script>
+// META: global=window,worker
+// META: title=IndexedDB: IDBTransaction objectStore() when transaction is finished
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#dom-idbtransaction-objectstore
+
+'use strict';
 
 indexeddb_test(
   (t, db) => {
@@ -20,5 +19,3 @@ indexeddb_test(
   },
   'IDBTransaction objectStore() behavior when transaction is finished'
 );
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/keypath-exceptions.any.js b/tests/wpt/tests/IndexedDB/keypath-exceptions.any.js
new file mode 100644
index 00000000000..6e945147829
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keypath-exceptions.any.js
@@ -0,0 +1,288 @@
+// META: global=window,worker
+// META: title=IndexedDB: Exceptions in extracting keys from values (ES bindings)
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#extract-key-from-value
+
+'use strict';
+
+indexeddb_test(
+    (t, db) => {
+      db.createObjectStore('store', {autoIncrement: true, keyPath: 'a.b.c'});
+    },
+    (t, db) => {
+      const tx = db.transaction('store', 'readwrite', {durability: 'relaxed'});
+      assert_throws_dom('DataError', () => {
+        tx.objectStore('store').put({a: {b: 'foo'}});
+      }, 'Put should throw if key can not be inserted at key path location.');
+      t.done();
+    },
+    'The last element of keypath is validated');
+
+const err = Error();
+err.name = 'getter';
+
+function throwingGetter() {
+  throw err;
+}
+
+indexeddb_test(
+    function(t, db) {
+      const o = {};
+      Object.defineProperty(
+          o, 'throws',
+          {get: throwingGetter, enumerable: false, configurable: true});
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no such property, so key path evaluation
+      // will fail.
+      const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
+      assert_throws_dom('DataError', () => {
+        s1.put(o);
+      }, 'Key path failing to resolve should throw');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no such property, so key path evaluation
+      // will fail.
+      const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
+      assert_throws_dom('DataError', () => {
+        s2.put(o);
+      }, 'Key path failing to resolve should throw');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no such property, so generated key can be
+      // inserted.
+      const s3 =
+          db.createObjectStore('s3', {keyPath: 'throws', autoIncrement: true});
+      assert_class_string(
+          s3.put(o), 'IDBRequest',
+          'Key injectability test at throwing getter should succeed');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no such property, so intermediate object
+      // and generated key can be inserted.
+      const s4 = db.createObjectStore(
+          's4', {keyPath: 'throws.x', autoIncrement: true});
+      assert_class_string(
+          s4.put(o), 'IDBRequest',
+          'Key injectability test past throwing getter should succeed');
+    },
+    (t, db) => {
+      t.done();
+    },
+    'Key path evaluation: Exceptions from non-enumerable getters');
+
+indexeddb_test(
+    function(t, db) {
+      const o = {};
+      Object.defineProperty(
+          o, 'throws',
+          {get: throwingGetter, enumerable: true, configurable: true});
+
+      // Value should be cloned before key path is evaluated,
+      // and enumerable getter will rethrow.
+      const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
+      assert_throws_exactly(err, () => {
+        s1.put(o);
+      }, 'Key path resolving to throwing getter rethrows');
+
+      // Value should be cloned before key path is evaluated,
+      // and enumerable getter will rethrow.
+      const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
+      assert_throws_exactly(err, () => {
+        s2.put(o);
+      }, 'Key path resolving past throwing getter rethrows');
+
+      // Value should be cloned before key path is evaluated,
+      // and enumerable getter will rethrow.
+      const s3 =
+          db.createObjectStore('s3', {keyPath: 'throws', autoIncrement: true});
+      assert_throws_exactly(err, () => {
+        s3.put(o);
+      }, 'Key injectability test at throwing getter should rethrow');
+
+      // Value should be cloned before key path is evaluated,
+      // and enumerable getter will rethrow.
+      const s4 = db.createObjectStore(
+          's4', {keyPath: 'throws.x', autoIncrement: true});
+      assert_throws_exactly(err, () => {
+        s4.put(o);
+      }, 'Key injectability test past throwing getter should rethrow');
+    },
+    (t, db) => {
+      t.done();
+    },
+    'Key path evaluation: Exceptions from enumerable getters');
+
+indexeddb_test(
+    (t, db) => {
+      // Implemented as function wrapper to clean up
+      // immediately after use, otherwise it may
+      // interfere with the test harness.
+      function with_proto_getter(f) {
+        return function() {
+          Object.defineProperty(
+              Object.prototype, 'throws',
+              {get: throwingGetter, enumerable: false, configurable: true});
+          try {
+            f();
+          } finally {
+            delete Object.prototype['throws'];
+          }
+        };
+      }
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no own property, so key path evaluation will
+      // fail and DataError should be thrown.
+      const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
+      assert_throws_dom(
+          'DataError', with_proto_getter(function() {
+            s1.put({});
+          }),
+          'Key path resolving to no own property throws DataError');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no own property, so key path evaluation will
+      // fail and DataError should be thrown.
+      const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
+      assert_throws_dom(
+          'DataError', with_proto_getter(function() {
+            s2.put({});
+          }),
+          'Key path resolving past no own property throws DataError');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no own property, so key path evaluation will
+      // fail and injection can succeed.
+      const s3 =
+          db.createObjectStore('s3', {keyPath: 'throws', autoIncrement: true});
+      assert_equals(
+          s3.put({}).readyState, 'pending',
+          'put should not throw due to inherited property');
+
+      // Value should be cloned before key path is evaluated,
+      // and non-enumerable getter will be ignored. The clone
+      // will have no own property, so key path evaluation will
+      // fail and injection can succeed.
+      const s4 = db.createObjectStore(
+          's4', {keyPath: 'throws.x', autoIncrement: true});
+      assert_equals(
+          s4.put({}).readyState, 'pending',
+          'put should not throw due to inherited property');
+    },
+    (t, db) => {
+      t.done();
+    },
+    'Key path evaluation: Exceptions from non-enumerable getters on prototype');
+
+indexeddb_test(
+    (t, db) => {
+      // Implemented as function wrapper to clean up
+      // immediately after use, otherwise it may
+      // interfere with the test harness.
+      function with_proto_getter(f) {
+        return () => {
+          Object.defineProperty(
+              Object.prototype, 'throws',
+              {get: throwingGetter, enumerable: true, configurable: true});
+          try {
+            f();
+          } finally {
+            delete Object.prototype['throws'];
+          }
+        };
+      }
+
+      // Value should be cloned before key path is evaluated.
+      // The clone will have no own property, so key path
+      // evaluation will fail and DataError should be thrown.
+      const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
+      assert_throws_dom(
+          'DataError', with_proto_getter(function() {
+            s1.put({});
+          }),
+          'Key path resolving to no own property throws DataError');
+
+      // Value should be cloned before key path is evaluated.
+      // The clone will have no own property, so key path
+      // evaluation will fail and DataError should be thrown.
+      const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
+      assert_throws_dom(
+          'DataError', with_proto_getter(function() {
+            s2.put({});
+          }),
+          'Key path resolving past throwing getter rethrows');
+
+      // Value should be cloned before key path is evaluated.
+      // The clone will have no own property, so key path
+      // evaluation will fail and injection can succeed.
+      let s3 =
+          db.createObjectStore('s3', {keyPath: 'throws', autoIncrement: true});
+      assert_equals(
+          s3.put({}).readyState, 'pending',
+          'put should not throw due to inherited property');
+
+      // Value should be cloned before key path is evaluated.
+      // The clone will have no own property, so key path
+      // evaluation will fail and injection can succeed.
+      let s4 = db.createObjectStore(
+          's4', {keyPath: 'throws.x', autoIncrement: true});
+      assert_equals(
+          s4.put({}).readyState, 'pending',
+          'put should not throw due to inherited property');
+    },
+    (t, db) => {
+      t.done();
+    },
+    'Key path evaluation: Exceptions from enumerable getters on prototype');
+
+indexeddb_test(
+    (t, db) => {
+      const store = db.createObjectStore('store');
+      store.createIndex('index', 'index0');
+    },
+    (t, db) => {
+      const tx = db.transaction('store', 'readwrite', {durability: 'relaxed'});
+
+      const array = [];
+      array[99] = 1;
+
+      // Implemented as function wrapper to clean up
+      // immediately after use, otherwise it may
+      // interfere with the test harness.
+      let getter_called = 0;
+      function with_proto_getter(f) {
+        const prop = '50';
+        Object.defineProperty(Object.prototype, prop, {
+          enumerable: true,
+          configurable: true,
+          get: () => {
+            ++getter_called;
+            return 'foo';
+          }
+        });
+        try {
+          return f();
+        } finally {
+          delete Object.prototype[prop];
+        }
+      }
+
+      const request = with_proto_getter(
+          () => tx.objectStore('store').put({index0: array}, 'key'));
+      request.onerror = t.unreached_func('put should not fail');
+      request.onsuccess = t.step_func(function() {
+        assert_equals(
+            getter_called, 0, 'Prototype getter should not be called');
+        t.done();
+      });
+    },
+    'Array key conversion should not invoke prototype getters');
diff --git a/tests/wpt/tests/IndexedDB/keypath-exceptions.htm b/tests/wpt/tests/IndexedDB/keypath-exceptions.htm
deleted file mode 100644
index b0569f9294e..00000000000
--- a/tests/wpt/tests/IndexedDB/keypath-exceptions.htm
+++ /dev/null
@@ -1,281 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>IndexedDB: Exceptions in extracting keys from values (ES bindings)</title>
-<meta name="help" href="https://w3c.github.io/IndexedDB/#extract-key-from-value">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-<script>
-
-indexeddb_test(
-  (t, db) => {
-    db.createObjectStore('store', {autoIncrement: true, keyPath: 'a.b.c'});
-  },
-  (t, db) => {
-    const tx = db.transaction('store', 'readwrite');
-    assert_throws_dom('DataError', () => {
-      tx.objectStore('store').put({a: {b: "foo"}});
-    }, 'Put should throw if key can not be inserted at key path location.');
-    t.done();
-  },
-  'The last element of keypath is validated'
-);
-
-const err = Error();
-err.name = 'getter';
-
-function throwingGetter() {
-  throw err;
-}
-
-indexeddb_test(
-  function(t, db) {
-    const o = {};
-    Object.defineProperty(o, 'throws', {get: throwingGetter,
-        enumerable: false, configurable: true});
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no such property, so key path evaluation
-    // will fail.
-    const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
-    assert_throws_dom('DataError', () => {
-      s1.put(o);
-    }, 'Key path failing to resolve should throw');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no such property, so key path evaluation
-    // will fail.
-    const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
-    assert_throws_dom('DataError', () => {
-      s2.put(o);
-    }, 'Key path failing to resolve should throw');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no such property, so generated key can be
-    // inserted.
-    const s3 = db.createObjectStore('s3',
-        {keyPath: 'throws', autoIncrement: true});
-    assert_class_string(s3.put(o), 'IDBRequest',
-        'Key injectability test at throwing getter should succeed');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no such property, so intermediate object
-    // and generated key can be inserted.
-    const s4 = db.createObjectStore('s4',
-        {keyPath: 'throws.x', autoIncrement: true});
-    assert_class_string(s4.put(o), 'IDBRequest',
-        'Key injectability test past throwing getter should succeed');
-  },
-  (t, db) => {
-    t.done();
-  },
-  'Key path evaluation: Exceptions from non-enumerable getters'
-);
-
-indexeddb_test(
-  function(t, db) {
-    const o = {};
-    Object.defineProperty(o, 'throws', {get: throwingGetter,
-        enumerable: true, configurable: true});
-
-    // Value should be cloned before key path is evaluated,
-    // and enumerable getter will rethrow.
-    const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
-    assert_throws_exactly(err, () => {
-      s1.put(o);
-    }, 'Key path resolving to throwing getter rethrows');
-
-    // Value should be cloned before key path is evaluated,
-    // and enumerable getter will rethrow.
-    const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
-    assert_throws_exactly(err, () => {
-      s2.put(o);
-    }, 'Key path resolving past throwing getter rethrows');
-
-    // Value should be cloned before key path is evaluated,
-    // and enumerable getter will rethrow.
-    const s3 = db.createObjectStore('s3',
-        {keyPath: 'throws', autoIncrement: true});
-    assert_throws_exactly(err, () => {
-      s3.put(o);
-    }, 'Key injectability test at throwing getter should rethrow');
-
-    // Value should be cloned before key path is evaluated,
-    // and enumerable getter will rethrow.
-    const s4 = db.createObjectStore('s4',
-        {keyPath: 'throws.x', autoIncrement: true});
-    assert_throws_exactly(err, () => {
-      s4.put(o);
-    }, 'Key injectability test past throwing getter should rethrow');
-  },
-  (t, db) => {
-    t.done();
-  },
-  'Key path evaluation: Exceptions from enumerable getters'
-);
-
-indexeddb_test(
-  (t, db) => {
-    // Implemented as function wrapper to clean up
-    // immediately after use, otherwise it may
-    // interfere with the test harness.
-    function with_proto_getter(f) {
-      return function() {
-        Object.defineProperty(Object.prototype, 'throws', {
-          get: throwingGetter,
-          enumerable: false, configurable: true
-        });
-        try {
-          f();
-        } finally {
-          delete Object.prototype['throws'];
-        }
-      };
-    }
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no own property, so key path evaluation will
-    // fail and DataError should be thrown.
-    const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
-    assert_throws_dom('DataError', with_proto_getter(function() {
-      s1.put({});
-    }), 'Key path resolving to no own property throws DataError');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no own property, so key path evaluation will
-    // fail and DataError should be thrown.
-    const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
-    assert_throws_dom('DataError', with_proto_getter(function() {
-      s2.put({});
-    }), 'Key path resolving past no own property throws DataError');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no own property, so key path evaluation will
-    // fail and injection can succeed.
-    const s3 = db.createObjectStore('s3',
-        {keyPath: 'throws', autoIncrement: true});
-    assert_equals(s3.put({}).readyState, 'pending',
-                  'put should not throw due to inherited property');
-
-    // Value should be cloned before key path is evaluated,
-    // and non-enumerable getter will be ignored. The clone
-    // will have no own property, so key path evaluation will
-    // fail and injection can succeed.
-    const s4 = db.createObjectStore('s4',
-        {keyPath: 'throws.x', autoIncrement: true});
-    assert_equals(s4.put({}).readyState, 'pending',
-                  'put should not throw due to inherited property');
-  },
-  (t, db) => {
-    t.done();
-  },
-  'Key path evaluation: Exceptions from non-enumerable getters on prototype'
-);
-
-indexeddb_test(
-  (t, db) => {
-    // Implemented as function wrapper to clean up
-    // immediately after use, otherwise it may
-    // interfere with the test harness.
-    function with_proto_getter(f) {
-      return () => {
-        Object.defineProperty(Object.prototype, 'throws', {
-          get: throwingGetter,
-          enumerable: true, configurable: true
-        });
-        try {
-          f();
-        } finally {
-          delete Object.prototype['throws'];
-        }
-      };
-    }
-
-    // Value should be cloned before key path is evaluated.
-    // The clone will have no own property, so key path
-    // evaluation will fail and DataError should be thrown.
-    const s1 = db.createObjectStore('s1', {keyPath: 'throws'});
-    assert_throws_dom('DataError', with_proto_getter(function() {
-      s1.put({});
-    }), 'Key path resolving to no own property throws DataError');
-
-    // Value should be cloned before key path is evaluated.
-    // The clone will have no own property, so key path
-    // evaluation will fail and DataError should be thrown.
-    const s2 = db.createObjectStore('s2', {keyPath: 'throws.x'});
-    assert_throws_dom('DataError', with_proto_getter(function() {
-      s2.put({});
-    }), 'Key path resolving past throwing getter rethrows');
-
-    // Value should be cloned before key path is evaluated.
-    // The clone will have no own property, so key path
-    // evaluation will fail and injection can succeed.
-    var s3 = db.createObjectStore('s3',
-        {keyPath: 'throws', autoIncrement: true});
-    assert_equals(s3.put({}).readyState, 'pending',
-                  'put should not throw due to inherited property');
-
-    // Value should be cloned before key path is evaluated.
-    // The clone will have no own property, so key path
-    // evaluation will fail and injection can succeed.
-    var s4 = db.createObjectStore('s4',
-        {keyPath: 'throws.x', autoIncrement: true});
-    assert_equals(s4.put({}).readyState, 'pending',
-                  'put should not throw due to inherited property');
-  },
-  (t, db) => {
-    t.done();
-  },
-  'Key path evaluation: Exceptions from enumerable getters on prototype'
-);
-
-indexeddb_test(
-  (t, db) => {
-    const store = db.createObjectStore('store');
-    store.createIndex('index', 'index0');
-  },
-  (t, db) => {
-    const tx = db.transaction('store', 'readwrite');
-
-    const array = [];
-    array[99] = 1;
-
-    // Implemented as function wrapper to clean up
-    // immediately after use, otherwise it may
-    // interfere with the test harness.
-    let getter_called = 0;
-    function with_proto_getter(f) {
-      const prop = '50';
-      Object.defineProperty(Object.prototype, prop, {
-        enumerable: true, configurable: true,
-        get: () => {
-          ++getter_called;
-          return 'foo';
-        }
-      });
-      try {
-        return f();
-      } finally {
-        delete Object.prototype[prop];
-      }
-    }
-
-    const request = with_proto_getter(
-      () => tx.objectStore('store').put({index0: array}, 'key'));
-    request.onerror = t.unreached_func('put should not fail');
-    request.onsuccess = t.step_func(function() {
-      assert_equals(getter_called, 0, 'Prototype getter should not be called');
-      t.done();
-    });
-  },
-  'Array key conversion should not invoke prototype getters'
-);
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/keypath-special-identifiers.any.js b/tests/wpt/tests/IndexedDB/keypath-special-identifiers.any.js
new file mode 100644
index 00000000000..7bd8114e2d8
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keypath-special-identifiers.any.js
@@ -0,0 +1,62 @@
+// META: global=window,worker
+// META: title=IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#extract-key-from-value
+
+'use strict';
+
+[{
+  type: 'String',
+  property: 'length',
+  instance: 'abc',
+},
+ {
+   type: 'Array',
+   property: 'length',
+   instance: ['a', 'b', 'c'],
+ },
+ {
+   type: 'Blob',
+   property: 'size',
+   instance: new Blob(['abc']),
+ },
+ {
+   type: 'Blob',
+   property: 'type',
+   instance: new Blob([''], {type: 'foo/bar'}),
+ },
+ {
+   type: 'File',
+   property: 'name',
+   instance: new File([''], 'foo'),
+ },
+ {
+   type: 'File',
+   property: 'lastModified',
+   instance: new File([''], '', {lastModified: 123}),
+ },
+].forEach(function(testcase) {
+  indexeddb_test(
+      (t, db) => {
+        db.createObjectStore(
+            'store', {autoIncrement: true, keyPath: testcase.property});
+      },
+      (t, db) => {
+        const key = testcase.instance[testcase.property];
+        const tx =
+            db.transaction('store', 'readwrite', {durability: 'relaxed'});
+        tx.objectStore('store').put(testcase.instance);
+        const request = tx.objectStore('store').get(key);
+        request.onerror = t.unreached_func('request should not fail');
+        request.onsuccess = t.step_func(function() {
+          const result = request.result;
+          assert_key_equals(
+              result[testcase.property], key, 'Property should be used as key');
+        });
+        tx.oncomplete = t.step_func(function() {
+          t.done();
+        });
+      },
+      'Type: ' + testcase.type + ', identifier: ' + testcase.property);
+});
diff --git a/tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm b/tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm
deleted file mode 100644
index a521ed8bb89..00000000000
--- a/tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>IndexedDB: Special-cased identifiers in extracting keys from values (ES bindings)</title>
-<meta name="help" href="https://w3c.github.io/IndexedDB/#extract-key-from-value">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-<script>
-
-[
-  {
-    type: 'String',
-    property: 'length',
-    instance: 'abc',
-  },
-  {
-    type: 'Array',
-    property: 'length',
-    instance: ['a', 'b', 'c'],
-  },
-  {
-    type: 'Blob',
-    property: 'size',
-    instance: new Blob(['abc']),
-  },
-  {
-    type: 'Blob',
-    property: 'type',
-    instance: new Blob([''], {type:'foo/bar'}),
-  },
-  {
-    type: 'File',
-    property: 'name',
-    instance: new File([''], 'foo'),
-  },
-  {
-    type: 'File',
-    property: 'lastModified',
-    instance: new File([''], '', {lastModified: 123}),
-  },
-].forEach(function(testcase) {
-  indexeddb_test(
-    (t, db) => {
-      db.createObjectStore(
-          'store', {autoIncrement: true, keyPath: testcase.property});
-    },
-    (t, db) => {
-      const key = testcase.instance[testcase.property];
-      const tx = db.transaction('store', 'readwrite');
-      tx.objectStore('store').put(testcase.instance);
-      const request = tx.objectStore('store').get(key);
-      request.onerror = t.unreached_func('request should not fail');
-      request.onsuccess = t.step_func(function() {
-        const result = request.result;
-        assert_key_equals(result[testcase.property], key,
-                          'Property should be used as key');
-      });
-      tx.oncomplete = t.step_func(function() {
-        t.done();
-      });
-    },
-    'Type: ' + testcase.type + ', identifier: ' + testcase.property
-  );
-});
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/keypath.any.js b/tests/wpt/tests/IndexedDB/keypath.any.js
new file mode 100644
index 00000000000..c47dd72e872
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keypath.any.js
@@ -0,0 +1,138 @@
+// META: global=window,worker
+// META: title=Keypath
+// META: script=resources/support.js
+
+// Spec:
+// http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct
+
+'use strict';
+
+let global_db = createdb_for_multiple_tests();
+
+function keypath(keypath, objects, expected_keys, desc) {
+  let db;
+  let t = async_test(self.title + ' - ' + (desc ? desc : keypath));
+  let store_name = 'store-' + (Date.now()) + Math.random();
+
+  let open_rq = global_db.setTest(t);
+  open_rq.onupgradeneeded = function(e) {
+    db = e.target.result;
+    let objStore = db.createObjectStore(store_name, {keyPath: keypath});
+
+    for (let i = 0; i < objects.length; i++)
+      objStore.add(objects[i]);
+  };
+
+  open_rq.onsuccess = function(e) {
+    let actual_keys = [];
+    let rq = db.transaction(store_name).objectStore(store_name).openCursor();
+
+    rq.onsuccess = t.step_func(function(e) {
+      let cursor = e.target.result;
+
+      if (cursor) {
+        actual_keys.push(cursor.key.valueOf());
+        cursor.continue();
+      } else {
+        assert_key_equals(actual_keys, expected_keys, 'keyorder array');
+        t.done();
+      }
+    });
+  };
+}
+
+keypath('my.key', [{my: {key: 10}}], [10]);
+
+keypath('my.køi', [{my: {køi: 5}}], [5]);
+
+keypath('my.key_ya', [{my: {key_ya: 10}}], [10]);
+
+keypath('public.key$ya', [{public: {key$ya: 10}}], [10]);
+
+keypath('true.$', [{true: {$: 10}}], [10]);
+
+keypath('my._', [{my: {_: 10}}], [10]);
+
+keypath('delete.a7', [{delete: {a7: 10}}], [10]);
+
+keypath(
+    'p.p.p.p.p.p.p.p.p.p.p.p.p.p',
+    [{p: {p: {p: {p: {p: {p: {p: {p: {p: {p: {p: {p: {p: {p: 10}}}}}}}}}}}}}}],
+    [10]);
+
+keypath(
+    'str.length', [{str: 'pony'}, {str: 'my'}, {str: 'little'}, {str: ''}],
+    [0, 2, 4, 6]);
+
+keypath(
+    'arr.length',
+    [
+      {arr: [0, 0, 0, 0]}, {arr: [{}, 0, 'hei', 'length', Infinity, []]},
+      {arr: [10, 10]}, {arr: []}
+    ],
+    [0, 2, 4, 6]);
+
+keypath('length', [[10, 10], '123', {length: 20}], [2, 3, 20]);
+
+keypath(
+    '', [['bags'], 'bean', 10], [10, 'bean', ['bags']],
+    '\'\' uses value as key');
+
+keypath(
+    [''], [['bags'], 'bean', 10], [[10], ['bean'], [['bags']]],
+    '[\'\'] uses value as [key]');
+
+keypath(
+    ['x', 'y'], [{x: 10, y: 20}, {y: 1.337, x: 100}], [[10, 20], [100, 1.337]],
+    '[\'x\', \'y\']');
+
+keypath(
+    [['x'], ['y']], [{x: 10, y: 20}, {y: 1.337, x: 100}],
+    [[10, 20], [100, 1.337]], '[[\'x\'], \'y\'] (stringifies)');
+
+keypath(
+    [
+      'x', {
+        toString: function() {
+          return 'y'
+        }
+      }
+    ],
+    [{x: 10, y: 20}, {y: 1.337, x: 100}], [[10, 20], [100, 1.337]],
+    '[\'x\', {toString->\'y\'}] (stringifies)');
+
+if (false) {
+  let myblob = Blob(['Yoda'], {type: 'suprawsum'});
+  keypath(
+      ['length', 'type'], [myblob], [4, 'suprawsum'],
+      '[Blob.length, Blob.type]');
+}
+
+// File.name and File.lastModified is not testable automatically
+
+keypath(
+    ['name', 'type'],
+    [
+      {name: 'orange', type: 'fruit'},
+      {name: 'orange', type: ['telecom', 'french']}
+    ],
+    [['orange', 'fruit'], ['orange', ['telecom', 'french']]]);
+
+keypath(
+    ['name', 'type.name'],
+    [
+      {name: 'orange', type: {name: 'fruit'}},
+      {name: 'orange', type: {name: 'telecom'}}
+    ],
+    [['orange', 'fruit'], ['orange', 'telecom']]);
+
+keypath(
+    ['type'],
+    [{name: 'orange', type: 'fruit'}, {name: 'cucumber', type: 'vegetable'}],
+    [['fruit'], ['vegetable']], 'list with 1 field');
+
+let loop_array = [];
+loop_array.push(loop_array);
+keypath(
+    loop_array, ['a', 1, ['k']], [[1], ['a'], [['k']]],
+    'array loop -> stringify becomes [\'\']');
diff --git a/tests/wpt/tests/IndexedDB/keypath.htm b/tests/wpt/tests/IndexedDB/keypath.htm
deleted file mode 100644
index 06f5947d35c..00000000000
--- a/tests/wpt/tests/IndexedDB/keypath.htm
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
-<meta charset="utf-8">
-<title>Keypath</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct">
-<link rel=assert title="A key path is a DOMString that defines how to extract a key from a value. A valid key path is either the empty string, a JavaScript identifier, or multiple Javascript identifiers separated by periods (ASCII character code 46) [ECMA-262].">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-
-<script>
-
-    var global_db = createdb_for_multiple_tests();
-
-    function keypath(keypath, objects, expected_keys, desc) {
-        var db,
-            t = async_test(document.title + " - " + (desc ? desc : keypath)),
-
-            store_name = "store-"+(Date.now())+Math.random();
-
-        var open_rq = global_db.setTest(t);
-        open_rq.onupgradeneeded = function(e) {
-            db = e.target.result;
-            var objStore = db.createObjectStore(store_name, { keyPath: keypath });
-
-            for (var i = 0; i < objects.length; i++)
-                objStore.add(objects[i]);
-        };
-
-        open_rq.onsuccess = function(e) {
-            var actual_keys = [],
-              rq = db.transaction(store_name)
-                     .objectStore(store_name)
-                     .openCursor();
-
-            rq.onsuccess = t.step_func(function(e) {
-                var cursor = e.target.result;
-
-                if (cursor) {
-                    actual_keys.push(cursor.key.valueOf());
-                    cursor.continue();
-                }
-                else {
-                    assert_key_equals(actual_keys, expected_keys, "keyorder array");
-                    t.done();
-                }
-            });
-        };
-    }
-
-    keypath('my.key',
-        [ { my: { key: 10 } } ],
-        [ 10 ]);
-
-    keypath('my.køi',
-        [ { my: { køi: 5 } } ],
-        [ 5 ]);
-
-    keypath('my.key_ya',
-        [ { my: { key_ya: 10 } } ],
-        [ 10 ]);
-
-    keypath('public.key$ya',
-        [ { public: { key$ya: 10 } } ],
-        [ 10 ]);
-
-    keypath('true.$',
-        [ { true: { $: 10 } } ],
-        [ 10 ]);
-
-    keypath('my._',
-        [ { my: { _: 10 } } ],
-        [ 10 ]);
-
-    keypath('delete.a7',
-        [ { delete: { a7: 10 } } ],
-        [ 10 ]);
-
-    keypath('p.p.p.p.p.p.p.p.p.p.p.p.p.p',
-        [ {p:{p:{p:{p:{p:{p:{p:{p:{p:{p:{p:{p:{p:{p:10}}}}}}}}}}}}}} ],
-        [ 10 ]);
-
-    keypath('str.length',
-        [ { str: "pony" }, { str: "my" }, { str: "little" }, { str: "" } ],
-        [ 0, 2, 4, 6 ]);
-
-    keypath('arr.length',
-        [ {arr: [0, 0, 0, 0]}, {arr: [{}, 0, "hei", "length", Infinity, []]}, {arr: [10, 10]}, { arr: []} ],
-        [ 0, 2, 4, 6 ]);
-
-    keypath('length',
-        [ [10, 10], "123", { length: 20 } ],
-        [ 2, 3, 20 ]);
-
-    keypath('',
-        [ ["bags"], "bean", 10 ],
-        [ 10, "bean", ["bags"] ],
-        "'' uses value as key");
-
-    keypath([''],
-        [ ["bags"], "bean", 10 ],
-        [ [10], ["bean"] , [["bags"]] ],
-        "[''] uses value as [key]");
-
-    keypath(['x', 'y'],
-        [ {x:10, y:20}, {y:1.337, x:100} ],
-        [ [10, 20], [100, 1.337] ],
-        "['x', 'y']");
-
-    keypath([['x'], ['y']],
-        [ {x:10, y:20}, {y:1.337, x:100} ],
-        [ [10, 20], [100, 1.337] ],
-        "[['x'], 'y'] (stringifies)");
-
-    keypath(['x', {toString:function(){return 'y'}}],
-        [ {x:10, y:20}, {y:1.337, x:100} ],
-        [ [10, 20], [100, 1.337] ],
-        "['x', {toString->'y'}] (stringifies)");
-
-    if (false) {
-        var myblob = Blob(["Yoda"], {type:'suprawsum'});
-        keypath(['length', 'type'],
-            [ myblob ],
-            [ 4, 'suprawsum' ],
-            "[Blob.length, Blob.type]");
-    }
-
-    // File.name and File.lastModified is not testable automatically
-
-    keypath(['name', 'type'],
-        [ { name: "orange", type: "fruit" }, { name: "orange", type: ["telecom", "french"] } ],
-        [ ["orange", "fruit"], ["orange", ["telecom", "french"]] ]);
-
-    keypath(['name', 'type.name'],
-        [ { name: "orange", type: { name: "fruit" }}, { name: "orange", type: { name: "telecom" }} ],
-        [ ["orange", "fruit"], ["orange", "telecom" ] ]);
-
-    keypath(['type'],
-        [ { name: "orange", type: "fruit" }, { name: "cucumber", type: "vegetable" } ],
-        [ ["fruit"], ["vegetable"] ], "list with 1 field");
-
-    loop_array = [];
-    loop_array.push(loop_array);
-    keypath(loop_array,
-        [ "a", 1, ["k"] ],
-        [ [1], ["a"], [["k"]] ],
-        "array loop -> stringify becomes ['']");
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/keypath_invalid.any.js b/tests/wpt/tests/IndexedDB/keypath_invalid.any.js
new file mode 100644
index 00000000000..b755c4d16cd
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keypath_invalid.any.js
@@ -0,0 +1,69 @@
+// META: global=window,worker
+// META: title=Invalid keypath
+// META: script=resources/support.js
+
+// Spec:
+// http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct
+
+'use strict';
+
+let global_db = createdb_for_multiple_tests();
+
+function invalid_keypath(keypath, desc) {
+  let t = async_test(
+      'Invalid keyPath - ' + (desc ? desc : format_value(keypath)), undefined,
+      2);
+
+  let openrq = global_db.setTest(t);
+  let store_name = 'store-' + Date.now() + Math.random();
+
+  openrq.onupgradeneeded = function(e) {
+    let db = e.target.result;
+    assert_throws_dom('SyntaxError', function() {
+      db.createObjectStore(store_name, {keyPath: keypath})
+    }, 'createObjectStore with keyPath');
+
+    let store = db.createObjectStore(store_name);
+    assert_throws_dom('SyntaxError', function() {
+      store.createIndex('index', keypath);
+    }, 'createIndex with keyPath');
+
+    db.close();
+
+    t.done();
+  };
+}
+
+invalid_keypath('j a');
+invalid_keypath('.yo');
+invalid_keypath('yo,lo');
+invalid_keypath([]);
+invalid_keypath(['array with space']);
+invalid_keypath(
+    ['multi_array', ['a', 'b']],
+    'multidimensional array (invalid toString)');  // => ['multi_array',
+                                                   // 'a,b']
+invalid_keypath('3m');
+invalid_keypath(
+    {
+      toString: function() {
+        return '3m'
+      }
+    },
+    '{toString->3m}');
+invalid_keypath('my.1337');
+invalid_keypath('..yo');
+invalid_keypath('y..o');
+invalid_keypath('y.o.');
+invalid_keypath('y.o..');
+invalid_keypath('m.*');
+invalid_keypath('"m"');
+invalid_keypath('m%');
+invalid_keypath('m/');
+invalid_keypath('m/a');
+invalid_keypath('m&');
+invalid_keypath('m!');
+invalid_keypath('*');
+invalid_keypath('*.*');
+invalid_keypath('^m');
+invalid_keypath('/m/');
diff --git a/tests/wpt/tests/IndexedDB/keypath_invalid.htm b/tests/wpt/tests/IndexedDB/keypath_invalid.htm
deleted file mode 100644
index 6aa33c854ac..00000000000
--- a/tests/wpt/tests/IndexedDB/keypath_invalid.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
-<meta charset="utf-8">
-<title>Invalid keypath</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct">
-<link rel=assert title="A key path is a DOMString that defines how to extract a key from a value. A valid key path is either the empty string, a JavaScript identifier, or multiple Javascript identifiers separated by periods (ASCII character code 46) [ECMA-262].">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-
-<script>
-
-    var global_db = createdb_for_multiple_tests();
-
-    function invalid_keypath(keypath, desc) {
-        var t = async_test("Invalid keyPath - " + (desc ? desc : format_value(keypath)), undefined, 2);
-
-        var openrq = global_db.setTest(t),
-            store_name  = "store-" + Date.now() + Math.random();
-
-        openrq.onupgradeneeded = function(e) {
-            var db = e.target.result;
-            assert_throws_dom('SyntaxError', function() {
-                    db.createObjectStore(store_name, { keyPath: keypath })
-                }, "createObjectStore with keyPath");
-
-            var store = db.createObjectStore(store_name);
-            assert_throws_dom('SyntaxError', function() {
-                    store.createIndex('index', keypath);
-                }, "createIndex with keyPath");
-
-            db.close();
-
-            this.done();
-        };
-    }
-
-    invalid_keypath('j a');
-    invalid_keypath('.yo');
-    invalid_keypath('yo,lo');
-    invalid_keypath([]);
-    invalid_keypath(['array with space']);
-    invalid_keypath(['multi_array', ['a', 'b']], "multidimensional array (invalid toString)"); // => ['multi_array', 'a,b']
-    invalid_keypath('3m');
-    invalid_keypath({toString:function(){return '3m'}}, '{toString->3m}');
-    invalid_keypath('my.1337');
-    invalid_keypath('..yo');
-    invalid_keypath('y..o');
-    invalid_keypath('y.o.');
-    invalid_keypath('y.o..');
-    invalid_keypath('m.*');
-    invalid_keypath('"m"');
-    invalid_keypath('m%');
-    invalid_keypath('m/');
-    invalid_keypath('m/a');
-    invalid_keypath('m&');
-    invalid_keypath('m!');
-    invalid_keypath('*');
-    invalid_keypath('*.*');
-    invalid_keypath('^m');
-    invalid_keypath('/m/');
-
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/keypath_maxsize.any.js b/tests/wpt/tests/IndexedDB/keypath_maxsize.any.js
new file mode 100644
index 00000000000..e20a9b1d3a9
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keypath_maxsize.any.js
@@ -0,0 +1,78 @@
+// META: global=window,worker
+// META: title=Keypath
+// META: script=resources/support.js
+
+// Spec:
+// http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct
+
+'use strict';
+
+function keypath(keypath, objects, expected_keys, desc) {
+  let db;
+  let t = async_test(self.title + ' - ' + (desc ? desc : keypath));
+  let open_rq = createdb(t);
+
+  open_rq.onupgradeneeded = function(e) {
+    db = e.target.result;
+    let objStore = db.createObjectStore('store', {keyPath: keypath});
+
+    for (let i = 0; i < objects.length; i++)
+      objStore.add(objects[i]);
+  };
+
+  open_rq.onerror = function(e) {
+    assert_unreached(e.target.error.name);
+  };
+
+  open_rq.onsuccess = function(e) {
+    let actual_keys = [],
+        rq = db.transaction('store', 'readonly', {durability: 'relaxed'})
+                 .objectStore('store')
+                 .openCursor();
+
+    rq.onsuccess = t.step_func(function(e) {
+      let cursor = e.target.result;
+
+      if (cursor) {
+        actual_keys.push(cursor.key.valueOf());
+        cursor.continue();
+      } else {
+        assert_array_equals(actual_keys, expected_keys, 'keyorder array');
+        t.done();
+      }
+    });
+  };
+}
+
+keypath(
+    'maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
+    [{
+      maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai:
+          {
+            keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey:
+                10
+          }
+    }],
+    [10], '~260 chars');
+
+keypath(
+    'maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
+    [{
+      maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai:
+          {
+            keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey:
+                10
+          }
+    }],
+    [10], '~530 chars');
+
+keypath(
+    'maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
+    [{
+      maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai:
+          {
+            keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey:
+                10
+          }
+    }],
+    [10], '~1050 chars');
diff --git a/tests/wpt/tests/IndexedDB/keypath_maxsize.htm b/tests/wpt/tests/IndexedDB/keypath_maxsize.htm
deleted file mode 100644
index 1abbc1403d4..00000000000
--- a/tests/wpt/tests/IndexedDB/keypath_maxsize.htm
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Keypath</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-path-construct">
-<link rel=assert title="A key path is a DOMString that defines how to extract a key from a value. A valid key path is either the empty string, a JavaScript identifier, or multiple Javascript identifiers separated by periods (ASCII character code 46) [ECMA-262].">
-<meta name=timeout content=long>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-
-<script>
-    function keypath(keypath, objects, expected_keys, desc) {
-        var db,
-            t = async_test(document.title + " - " + (desc ? desc : keypath)),
-            open_rq = createdb(t);
-
-        open_rq.onupgradeneeded = function(e) {
-            db = e.target.result;
-            var objStore = db.createObjectStore("store", { keyPath: keypath });
-
-            for (var i = 0; i < objects.length; i++)
-                objStore.add(objects[i]);
-        };
-
-        open_rq.onerror = function(e) {
-            assert_unreached(e.target.error.name);
-        };
-
-        open_rq.onsuccess = function(e) {
-            var actual_keys = [],
-                rq = db.transaction("store", "readonly")
-                       .objectStore("store")
-                       .openCursor();
-
-            rq.onsuccess = t.step_func(function(e) {
-                var cursor = e.target.result;
-
-                if (cursor) {
-                    actual_keys.push(cursor.key.valueOf());
-                    cursor.continue();
-                } else {
-                    assert_array_equals(actual_keys, expected_keys, "keyorder array");
-                    t.done();
-                }
-            });
-        };
-    }
-
-    keypath('maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
-        [ { maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai: { keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey: 10 } } ],
-        [ 10 ], '~260 chars');
-
-    keypath('maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
-        [ { maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai: { keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey: 10 } } ],
-        [ 10 ], '~530 chars');
-
-    keypath('maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai.keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey',
-        [ { maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai_maaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaai: { keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey_keeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeey: 10 } } ],
-        [ 10 ], '~1050 chars');
-
-</script>
-
-<div id=log></log>
diff --git a/tests/wpt/tests/IndexedDB/request-abort-ordering.any.js b/tests/wpt/tests/IndexedDB/request-abort-ordering.any.js
new file mode 100644
index 00000000000..e050d327695
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/request-abort-ordering.any.js
@@ -0,0 +1,85 @@
+// META: title=IndexedDB: request abort events are delivered in order
+// META: global=window,worker
+// META: script=resources/support-promises.js
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#abort-transaction
+
+'use strict';
+
+promise_test(testCase => {
+  let requests;
+
+  return createDatabase(
+             testCase,
+             (database, transaction) => {
+               createBooksStore(testCase, database);
+             })
+      .then(database => {
+        const transaction = database.transaction(['books'], 'readwrite');
+        const store = transaction.objectStore('books');
+        const index = store.index('by_author');
+        const cursorRequest = store.openCursor(IDBKeyRange.lowerBound(0));
+
+        return new Promise((resolve, reject) => {
+          cursorRequest.onerror = testCase.step_func(event => {
+            event.preventDefault();
+            reject(cursorRequest.error);
+          });
+
+          cursorRequest.onsuccess = testCase.step_func(() => {
+            const cursor = cursorRequest.result;
+            requests = [
+              () => store.get(123456),
+              () => index.get('Fred'),
+              () => store.count(),
+              () => index.count(),
+              () =>
+                  store.put({title: 'Bedrock II', author: 'Barney', isbn: 987}),
+              () => store.getAll(),
+              () => index.getAll(),
+              () => store.get(999999),
+              () => index.get('Nobody'),
+              () => store.openCursor(IDBKeyRange.lowerBound(0)),
+              () => index.openCursor(IDBKeyRange.lowerBound('')),
+              () => {
+                cursor.continue();
+                return cursorRequest;
+              },
+            ];
+
+            const results = [];
+            const promises = [];
+            for (let i = 0; i < requests.length; ++i) {
+              promises.push(new Promise((resolve, reject) => {
+                const requestId = i;
+                const request = requests[i](store);
+                request.onsuccess = testCase.step_func(() => {
+                  reject(new Error(
+                      'IDB requests should not succeed after transaction abort'));
+                });
+                request.onerror = testCase.step_func(event => {
+                  event.preventDefault();
+                  results.push([requestId, request.error]);
+                  resolve();
+                });
+              }));
+            };
+            transaction.abort();
+            resolve(Promise.all(promises).then(() => results));
+          });
+        });
+      })
+      .then(results => {
+        assert_equals(
+            results.length, requests.length,
+            'Promise.all should resolve after all sub-promises resolve');
+        for (let i = 0; i < requests.length; ++i) {
+          assert_equals(
+              results[i][0], i, 'error event order should match request order');
+          assert_equals(
+              results[i][1].name, 'AbortError',
+              'transaction aborting should result in AbortError on all requests');
+        }
+      });
+});
diff --git a/tests/wpt/tests/IndexedDB/request-abort-ordering.html b/tests/wpt/tests/IndexedDB/request-abort-ordering.html
deleted file mode 100644
index 4374d8de708..00000000000
--- a/tests/wpt/tests/IndexedDB/request-abort-ordering.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<meta name="timeout" content="long">
-<title>IndexedDB: request abort events are delivered in order</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#abort-transaction">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support-promises.js"></script>
-<script>
-'use strict';
-
-promise_test(testCase => {
-  let requests;
-
-  return createDatabase(testCase, (database, transaction) => {
-    createBooksStore(testCase, database);
-  }).then(database => {
-    const transaction = database.transaction(['books'], 'readwrite');
-    const store = transaction.objectStore('books');
-    const index = store.index('by_author');
-    const cursorRequest = store.openCursor(IDBKeyRange.lowerBound(0));
-
-    return new Promise((resolve, reject) => {
-      cursorRequest.onerror = testCase.step_func(event => {
-        event.preventDefault();
-        reject(cursorRequest.error);
-      });
-
-      cursorRequest.onsuccess = testCase.step_func(() => {
-        const cursor = cursorRequest.result;
-        requests = [
-          () => store.get(123456),
-          () => index.get('Fred'),
-          () => store.count(),
-          () => index.count(),
-          () => store.put({title: 'Bedrock II', author: 'Barney', isbn: 987 }),
-          () => store.getAll(),
-          () => index.getAll(),
-          () => store.get(999999),
-          () => index.get('Nobody'),
-          () => store.openCursor(IDBKeyRange.lowerBound(0)),
-          () => index.openCursor(IDBKeyRange.lowerBound('')),
-          () => { cursor.continue(); return cursorRequest; },
-        ];
-
-        const results = [];
-        const promises = [];
-        for (let i = 0; i < requests.length; ++i) {
-          promises.push(new Promise((resolve, reject) => {
-            const requestId = i;
-            const request = requests[i](store);
-            request.onsuccess = testCase.step_func(() => {
-              reject(new Error(
-                  'IDB requests should not succeed after transaction abort'));
-            });
-            request.onerror = testCase.step_func(event => {
-              event.preventDefault();
-              results.push([requestId, request.error]);
-              resolve();
-            });
-          }));
-        };
-        transaction.abort();
-        resolve(Promise.all(promises).then(() => results));
-      });
-    });
-  }).then(results => {
-    assert_equals(
-        results.length, requests.length,
-        'Promise.all should resolve after all sub-promises resolve');
-    for (let i = 0; i < requests.length; ++i) {
-      assert_equals(
-          results[i][0], i,
-          'error event order should match request order');
-      assert_equals(
-          results[i][1].name, 'AbortError',
-          'transaction aborting should result in AbortError on all requests');
-    }
-  });
-});
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/request-event-ordering.html b/tests/wpt/tests/IndexedDB/request-event-ordering.any.js
similarity index 75%
rename from tests/wpt/tests/IndexedDB/request-event-ordering.html
rename to tests/wpt/tests/IndexedDB/request-event-ordering.any.js
index 71eda0dd1df..89c45091f1d 100644
--- a/tests/wpt/tests/IndexedDB/request-event-ordering.html
+++ b/tests/wpt/tests/IndexedDB/request-event-ordering.any.js
@@ -1,13 +1,11 @@
-<!doctype html>
-<meta charset="utf8">
-<meta name="timeout" content="long">
-<title>IndexedDB: request result events are delivered in order</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#abort-transaction">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support-promises.js"></script>
-<script>
+// META: title=IndexedDB: request result events are delivered in order
+// META: global=window,worker
+// META: script=resources/support-promises.js
+// META: script=resources/support.js
+// META: timeout=long
+
+// Spec: https://w3c.github.io/IndexedDB/#abort-transaction
+
 'use strict';
 
 // Should be large enough to trigger large value handling in the IndexedDB
@@ -15,10 +13,10 @@
 const wrapThreshold = 128 * 1024;
 
 function populateStore(store) {
-  store.put({id: 1, key: 'k1', value: largeValue(wrapThreshold, 1) });
-  store.put({id: 2, key: 'k2', value: ['small-2'] });
-  store.put({id: 3, key: 'k3', value: largeValue(wrapThreshold, 3) });
-  store.put({id: 4, key: 'k4', value: ['small-4'] });
+  store.put({id: 1, key: 'k1', value: largeValue(wrapThreshold, 1)});
+  store.put({id: 2, key: 'k2', value: ['small-2']});
+  store.put({id: 3, key: 'k3', value: largeValue(wrapThreshold, 3)});
+  store.put({id: 4, key: 'k4', value: ['small-4']});
 }
 
 // Assigns cursor indexes for operations that require open cursors.
@@ -41,8 +39,8 @@ function openCursors(testCase, index, operations, onerror, onsuccess) {
     let request;
     switch (opcode) {
       case 'continue':
-        request = index.openCursor(
-            IDBKeyRange.lowerBound(`k${primaryKey - 1}`));
+        request =
+            index.openCursor(IDBKeyRange.lowerBound(`k${primaryKey - 1}`));
         break;
       case 'continue-empty':
         // k4 is the last key in the data set, so calling continue() will get
@@ -77,19 +75,21 @@ function doOperation(testCase, store, index, operation, requestId, results) {
     let request;
     switch (opcode) {
       case 'add':  // Tests returning a primary key.
-        request = store.add(
-            { key: `k${primaryKey}`, value: [`small-${primaryKey}`] });
+        request =
+            store.add({key: `k${primaryKey}`, value: [`small-${primaryKey}`]});
         break;
       case 'put':  // Tests returning a primary key.
-        request = store.put(
-            { key: `k${primaryKey}`, value: [`small-${primaryKey}`] });
+        request =
+            store.put({key: `k${primaryKey}`, value: [`small-${primaryKey}`]});
         break;
       case 'put-with-id':  // Tests returning success or a primary key.
-        request = store.put(
-            { key: `k${primaryKey}`, value: [`small-${primaryKey}`],
-              id: primaryKey });
+        request = store.put({
+          key: `k${primaryKey}`,
+          value: [`small-${primaryKey}`],
+          id: primaryKey
+        });
         break;
-      case 'get':  // Tests returning a value.
+      case 'get':        // Tests returning a value.
       case 'get-empty':  // Tests returning undefined.
         request = store.get(primaryKey);
         break;
@@ -97,8 +97,8 @@ function doOperation(testCase, store, index, operation, requestId, results) {
         request = store.getAll();
         break;
       case 'error':  // Tests returning an error.
-        request = store.put(
-            { key: `k${primaryKey}`, value: [`small-${primaryKey}`] });
+        request =
+            store.put({key: `k${primaryKey}`, value: [`small-${primaryKey}`]});
         request.onerror = testCase.step_func(event => {
           event.preventDefault();
           results.push([requestId, request.error]);
@@ -173,7 +173,8 @@ function checkOperationResult(operation, result, requestId) {
   const primaryKey = operation[1];
 
   const expectedValue = (primaryKey == 1 || primaryKey == 3) ?
-      largeValue(wrapThreshold, primaryKey) : [`small-${primaryKey}`];
+      largeValue(wrapThreshold, primaryKey) :
+      [`small-${primaryKey}`];
 
   const requestIndex = result[0];
   assert_equals(
@@ -211,7 +212,8 @@ function checkOperationResult(operation, result, requestId) {
             `get result ${i + 1} should match put value (key)`);
 
         const expectedValue = (i == 0 || i == 2) ?
-            largeValue(wrapThreshold, i + 1) : [`small-${i + 1}`];
+            largeValue(wrapThreshold, i + 1) :
+            [`small-${i + 1}`];
         assert_equals(
             object.value.join(','), object.value.join(','),
             `get result ${i + 1} should match put value (nested value)`);
@@ -253,56 +255,48 @@ function checkOperationResult(operation, result, requestId) {
 
 function eventsTest(label, operations) {
   promise_test(testCase => {
-    return createDatabase(testCase, (database, transaction) => {
-      const store = database.createObjectStore(
-          'test-store', { autoIncrement: true, keyPath: 'id' });
-      store.createIndex('test-index', 'key', { unique: true });
-      populateStore(store);
-    }).then(database => {
-      const transaction = database.transaction(['test-store'], 'readwrite');
-      const store = transaction.objectStore('test-store');
-      const index = store.index('test-index');
-      return new Promise((resolve, reject) => {
-        openCursors(testCase, index, operations, reject, () => {
-          const results = [];
-          const promises = [];
-          for (let i = 0; i < operations.length; ++i) {
-            const promise = doOperation(
-                testCase, store, index, operations[i], i, results);
-            promises.push(promise);
-          };
-          resolve(Promise.all(promises).then(() => results));
+    return createDatabase(
+               testCase,
+               (database, transaction) => {
+                 const store = database.createObjectStore(
+                     'test-store', {autoIncrement: true, keyPath: 'id'});
+                 store.createIndex('test-index', 'key', {unique: true});
+                 populateStore(store);
+               })
+        .then(database => {
+          const transaction = database.transaction(['test-store'], 'readwrite');
+          const store = transaction.objectStore('test-store');
+          const index = store.index('test-index');
+          return new Promise((resolve, reject) => {
+            openCursors(testCase, index, operations, reject, () => {
+              const results = [];
+              const promises = [];
+              for (let i = 0; i < operations.length; ++i) {
+                const promise = doOperation(
+                    testCase, store, index, operations[i], i, results);
+                promises.push(promise);
+              };
+              resolve(Promise.all(promises).then(() => results));
+            });
+          });
+        })
+        .then(results => {
+          assert_equals(
+              results.length, operations.length,
+              'Promise.all should resolve after all sub-promises resolve');
+          for (let i = 0; i < operations.length; ++i)
+            checkOperationResult(operations[i], results[i], i);
         });
-      });
-    }).then(results => {
-      assert_equals(
-          results.length, operations.length,
-          'Promise.all should resolve after all sub-promises resolve');
-      for (let i = 0; i < operations.length; ++i)
-        checkOperationResult(operations[i], results[i], i);
-    });
   }, label);
 }
 
 eventsTest('small values', [
-  ['get', 2],
-  ['count', 4],
-  ['continue-empty', null],
-  ['get-empty', 5],
-  ['add', 5],
-  ['open', 2],
-  ['continue', 2],
-  ['get', 4],
-  ['get-empty', 6],
-  ['count', 5],
-  ['put-with-id', 5],
-  ['put', 6],
-  ['error', 3],
-  ['continue', 4],
-  ['count', 6],
-  ['get-empty', 7],
-  ['open', 4],
-  ['open-empty', 7],
+  ['get', 2],       ['count', 4],       ['continue-empty', null],
+  ['get-empty', 5], ['add', 5],         ['open', 2],
+  ['continue', 2],  ['get', 4],         ['get-empty', 6],
+  ['count', 5],     ['put-with-id', 5], ['put', 6],
+  ['error', 3],     ['continue', 4],    ['count', 6],
+  ['get-empty', 7], ['open', 4],        ['open-empty', 7],
   ['add', 7],
 ]);
 
@@ -365,5 +359,3 @@ eventsTest('large values mixed with small values', [
   ['error', 3],
   ['count', 7],
 ]);
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/request_bubble-and-capture.any.js b/tests/wpt/tests/IndexedDB/request_bubble-and-capture.any.js
new file mode 100644
index 00000000000..c80d7f5fd5c
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/request_bubble-and-capture.any.js
@@ -0,0 +1,70 @@
+// META: title=Bubbling and capturing of request events
+// META: global=window,worker
+// META: script=resources/support-promises.js
+// META: script=resources/support.js
+
+'use strict';
+
+async_test(t => {
+  let events = [];
+
+  let open_rq = createdb(t);
+  open_rq.onupgradeneeded =
+      function(e) {
+    let db = e.target.result;
+    let txn = e.target.transaction;
+    let store = db.createObjectStore('s');
+    let rq1 = store.add('', 1);
+    let rq2 = store.add('', 1);
+    db.onerror = function() {};
+
+    log_request(' db', db);
+    log_request('txn', txn);
+    log_request('rq1', rq1);
+    log_request('rq2', rq2);
+
+    // Don't let it get to abort
+    db.addEventListener('error', function(e) {
+      e.preventDefault()
+    }, false);
+  }
+
+      open_rq.onsuccess =
+          function(e) {
+    log('open_rq.success')(e);
+    assert_array_equals(
+        events,
+        [
+          'capture  db.success', 'capture txn.success', 'capture rq1.success',
+          'bubble  rq1.success',
+
+          'capture  db.error: ConstraintError',
+          'capture txn.error: ConstraintError',
+          'capture rq2.error: ConstraintError',
+          'bubble  rq2.error: ConstraintError',
+          'bubble  txn.error: ConstraintError',
+          'bubble   db.error: ConstraintError',
+
+          'open_rq.success'
+        ],
+        'events');
+    t.done();
+  }
+
+
+  function log_request(type, obj) {
+    obj.addEventListener('success', log('capture ' + type + '.success'), true);
+    obj.addEventListener('success', log('bubble  ' + type + '.success'), false);
+    obj.addEventListener('error', log('capture ' + type + '.error'), true);
+    obj.addEventListener('error', log('bubble  ' + type + '.error'), false);
+  }
+
+  function log(msg) {
+    return function(e) {
+      if (e && e.target && e.target.error)
+        events.push(msg + ': ' + e.target.error.name);
+      else
+        events.push(msg);
+    };
+  }
+}, 'IndexedDB Request Event Propagation: Bubbling and Capturing');
diff --git a/tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm b/tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm
deleted file mode 100644
index 8238e2c9ca1..00000000000
--- a/tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Bubbling and capturing of request events</title>
-<link rel="author" href="mailto:odinho@opera.com" title="Odin Hørthe Omdal">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-
-<script>
-    var events = [];
-
-    var open_rq = createdb(async_test());
-    open_rq.onupgradeneeded = function(e) {
-        var db = e.target.result;
-        var txn = e.target.transaction;
-        var store = db.createObjectStore("s");
-        var rq1 = store.add("", 1);
-        var rq2 = store.add("", 1);
-        db.onerror = function(){};
-
-        log_request(' db',  db);
-        log_request('txn', txn);
-        log_request('rq1', rq1);
-        log_request('rq2', rq2);
-
-        // Don't let it get to abort
-        db.addEventListener('error', function(e) { e.preventDefault() }, false);
-    }
-
-    open_rq.onsuccess = function(e) {
-        log("open_rq.success")(e);
-        assert_array_equals(events, [
-                                      "capture  db.success",
-                                      "capture txn.success",
-                                      "capture rq1.success",
-                                      "bubble  rq1.success",
-
-                                      "capture  db.error: ConstraintError",
-                                      "capture txn.error: ConstraintError",
-                                      "capture rq2.error: ConstraintError",
-                                      "bubble  rq2.error: ConstraintError",
-                                      "bubble  txn.error: ConstraintError",
-                                      "bubble   db.error: ConstraintError",
-
-                                      "open_rq.success"
-                                     ],
-                            "events");
-        this.done();
-    }
-
-
-    function log_request(type, obj) {
-        obj.addEventListener('success', log('capture ' + type + '.success'), true);
-        obj.addEventListener('success', log('bubble  ' + type + '.success'), false);
-        obj.addEventListener('error', log('capture ' + type + '.error'), true);
-        obj.addEventListener('error', log('bubble  ' + type + '.error'), false);
-    }
-
-    function log(msg) {
-        return function(e) {
-            if(e && e.target && e.target.error)
-                events.push(msg + ": " + e.target.error.name);
-            else
-                events.push(msg);
-        };
-    }
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js b/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js
index 896fee92599..a45fb2b621a 100644
--- a/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js
+++ b/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js
@@ -16,3 +16,18 @@ promise_test(async t => {
   });
   assert_equals(await translator.translate('hello'), 'こんにちは');
 });
+
+promise_test(async t => {
+  const translator =
+      await ai.translator.create({sourceLanguage: 'en', targetLanguage: 'ja'});
+  assert_equals(translator.sourceLanguage, 'en');
+  assert_equals(translator.targetLanguage, 'ja');
+}, 'AITranslator: sourceLanguage and targetLanguage are equal to their respective option passed in to AITranslatorFactory.create.')
+
+promise_test(async (t) => {
+  const translator =
+      await ai.translator.create({sourceLanguage: 'en', targetLanguage: 'ja'});
+  translator.destroy();
+  await promise_rejects_dom(
+      t, 'InvalidStateError', translator.translate('hello'));
+}, 'AITranslator.translate() fails after destroyed');
diff --git a/tests/wpt/tests/clear-site-data/clear-cache.https.html b/tests/wpt/tests/clear-site-data/clear-cache.https.html
index 8cdaf2a5527..eab2e597502 100644
--- a/tests/wpt/tests/clear-site-data/clear-cache.https.html
+++ b/tests/wpt/tests/clear-site-data/clear-cache.https.html
@@ -8,12 +8,12 @@
 
 // Here's the set-up for this test:
 // Step 1 (main window) Open first window with first url putting some resource
-//                       into the cache and maybe receiving clear-site-data header
-// Step 2 (first window) Message first window with uuid
+//                      into the cache and maybe receiving clear-site-data header
+// Step 2 (first window) Message main window with uuid
 // Step 3 (main window) Open second window with second url
-// Step 4 (second window) Message first window with uuid (either cached or non-cached)
+// Step 4 (second window) Message main window with uuid (either cached or non-cached)
 // Optional Step 5 (main window) Open third window with third url
-// Optional Step 6 (third window) Message first window with uuid (either cached or non-cached)
+// Optional Step 6 (third window) Message main window with uuid (either cached or non-cached)
 // Step 7 (main window): Assert first and last uuid not equal due to `clear-site-data: "cache"` header
 function test_cache_clear(test, params1, params2, params3) {
     let cache_helper = "cache_helper=" + self.crypto.randomUUID() + "&";
@@ -60,8 +60,6 @@ function test_cache_clear(test, params1, params2, params3) {
         // Step 1
         let first_window = window.open(firstUrl);
         test.add_cleanup(first_window.close);
-        // tests are using cookies to differentiate between requests
-        test.add_cleanup(test_driver.delete_all_cookies)
     });
 }
 
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
new file mode 100644
index 00000000000..d2baab5b2a5
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px;"></div>
+<script>
+test_computed_value("animation-trigger-exit-range-end", "initial", "normal");
+test_computed_value("animation-trigger-exit-range-end", "normal");
+test_computed_value("animation-trigger-exit-range-end", "cover 0%");
+test_computed_value("animation-trigger-exit-range-end", "cover 100%", "cover");
+test_computed_value("animation-trigger-exit-range-end", "COVER 0%", "cover 0%");
+test_computed_value("animation-trigger-exit-range-end", "COVER 100%", "cover");
+test_computed_value("animation-trigger-exit-range-end", "cover 120%");
+test_computed_value("animation-trigger-exit-range-end", "0", "0px");
+test_computed_value("animation-trigger-exit-range-end", "120%");
+test_computed_value("animation-trigger-exit-range-end", "120px");
+test_computed_value("animation-trigger-exit-range-end", "cover 42%");
+test_computed_value("animation-trigger-exit-range-end", "cover -42%");
+test_computed_value("animation-trigger-exit-range-end", "contain 42%");
+test_computed_value("animation-trigger-exit-range-end", "exit 42%");
+test_computed_value("animation-trigger-exit-range-end", "exit calc(41% + 1%)", "exit 42%");
+test_computed_value("animation-trigger-exit-range-end", "exit-crossing 42%");
+test_computed_value("animation-trigger-exit-range-end", "exit 1%, cover 2%, contain 0%");
+test_computed_value("animation-trigger-exit-range-end", "exit 1%, cover 2%, contain 100%", "exit 1%, cover 2%, contain");
+test_computed_value("animation-trigger-exit-range-end", "entry 42px");
+test_computed_value("animation-trigger-exit-range-end", "entry-crossing 42px");
+
+test_computed_value("animation-trigger-exit-range-end", "contain calc(10% + 10px)");
+test_computed_value("animation-trigger-exit-range-end", "entry 1em", "entry 10px");
+test_computed_value("animation-trigger-exit-range-end", "exit calc(1em + 10px)", "exit 20px");
+test_computed_value("animation-trigger-exit-range-end", "cover");
+test_computed_value("animation-trigger-exit-range-end", "contain");
+test_computed_value("animation-trigger-exit-range-end", "entry");
+test_computed_value("animation-trigger-exit-range-end", "exit");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
new file mode 100644
index 00000000000..111847151ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_invalid_value("animation-trigger-exit-range-end", "infinite");
+test_invalid_value("animation-trigger-exit-range-end", "1s 2s");
+test_invalid_value("animation-trigger-exit-range-end", "1s / 2s");
+
+test_invalid_value("animation-trigger-exit-range-end", "peek 50%");
+test_invalid_value("animation-trigger-exit-range-end", "50% contain");
+test_invalid_value("animation-trigger-exit-range-end", "50% cover");
+test_invalid_value("animation-trigger-exit-range-end", "50% entry");
+test_invalid_value("animation-trigger-exit-range-end", "50% enter");
+test_invalid_value("animation-trigger-exit-range-end", "50% exit");
+test_invalid_value("animation-trigger-exit-range-end", "contain contain");
+test_invalid_value("animation-trigger-exit-range-end", "none");
+test_invalid_value("animation-trigger-exit-range-end", "cover 50% enter 50%");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
new file mode 100644
index 00000000000..9a41889d339
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-exit-range-end", "normal");
+test_valid_value("animation-trigger-exit-range-end", "cover 0%");
+test_valid_value("animation-trigger-exit-range-end", "cover 100%", "cover");
+test_valid_value("animation-trigger-exit-range-end", "cover 120%");
+test_valid_value("animation-trigger-exit-range-end", "cover 42%");
+test_valid_value("animation-trigger-exit-range-end", "0", "0px");
+test_valid_value("animation-trigger-exit-range-end", "120%");
+test_valid_value("animation-trigger-exit-range-end", "120px");
+test_valid_value("animation-trigger-exit-range-end", "cover -42%");
+test_valid_value("animation-trigger-exit-range-end", "contain 42%");
+test_valid_value("animation-trigger-exit-range-end", "exit 42%");
+test_valid_value("animation-trigger-exit-range-end", "exit 1%, cover 2%, contain 0%");
+test_valid_value("animation-trigger-exit-range-end", "exit 1%, cover 2%, contain 100%", "exit 1%, cover 2%, contain");
+test_valid_value("animation-trigger-exit-range-end", "exit-crossing 42%");
+test_valid_value("animation-trigger-exit-range-end", "entry 42px");
+test_valid_value("animation-trigger-exit-range-end", "entry-crossing 42px");
+test_valid_value("animation-trigger-exit-range-end", "contain calc(10px + 10%)", "contain calc(10% + 10px)");
+test_valid_value("animation-trigger-exit-range-end", "entry 1em");
+test_valid_value("animation-trigger-exit-range-end", "exit calc(1em + 10px)");
+test_valid_value("animation-trigger-exit-range-end", "entry 42%");
+test_valid_value("animation-trigger-exit-range-end", "cover");
+test_valid_value("animation-trigger-exit-range-end", "contain");
+test_valid_value("animation-trigger-exit-range-end", "entry");
+test_valid_value("animation-trigger-exit-range-end", "exit");
+</script>trigger-
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
new file mode 100644
index 00000000000..5ddc0682ea8
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<title>animation-trigger-exit-range shorthand</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px"></div>
+<script>
+test_valid_value("animation-trigger-exit-range", "normal");
+test_valid_value("animation-trigger-exit-range", "normal normal", "normal");
+test_valid_value("animation-trigger-exit-range", "cover");
+test_valid_value("animation-trigger-exit-range", "contain");
+test_valid_value("animation-trigger-exit-range", "entry");
+test_valid_value("animation-trigger-exit-range", "entry-crossing");
+test_valid_value("animation-trigger-exit-range", "exit");
+test_valid_value("animation-trigger-exit-range", "exit-crossing");
+test_valid_value("animation-trigger-exit-range", "entry, exit");
+
+test_valid_value("animation-trigger-exit-range", "entry 0% entry 100%", "entry");
+test_valid_value("animation-trigger-exit-range", "entry-crossing 0% entry-crossing 100%",
+                 "entry-crossing");
+test_valid_value("animation-trigger-exit-range", "exit 0% exit 100%", "exit");
+test_valid_value("animation-trigger-exit-range", "exit-crossing 0% exit-crossing 100%",
+                 "exit-crossing");
+test_valid_value("animation-trigger-exit-range", "cover 0% cover 100%", "cover");
+test_valid_value("animation-trigger-exit-range", "contain 0% contain 100%", "contain");
+test_valid_value("animation-trigger-exit-range",
+                 "entry calc(10% - 10%) entry calc(50% + 50%)", "entry");
+test_valid_value("animation-trigger-exit-range", "cover 50%");
+test_valid_value("animation-trigger-exit-range", "contain 50%");
+test_valid_value("animation-trigger-exit-range", "entry 50%");
+test_valid_value("animation-trigger-exit-range", "entry-crossing 50%");
+test_valid_value("animation-trigger-exit-range", "exit 50%");
+test_valid_value("animation-trigger-exit-range", "exit-crossing 50%");
+test_valid_value("animation-trigger-exit-range", "entry 50px exit 100px");
+test_valid_value("animation-trigger-exit-range", "exit calc(10% + 50px)");
+
+test_valid_value("animation-trigger-exit-range", "entry 50% exit 50%");
+test_valid_value("animation-trigger-exit-range",
+                 "cover 50% entry 50%, contain 50% exit 50%");
+test_valid_value("animation-trigger-exit-range", "50% exit 50%");
+test_valid_value("animation-trigger-exit-range", "normal 100px");
+test_valid_value("animation-trigger-exit-range", "100px");
+test_valid_value("animation-trigger-exit-range", "100px normal", "100px");
+test_valid_value("animation-trigger-exit-range", "10% normal", "10%");
+
+test_computed_value("animation-trigger-exit-range", "normal");
+test_computed_value("animation-trigger-exit-range", "normal normal", "normal");
+test_computed_value("animation-trigger-exit-range", "cover");
+test_computed_value("animation-trigger-exit-range", "contain");
+test_computed_value("animation-trigger-exit-range", "entry");
+test_computed_value("animation-trigger-exit-range", "entry-crossing");
+test_computed_value("animation-trigger-exit-range", "exit");
+test_computed_value("animation-trigger-exit-range", "exit-crossing");
+test_computed_value("animation-trigger-exit-range", "entry, exit");
+
+test_computed_value("animation-trigger-exit-range", "entry 0% entry 100%", "entry");
+test_computed_value("animation-trigger-exit-range", "entry-crossing 0% entry-crossing 100%",
+                 "entry-crossing");
+test_computed_value("animation-trigger-exit-range", "exit 0% exit 100%", "exit");
+test_computed_value("animation-trigger-exit-range", "exit-crossing 0% exit-crossing 100%",
+                 "exit-crossing");
+test_computed_value("animation-trigger-exit-range", "cover 0% cover 100%", "cover");
+test_computed_value("animation-trigger-exit-range", "contain 0% contain 100%", "contain");
+test_computed_value("animation-trigger-exit-range",
+                 "entry calc(10% - 10%) entry calc(50% + 50%)", "entry");
+test_computed_value("animation-trigger-exit-range", "cover 50%");
+test_computed_value("animation-trigger-exit-range", "contain 50%");
+test_computed_value("animation-trigger-exit-range", "entry 50%");
+test_computed_value("animation-trigger-exit-range", "entry-crossing 50%");
+test_computed_value("animation-trigger-exit-range", "exit 50%");
+test_computed_value("animation-trigger-exit-range", "exit-crossing 50%");
+test_computed_value("animation-trigger-exit-range", "entry 50px exit 100px");
+test_computed_value("animation-trigger-exit-range", "exit calc(10% + 50px)");
+
+test_computed_value("animation-trigger-exit-range", "entry 50% exit 50%");
+test_computed_value("animation-trigger-exit-range",
+                 "cover 50% entry 50%, contain 50% exit 50%");
+
+test_computed_value("animation-trigger-exit-range", "entry 10em exit 20em", "entry 100px exit 200px");
+test_computed_value("animation-trigger-exit-range", "10em exit 20em", "100px exit 200px");
+test_computed_value("animation-trigger-exit-range", "normal 100px");
+test_computed_value("animation-trigger-exit-range", "100px");
+test_computed_value("animation-trigger-exit-range", "100px normal", "100px");
+test_computed_value("animation-trigger-exit-range", "10% normal", "10%");
+test_computed_value("animation-trigger-exit-range", "10% calc(70% + 10% * sign(100em - 1px))", "10% 80%");
+
+test_invalid_value("animation-trigger-exit-range", "entry 50% 0s", "entry 50%");
+test_invalid_value("animation-trigger-exit-range", "0s entry 50%");
+test_invalid_value("animation-trigger-exit-range", "1s");
+test_invalid_value("animation-trigger-exit-range", "-1s");
+test_invalid_value("animation-trigger-exit-range", "1s 2s");
+test_invalid_value("animation-trigger-exit-range", "1s, 2s");
+test_invalid_value("animation-trigger-exit-range", "1s 2s, 3s");
+test_invalid_value("animation-trigger-exit-range", "1s, 2s 3s");
+test_invalid_value("animation-trigger-exit-range", "1s, 2s, 3s");
+test_invalid_value("animation-trigger-exit-range", "1s 2s 3s");
+test_invalid_value("animation-trigger-exit-range", "0s, 1s 2s 3s");
+test_invalid_value("animation-trigger-exit-range", "1s / 2s");
+test_invalid_value("animation-trigger-exit-range", "1s, 2px");
+test_invalid_value("animation-trigger-exit-range", "#ff0000");
+test_invalid_value("animation-trigger-exit-range", "red");
+test_invalid_value("animation-trigger-exit-range", "thing");
+test_invalid_value("animation-trigger-exit-range", "thing 0%");
+test_invalid_value("animation-trigger-exit-range", "thing 42%");
+test_invalid_value("animation-trigger-exit-range", "thing 100%");
+test_invalid_value("animation-trigger-exit-range", "thing 100px");
+test_invalid_value("animation-trigger-exit-range", "100% thing");
+
+test_shorthand_value('animation-trigger-exit-range', 'normal', {
+  'animation-trigger-exit-range-start': 'normal',
+  'animation-trigger-exit-range-end': 'normal',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'normal normal', {
+  'animation-trigger-exit-range-start': 'normal',
+  'animation-trigger-exit-range-end': 'normal',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'normal entry 100%', {
+  'animation-trigger-exit-range-start': 'normal',
+  'animation-trigger-exit-range-end': 'entry',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'normal entry 10%', {
+  'animation-trigger-exit-range-start': 'normal',
+  'animation-trigger-exit-range-end': 'entry 10%',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'cover', {
+  'animation-trigger-exit-range-start': 'cover',
+  'animation-trigger-exit-range-end': 'cover',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'contain', {
+  'animation-trigger-exit-range-start': 'contain',
+  'animation-trigger-exit-range-end': 'contain',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'contain 100% contain 0%', {
+  'animation-trigger-exit-range-start': 'contain 100%',
+  'animation-trigger-exit-range-end': 'contain 0%',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'entry 10% exit 20%', {
+  'animation-trigger-exit-range-start': 'entry 10%',
+  'animation-trigger-exit-range-end': 'exit 20%',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'entry calc(10% + 10px) exit 20px', {
+  'animation-trigger-exit-range-start': 'entry calc(10% + 10px)',
+  'animation-trigger-exit-range-end': 'exit 20px',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'entry, exit', {
+  'animation-trigger-exit-range-start': 'entry, exit',
+  'animation-trigger-exit-range-end': 'entry, exit',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'entry 0%, exit', {
+  'animation-trigger-exit-range-start': 'entry, exit',
+  'animation-trigger-exit-range-end': 'entry, exit',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'exit calc(10% + 50px)', {
+  'animation-trigger-exit-range-start': 'exit calc(10% + 50px)',
+  'animation-trigger-exit-range-end': 'exit',
+});
+test_shorthand_value('animation-trigger-exit-range', '100px', {
+  'animation-trigger-exit-range-start': '100px',
+  'animation-trigger-exit-range-end': 'normal',
+});
+test_shorthand_value('animation-trigger-exit-range', '10%', {
+  'animation-trigger-exit-range-start': '10%',
+  'animation-trigger-exit-range-end': 'normal',
+});
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
new file mode 100644
index 00000000000..a48e15a578d
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px;"></div>
+<script>
+test_computed_value("animation-trigger-exit-range-start", "initial", "normal");
+test_computed_value("animation-trigger-exit-range-start", "normal");
+test_computed_value("animation-trigger-exit-range-start", "cover 0%", "cover");
+test_computed_value("animation-trigger-exit-range-start", "cover 100%");
+test_computed_value("animation-trigger-exit-range-start", "COVER 0%", "cover");
+test_computed_value("animation-trigger-exit-range-start", "COVER 100%", "cover 100%");
+test_computed_value("animation-trigger-exit-range-start", "cover 120%");
+test_computed_value("animation-trigger-exit-range-start", "cover 42%");
+test_computed_value("animation-trigger-exit-range-start", "0", "0px");
+test_computed_value("animation-trigger-exit-range-start", "120%");
+test_computed_value("animation-trigger-exit-range-start", "120px");
+test_computed_value("animation-trigger-exit-range-start", "cover -42%");
+test_computed_value("animation-trigger-exit-range-start", "contain 42%");
+test_computed_value("animation-trigger-exit-range-start", "exit 42%");
+test_computed_value("animation-trigger-exit-range-start", "exit calc(41% + 1%)", "exit 42%");
+test_computed_value("animation-trigger-exit-range-start", "exit 1%, cover 2%, contain 0%", "exit 1%, cover 2%, contain");
+test_computed_value("animation-trigger-exit-range-start", "exit 1%, cover 2%, contain 100%");
+test_computed_value("animation-trigger-exit-range-start", "exit-crossing 42%");
+test_computed_value("animation-trigger-exit-range-start", "entry 42px");
+test_computed_value("animation-trigger-exit-range-start", "entry-crossing 42px");
+test_computed_value("animation-trigger-exit-range-start", "contain calc(10% + 10px)");
+test_computed_value("animation-trigger-exit-range-start", "entry 1em", "entry 10px");
+test_computed_value("animation-trigger-exit-range-start", "exit calc(1em + 10px)", "exit 20px");
+test_computed_value("animation-trigger-exit-range-start", "cover");
+test_computed_value("animation-trigger-exit-range-start", "contain");
+test_computed_value("animation-trigger-exit-range-start", "entry");
+test_computed_value("animation-trigger-exit-range-start", "exit");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
new file mode 100644
index 00000000000..220b8028dd3
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_invalid_value("animation-trigger-exit-range-start", "peek 50%");
+test_invalid_value("animation-trigger-exit-range-start", "50% contain");
+test_invalid_value("animation-trigger-exit-range-start", "50% cover");
+test_invalid_value("animation-trigger-exit-range-start", "50% entry");
+test_invalid_value("animation-trigger-exit-range-start", "50% enter");
+test_invalid_value("animation-trigger-exit-range-start", "50% exit");
+test_invalid_value("animation-trigger-exit-range-start", "contain contain");
+test_invalid_value("animation-trigger-exit-range-start", "none");
+test_invalid_value("animation-trigger-exit-range-start", "cover 50% enter 50%");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
new file mode 100644
index 00000000000..11d1adb26f8
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-exit-range-start", "normal");
+test_valid_value("animation-trigger-exit-range-start", "cover 0%", "cover");
+test_valid_value("animation-trigger-exit-range-start", "cover 100%");
+test_valid_value("animation-trigger-exit-range-start", "cover 120%");
+test_valid_value("animation-trigger-exit-range-start", "cover 42%");
+test_valid_value("animation-trigger-exit-range-start", "0", "0px");
+test_valid_value("animation-trigger-exit-range-start", "120%");
+test_valid_value("animation-trigger-exit-range-start", "120px");
+test_valid_value("animation-trigger-exit-range-start", "cover -42%");
+test_valid_value("animation-trigger-exit-range-start", "contain 42%");
+test_valid_value("animation-trigger-exit-range-start", "exit 42%");
+test_valid_value("animation-trigger-exit-range-start", "exit 1%, cover 2%, contain 0%", "exit 1%, cover 2%, contain");
+test_valid_value("animation-trigger-exit-range-start", "exit 1%, cover 2%, contain 100%");
+test_valid_value("animation-trigger-exit-range-start", "exit-crossing 42%");
+test_valid_value("animation-trigger-exit-range-start", "entry 42px");
+test_valid_value("animation-trigger-exit-range-start", "entry-crossing 42px");
+test_valid_value("animation-trigger-exit-range-start", "contain calc(10px + 10%)", "contain calc(10% + 10px)");
+test_valid_value("animation-trigger-exit-range-start", "entry 1em");
+test_valid_value("animation-trigger-exit-range-start", "exit calc(1em + 10px)");
+test_valid_value("animation-trigger-exit-range-start", "entry 42%");
+test_valid_value("animation-trigger-exit-range-start", "cover");
+test_valid_value("animation-trigger-exit-range-start", "contain");
+test_valid_value("animation-trigger-exit-range-start", "entry");
+test_valid_value("animation-trigger-exit-range-start", "exit");
+test_valid_value("animation-trigger-exit-range-start", "cover calc(sign(100em - 1px) * 1%)");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-computed.html
new file mode 100644
index 00000000000..63ee6218f12
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-computed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px;"></div>
+<script>
+test_computed_value("animation-trigger-range-end", "initial", "normal");
+test_computed_value("animation-trigger-range-end", "normal");
+test_computed_value("animation-trigger-range-end", "cover 0%");
+test_computed_value("animation-trigger-range-end", "cover 100%", "cover");
+test_computed_value("animation-trigger-range-end", "COVER 0%", "cover 0%");
+test_computed_value("animation-trigger-range-end", "COVER 100%", "cover");
+test_computed_value("animation-trigger-range-end", "cover 120%");
+test_computed_value("animation-trigger-range-end", "0", "0px");
+test_computed_value("animation-trigger-range-end", "120%");
+test_computed_value("animation-trigger-range-end", "120px");
+test_computed_value("animation-trigger-range-end", "cover 42%");
+test_computed_value("animation-trigger-range-end", "cover -42%");
+test_computed_value("animation-trigger-range-end", "contain 42%");
+test_computed_value("animation-trigger-range-end", "exit 42%");
+test_computed_value("animation-trigger-range-end", "exit calc(41% + 1%)", "exit 42%");
+test_computed_value("animation-trigger-range-end", "exit-crossing 42%");
+test_computed_value("animation-trigger-range-end", "exit 1%, cover 2%, contain 0%");
+test_computed_value("animation-trigger-range-end", "exit 1%, cover 2%, contain 100%", "exit 1%, cover 2%, contain");
+test_computed_value("animation-trigger-range-end", "entry 42px");
+test_computed_value("animation-trigger-range-end", "entry-crossing 42px");
+
+test_computed_value("animation-trigger-range-end", "contain calc(10% + 10px)");
+test_computed_value("animation-trigger-range-end", "entry 1em", "entry 10px");
+test_computed_value("animation-trigger-range-end", "exit calc(1em + 10px)", "exit 20px");
+test_computed_value("animation-trigger-range-end", "cover");
+test_computed_value("animation-trigger-range-end", "contain");
+test_computed_value("animation-trigger-range-end", "entry");
+test_computed_value("animation-trigger-range-end", "exit");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
new file mode 100644
index 00000000000..8d66ac661d5
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_invalid_value("animation-trigger-range-end", "infinite");
+test_invalid_value("animation-trigger-range-end", "1s 2s");
+test_invalid_value("animation-trigger-range-end", "1s / 2s");
+
+test_invalid_value("animation-trigger-range-end", "peek 50%");
+test_invalid_value("animation-trigger-range-end", "50% contain");
+test_invalid_value("animation-trigger-range-end", "50% cover");
+test_invalid_value("animation-trigger-range-end", "50% entry");
+test_invalid_value("animation-trigger-range-end", "50% enter");
+test_invalid_value("animation-trigger-range-end", "50% exit");
+test_invalid_value("animation-trigger-range-end", "contain contain");
+test_invalid_value("animation-trigger-range-end", "none");
+test_invalid_value("animation-trigger-range-end", "cover 50% enter 50%");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
new file mode 100644
index 00000000000..6d9533e2648
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-range-end", "normal");
+test_valid_value("animation-trigger-range-end", "cover 0%");
+test_valid_value("animation-trigger-range-end", "cover 100%", "cover");
+test_valid_value("animation-trigger-range-end", "cover 120%");
+test_valid_value("animation-trigger-range-end", "cover 42%");
+test_valid_value("animation-trigger-range-end", "0", "0px");
+test_valid_value("animation-trigger-range-end", "120%");
+test_valid_value("animation-trigger-range-end", "120px");
+test_valid_value("animation-trigger-range-end", "cover -42%");
+test_valid_value("animation-trigger-range-end", "contain 42%");
+test_valid_value("animation-trigger-range-end", "exit 42%");
+test_valid_value("animation-trigger-range-end", "exit 1%, cover 2%, contain 0%");
+test_valid_value("animation-trigger-range-end", "exit 1%, cover 2%, contain 100%", "exit 1%, cover 2%, contain");
+test_valid_value("animation-trigger-range-end", "exit-crossing 42%");
+test_valid_value("animation-trigger-range-end", "entry 42px");
+test_valid_value("animation-trigger-range-end", "entry-crossing 42px");
+test_valid_value("animation-trigger-range-end", "contain calc(10px + 10%)", "contain calc(10% + 10px)");
+test_valid_value("animation-trigger-range-end", "entry 1em");
+test_valid_value("animation-trigger-range-end", "exit calc(1em + 10px)");
+test_valid_value("animation-trigger-range-end", "entry 42%");
+test_valid_value("animation-trigger-range-end", "cover");
+test_valid_value("animation-trigger-range-end", "contain");
+test_valid_value("animation-trigger-range-end", "entry");
+test_valid_value("animation-trigger-range-end", "exit");
+</script>trigger-
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-shorthand.html
new file mode 100644
index 00000000000..371a3c70d1b
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-shorthand.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<title>animation-trigger-range shorthand</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px"></div>
+<script>
+test_valid_value("animation-trigger-range", "normal");
+test_valid_value("animation-trigger-range", "normal normal", "normal");
+test_valid_value("animation-trigger-range", "cover");
+test_valid_value("animation-trigger-range", "contain");
+test_valid_value("animation-trigger-range", "entry");
+test_valid_value("animation-trigger-range", "entry-crossing");
+test_valid_value("animation-trigger-range", "exit");
+test_valid_value("animation-trigger-range", "exit-crossing");
+test_valid_value("animation-trigger-range", "entry, exit");
+
+test_valid_value("animation-trigger-range", "entry 0% entry 100%", "entry");
+test_valid_value("animation-trigger-range", "entry-crossing 0% entry-crossing 100%",
+                 "entry-crossing");
+test_valid_value("animation-trigger-range", "exit 0% exit 100%", "exit");
+test_valid_value("animation-trigger-range", "exit-crossing 0% exit-crossing 100%",
+                 "exit-crossing");
+test_valid_value("animation-trigger-range", "cover 0% cover 100%", "cover");
+test_valid_value("animation-trigger-range", "contain 0% contain 100%", "contain");
+test_valid_value("animation-trigger-range",
+                 "entry calc(10% - 10%) entry calc(50% + 50%)", "entry");
+test_valid_value("animation-trigger-range", "cover 50%");
+test_valid_value("animation-trigger-range", "contain 50%");
+test_valid_value("animation-trigger-range", "entry 50%");
+test_valid_value("animation-trigger-range", "entry-crossing 50%");
+test_valid_value("animation-trigger-range", "exit 50%");
+test_valid_value("animation-trigger-range", "exit-crossing 50%");
+test_valid_value("animation-trigger-range", "entry 50px exit 100px");
+test_valid_value("animation-trigger-range", "exit calc(10% + 50px)");
+
+test_valid_value("animation-trigger-range", "entry 50% exit 50%");
+test_valid_value("animation-trigger-range",
+                 "cover 50% entry 50%, contain 50% exit 50%");
+test_valid_value("animation-trigger-range", "50% exit 50%");
+test_valid_value("animation-trigger-range", "normal 100px");
+test_valid_value("animation-trigger-range", "100px");
+test_valid_value("animation-trigger-range", "100px normal", "100px");
+test_valid_value("animation-trigger-range", "10% normal", "10%");
+
+test_computed_value("animation-trigger-range", "normal");
+test_computed_value("animation-trigger-range", "normal normal", "normal");
+test_computed_value("animation-trigger-range", "cover");
+test_computed_value("animation-trigger-range", "contain");
+test_computed_value("animation-trigger-range", "entry");
+test_computed_value("animation-trigger-range", "entry-crossing");
+test_computed_value("animation-trigger-range", "exit");
+test_computed_value("animation-trigger-range", "exit-crossing");
+test_computed_value("animation-trigger-range", "entry, exit");
+
+test_computed_value("animation-trigger-range", "entry 0% entry 100%", "entry");
+test_computed_value("animation-trigger-range", "entry-crossing 0% entry-crossing 100%",
+                 "entry-crossing");
+test_computed_value("animation-trigger-range", "exit 0% exit 100%", "exit");
+test_computed_value("animation-trigger-range", "exit-crossing 0% exit-crossing 100%",
+                 "exit-crossing");
+test_computed_value("animation-trigger-range", "cover 0% cover 100%", "cover");
+test_computed_value("animation-trigger-range", "contain 0% contain 100%", "contain");
+test_computed_value("animation-trigger-range",
+                 "entry calc(10% - 10%) entry calc(50% + 50%)", "entry");
+test_computed_value("animation-trigger-range", "cover 50%");
+test_computed_value("animation-trigger-range", "contain 50%");
+test_computed_value("animation-trigger-range", "entry 50%");
+test_computed_value("animation-trigger-range", "entry-crossing 50%");
+test_computed_value("animation-trigger-range", "exit 50%");
+test_computed_value("animation-trigger-range", "exit-crossing 50%");
+test_computed_value("animation-trigger-range", "entry 50px exit 100px");
+test_computed_value("animation-trigger-range", "exit calc(10% + 50px)");
+
+test_computed_value("animation-trigger-range", "entry 50% exit 50%");
+test_computed_value("animation-trigger-range",
+                 "cover 50% entry 50%, contain 50% exit 50%");
+
+test_computed_value("animation-trigger-range", "entry 10em exit 20em", "entry 100px exit 200px");
+test_computed_value("animation-trigger-range", "10em exit 20em", "100px exit 200px");
+test_computed_value("animation-trigger-range", "normal 100px");
+test_computed_value("animation-trigger-range", "100px");
+test_computed_value("animation-trigger-range", "100px normal", "100px");
+test_computed_value("animation-trigger-range", "10% normal", "10%");
+test_computed_value("animation-trigger-range", "10% calc(70% + 10% * sign(100em - 1px))", "10% 80%");
+
+test_invalid_value("animation-trigger-range", "entry 50% 0s", "entry 50%");
+test_invalid_value("animation-trigger-range", "0s entry 50%");
+test_invalid_value("animation-trigger-range", "1s");
+test_invalid_value("animation-trigger-range", "-1s");
+test_invalid_value("animation-trigger-range", "1s 2s");
+test_invalid_value("animation-trigger-range", "1s, 2s");
+test_invalid_value("animation-trigger-range", "1s 2s, 3s");
+test_invalid_value("animation-trigger-range", "1s, 2s 3s");
+test_invalid_value("animation-trigger-range", "1s, 2s, 3s");
+test_invalid_value("animation-trigger-range", "1s 2s 3s");
+test_invalid_value("animation-trigger-range", "0s, 1s 2s 3s");
+test_invalid_value("animation-trigger-range", "1s / 2s");
+test_invalid_value("animation-trigger-range", "1s, 2px");
+test_invalid_value("animation-trigger-range", "#ff0000");
+test_invalid_value("animation-trigger-range", "red");
+test_invalid_value("animation-trigger-range", "thing");
+test_invalid_value("animation-trigger-range", "thing 0%");
+test_invalid_value("animation-trigger-range", "thing 42%");
+test_invalid_value("animation-trigger-range", "thing 100%");
+test_invalid_value("animation-trigger-range", "thing 100px");
+test_invalid_value("animation-trigger-range", "100% thing");
+
+test_shorthand_value('animation-trigger-range', 'normal', {
+  'animation-trigger-range-start': 'normal',
+  'animation-trigger-range-end': 'normal',
+});
+
+test_shorthand_value('animation-trigger-range', 'normal normal', {
+  'animation-trigger-range-start': 'normal',
+  'animation-trigger-range-end': 'normal',
+});
+
+test_shorthand_value('animation-trigger-range', 'normal entry 100%', {
+  'animation-trigger-range-start': 'normal',
+  'animation-trigger-range-end': 'entry',
+});
+
+test_shorthand_value('animation-trigger-range', 'normal entry 10%', {
+  'animation-trigger-range-start': 'normal',
+  'animation-trigger-range-end': 'entry 10%',
+});
+
+test_shorthand_value('animation-trigger-range', 'cover', {
+  'animation-trigger-range-start': 'cover',
+  'animation-trigger-range-end': 'cover',
+});
+
+test_shorthand_value('animation-trigger-range', 'contain', {
+  'animation-trigger-range-start': 'contain',
+  'animation-trigger-range-end': 'contain',
+});
+
+test_shorthand_value('animation-trigger-range', 'contain 100% contain 0%', {
+  'animation-trigger-range-start': 'contain 100%',
+  'animation-trigger-range-end': 'contain 0%',
+});
+
+test_shorthand_value('animation-trigger-range', 'entry 10% exit 20%', {
+  'animation-trigger-range-start': 'entry 10%',
+  'animation-trigger-range-end': 'exit 20%',
+});
+
+test_shorthand_value('animation-trigger-range', 'entry calc(10% + 10px) exit 20px', {
+  'animation-trigger-range-start': 'entry calc(10% + 10px)',
+  'animation-trigger-range-end': 'exit 20px',
+});
+
+test_shorthand_value('animation-trigger-range', 'entry, exit', {
+  'animation-trigger-range-start': 'entry, exit',
+  'animation-trigger-range-end': 'entry, exit',
+});
+
+test_shorthand_value('animation-trigger-range', 'entry 0%, exit', {
+  'animation-trigger-range-start': 'entry, exit',
+  'animation-trigger-range-end': 'entry, exit',
+});
+
+test_shorthand_value('animation-trigger-range', 'exit calc(10% + 50px)', {
+  'animation-trigger-range-start': 'exit calc(10% + 50px)',
+  'animation-trigger-range-end': 'exit',
+});
+test_shorthand_value('animation-trigger-range', '100px', {
+  'animation-trigger-range-start': '100px',
+  'animation-trigger-range-end': 'normal',
+});
+test_shorthand_value('animation-trigger-range', '10%', {
+  'animation-trigger-range-start': '10%',
+  'animation-trigger-range-end': 'normal',
+});
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-computed.html
new file mode 100644
index 00000000000..7b1f9e37e62
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-computed.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target" style="font-size:10px;"></div>
+<script>
+test_computed_value("animation-trigger-range-start", "initial", "normal");
+test_computed_value("animation-trigger-range-start", "normal");
+test_computed_value("animation-trigger-range-start", "cover 0%", "cover");
+test_computed_value("animation-trigger-range-start", "cover 100%");
+test_computed_value("animation-trigger-range-start", "COVER 0%", "cover");
+test_computed_value("animation-trigger-range-start", "COVER 100%", "cover 100%");
+test_computed_value("animation-trigger-range-start", "cover 120%");
+test_computed_value("animation-trigger-range-start", "cover 42%");
+test_computed_value("animation-trigger-range-start", "0", "0px");
+test_computed_value("animation-trigger-range-start", "120%");
+test_computed_value("animation-trigger-range-start", "120px");
+test_computed_value("animation-trigger-range-start", "cover -42%");
+test_computed_value("animation-trigger-range-start", "contain 42%");
+test_computed_value("animation-trigger-range-start", "exit 42%");
+test_computed_value("animation-trigger-range-start", "exit calc(41% + 1%)", "exit 42%");
+test_computed_value("animation-trigger-range-start", "exit 1%, cover 2%, contain 0%", "exit 1%, cover 2%, contain");
+test_computed_value("animation-trigger-range-start", "exit 1%, cover 2%, contain 100%");
+test_computed_value("animation-trigger-range-start", "exit-crossing 42%");
+test_computed_value("animation-trigger-range-start", "entry 42px");
+test_computed_value("animation-trigger-range-start", "entry-crossing 42px");
+test_computed_value("animation-trigger-range-start", "contain calc(10% + 10px)");
+test_computed_value("animation-trigger-range-start", "entry 1em", "entry 10px");
+test_computed_value("animation-trigger-range-start", "exit calc(1em + 10px)", "exit 20px");
+test_computed_value("animation-trigger-range-start", "cover");
+test_computed_value("animation-trigger-range-start", "contain");
+test_computed_value("animation-trigger-range-start", "entry");
+test_computed_value("animation-trigger-range-start", "exit");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-invalid.html
new file mode 100644
index 00000000000..6c056d06e96
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-invalid.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_invalid_value("animation-trigger-range-start", "peek 50%");
+test_invalid_value("animation-trigger-range-start", "50% contain");
+test_invalid_value("animation-trigger-range-start", "50% cover");
+test_invalid_value("animation-trigger-range-start", "50% entry");
+test_invalid_value("animation-trigger-range-start", "50% enter");
+test_invalid_value("animation-trigger-range-start", "50% exit");
+test_invalid_value("animation-trigger-range-start", "contain contain");
+test_invalid_value("animation-trigger-range-start", "none");
+test_invalid_value("animation-trigger-range-start", "cover 50% enter 50%");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
new file mode 100644
index 00000000000..d48151b6db0
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-range-start", "normal");
+test_valid_value("animation-trigger-range-start", "cover 0%", "cover");
+test_valid_value("animation-trigger-range-start", "cover 100%");
+test_valid_value("animation-trigger-range-start", "cover 120%");
+test_valid_value("animation-trigger-range-start", "cover 42%");
+test_valid_value("animation-trigger-range-start", "0", "0px");
+test_valid_value("animation-trigger-range-start", "120%");
+test_valid_value("animation-trigger-range-start", "120px");
+test_valid_value("animation-trigger-range-start", "cover -42%");
+test_valid_value("animation-trigger-range-start", "contain 42%");
+test_valid_value("animation-trigger-range-start", "exit 42%");
+test_valid_value("animation-trigger-range-start", "exit 1%, cover 2%, contain 0%", "exit 1%, cover 2%, contain");
+test_valid_value("animation-trigger-range-start", "exit 1%, cover 2%, contain 100%");
+test_valid_value("animation-trigger-range-start", "exit-crossing 42%");
+test_valid_value("animation-trigger-range-start", "entry 42px");
+test_valid_value("animation-trigger-range-start", "entry-crossing 42px");
+test_valid_value("animation-trigger-range-start", "contain calc(10px + 10%)", "contain calc(10% + 10px)");
+test_valid_value("animation-trigger-range-start", "entry 1em");
+test_valid_value("animation-trigger-range-start", "exit calc(1em + 10px)");
+test_valid_value("animation-trigger-range-start", "entry 42%");
+test_valid_value("animation-trigger-range-start", "cover");
+test_valid_value("animation-trigger-range-start", "contain");
+test_valid_value("animation-trigger-range-start", "entry");
+test_valid_value("animation-trigger-range-start", "exit");
+test_valid_value("animation-trigger-range-start", "cover calc(sign(100em - 1px) * 1%)");
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html
new file mode 100644
index 00000000000..5d47a1e5e45
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-timeline-parsing.tentative.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Animations: parsing animation-trigger-timeline with invalid values</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<meta name="assert" content="animation-trigger-type supports only the grammar '<single-animation-trigger-timeline> #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+
+test_valid_value('animation-trigger-timeline', 'initial');
+test_valid_value('animation-trigger-timeline', 'inherit');
+test_valid_value('animation-trigger-timeline', 'unset');
+test_valid_value('animation-trigger-timeline', 'revert');
+test_valid_value('animation-trigger-timeline', 'auto');
+test_valid_value('animation-trigger-timeline', 'none');
+test_valid_value('animation-trigger-timeline', 'auto, auto');
+test_valid_value('animation-trigger-timeline', 'none, none');
+test_valid_value('animation-trigger-timeline', 'auto, none');
+test_valid_value('animation-trigger-timeline', 'none, auto');
+test_valid_value('animation-trigger-timeline', '--test');
+test_valid_value('animation-trigger-timeline', '--test1, --test2');
+test_valid_value('animation-trigger-timeline', '--test1, --test2, none, --test3, auto');
+
+test_invalid_value('animation-trigger-timeline', 'test1');
+test_invalid_value('animation-trigger-timeline', '10px');
+test_invalid_value('animation-trigger-timeline', 'auto auto');
+test_invalid_value('animation-trigger-timeline', 'none none');
+test_invalid_value('animation-trigger-timeline', 'foo bar');
+test_invalid_value('animation-trigger-timeline', '"foo" "bar"');
+test_invalid_value('animation-trigger-timeline', 'rgb(1, 2, 3)');
+test_invalid_value('animation-trigger-timeline', '#fefefe');
+test_invalid_value('animation-trigger-timeline', '"test"');
+
+// https://drafts.csswg.org/scroll-animations-1/#scroll-notation
+//
+// animation-trigger-timeline: scroll(<axis>? <scroller>?);
+// <axis> = block | inline | x | y
+// <scroller> = root | nearest | self
+test_valid_value('animation-trigger-timeline', 'scroll()');
+test_valid_value('animation-trigger-timeline', ' scroll() ', 'scroll()');
+test_valid_value('animation-trigger-timeline', 'scroll(block)', 'scroll()');
+test_valid_value('animation-trigger-timeline', 'scroll(inline)');
+test_valid_value('animation-trigger-timeline', 'scroll(x)');
+test_valid_value('animation-trigger-timeline', 'scroll(y)');
+test_valid_value('animation-trigger-timeline', 'scroll(root)');
+test_valid_value('animation-trigger-timeline', 'scroll(nearest)', 'scroll()');
+test_valid_value('animation-trigger-timeline', 'scroll(self)');
+test_valid_value('animation-trigger-timeline', 'scroll(inline nearest)', 'scroll(inline)');
+test_valid_value('animation-trigger-timeline', 'scroll(nearest inline)', 'scroll(inline)');
+test_valid_value('animation-trigger-timeline', 'scroll(block self)', 'scroll(self)');
+test_valid_value('animation-trigger-timeline', 'scroll(self block)', 'scroll(self)');
+test_valid_value('animation-trigger-timeline', 'scroll(y root)', 'scroll(root y)');
+
+test_invalid_value('animation-trigger-timeline', 'scroll(abc root)');
+test_invalid_value('animation-trigger-timeline', 'scroll(abc)');
+test_invalid_value('animation-trigger-timeline', 'scroll(y abc)');
+test_invalid_value('animation-trigger-timeline', 'scroll("string")');
+
+// https://drafts.csswg.org/scroll-animations-1/#view-notation
+test_valid_value('animation-trigger-timeline', 'view()');
+test_valid_value('animation-trigger-timeline', ' view() ', 'view()');
+test_valid_value('animation-trigger-timeline', 'view(block)', 'view()');
+test_valid_value('animation-trigger-timeline', 'view(inline)');
+test_valid_value('animation-trigger-timeline', 'view(x)');
+test_valid_value('animation-trigger-timeline', 'view(y)');
+test_valid_value('animation-trigger-timeline', 'view(y 1px 2px)');
+test_valid_value('animation-trigger-timeline', 'view(y 1px)');
+test_valid_value('animation-trigger-timeline', 'view(y auto)', 'view(y)');
+test_valid_value('animation-trigger-timeline', 'view(y auto auto)', 'view(y)');
+test_valid_value('animation-trigger-timeline', 'view(y auto 1px)');
+test_valid_value('animation-trigger-timeline', 'view(1px 2px y)', 'view(y 1px 2px)');
+test_valid_value('animation-trigger-timeline', 'view(1px y)', 'view(y 1px)');
+test_valid_value('animation-trigger-timeline', 'view(auto x)', 'view(x)');
+test_valid_value('animation-trigger-timeline', 'view(1px 2px)');
+test_valid_value('animation-trigger-timeline', 'view(1px)');
+test_valid_value('animation-trigger-timeline', 'view(1px 1px)', 'view(1px)');
+test_valid_value('animation-trigger-timeline', 'view(1px auto)');
+test_valid_value('animation-trigger-timeline', 'view(auto calc(1% + 1px))');
+test_valid_value('animation-trigger-timeline', 'view(2em calc(1% + 1em))');
+test_valid_value('animation-trigger-timeline', 'view(auto)', 'view()');
+test_valid_value('animation-trigger-timeline', 'view(auto auto)', 'view()');
+
+test_invalid_value('animation-trigger-timeline', 'view(y 1px 2px 3px)');
+test_invalid_value('animation-trigger-timeline', 'view(1px y 3px)');
+test_invalid_value('animation-trigger-timeline', 'view(1px 2px 3px)');
+test_invalid_value('animation-trigger-timeline', 'view(abc block)');
+test_invalid_value('animation-trigger-timeline', 'view(abc)');
+test_invalid_value('animation-trigger-timeline', 'view(y abc)');
+test_invalid_value('animation-trigger-timeline', 'view("string")');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-computed.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-computed.tentative.html
new file mode 100644
index 00000000000..073758a28b9
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-computed.tentative.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Animations: getComputedStyle().animationTriggerType</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<meta name="assert" content="animation-trigger-type computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("animation-trigger-type", "once, repeat, alternate, state");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-invalid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-invalid.tentative.html
new file mode 100644
index 00000000000..9c669021c73
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-invalid.tentative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Animations: parsing animation-trigger-type with invalid values</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<meta name="assert" content="animation-trigger-type supports only the grammar '<single-animation-trigger-type> #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("animation-trigger-type", "auto");
+test_invalid_value("animation-trigger-type", "once repeat");
+
+test_invalid_value("animation-trigger-type", "once, initial");
+test_invalid_value("animation-trigger-type", "initial, once");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-valid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-valid.tentative.html
new file mode 100644
index 00000000000..a94e8ec8899
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-type-valid.tentative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Animations: parsing animation-trigger-type with valid values</title>
+<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<meta name="assert" content="animation-composition supports the full grammar '<single-animation-trigger-type> #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("animation-trigger-type", "once");
+test_valid_value("animation-trigger-type", "repeat");
+test_valid_value("animation-trigger-type", "alternate");
+test_valid_value("animation-trigger-type", "state");
+test_valid_value("animation-trigger-type", "once, repeat");
+test_valid_value("animation-trigger-type", "once, repeat, alternate");
+test_valid_value("animation-trigger-type", "once, repeat, alternate, state");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html
new file mode 100644
index 00000000000..de2920a755d
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-001.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>@container: scroll-state(scrollable) matching body</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#scrollable">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<script src="/css/css-transitions/support/helper.js"></script>
+<style>
+  html {
+    /* Make sure scrollbars are created on body and not propagated to viewport */
+    overflow: scroll;
+  }
+  body {
+    height: 500px;
+    overflow: scroll;
+    container-type: scroll-state;
+  }
+  #target {
+    height: 5000px;
+    --top: no;
+    --bottom: no;
+    @container scroll-state(scrollable: top) {
+      --top: yes;
+    }
+    @container scroll-state(scrollable: bottom) {
+      --bottom: yes;
+    }
+  }
+</style>
+<div id="target"></div>
+<script>
+  setup(() => assert_implements_scroll_state_container_queries());
+
+  promise_test(async t => {
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "no");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "yes");
+    assert_equals(document.body.scrollTop, 0);
+  }, "Check that scroll-state(scrollable) matches bottom before scroll");
+
+  promise_test(async t => {
+    document.body.scrollTop = 100;
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "yes");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "yes");
+  }, "Check that scroll-state(scrollable) matches both top and bottom in a middle position");
+
+  promise_test(async t => {
+    document.body.scrollTop = 5000;
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "yes");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "no");
+  }, "Check that scroll-state(scrollable) matches both top when scrolled to the end");
+
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html
new file mode 100644
index 00000000000..baf30037160
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-body-002.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>@container: scroll-state(scrollable) not matching body propagated to viewport</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#scrollable">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<script src="/css/css-transitions/support/helper.js"></script>
+<style>
+  body {
+    height: 500px;
+    overflow: scroll;
+    container-type: scroll-state;
+  }
+  #target {
+    height: 5000px;
+    --top: no;
+    --bottom: no;
+    @container scroll-state(scrollable: top) {
+      --top: yes;
+    }
+    @container scroll-state(scrollable: bottom) {
+      --bottom: yes;
+    }
+  }
+</style>
+<div id="target"></div>
+<script>
+  setup(() => assert_implements_scroll_state_container_queries());
+
+  const root = document.documentElement;
+
+  promise_test(async t => {
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "no");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "no");
+    assert_equals(root.scrollTop, 0);
+  }, "Check that scroll-state(scrollable) does not match for body before scroll");
+
+  promise_test(async t => {
+    root.scrollTop = 100;
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "no");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "no");
+    assert_equals(root.scrollTop, 100);
+  }, "Check that scroll-state(scrollable) does not match for body after scroll");
+
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html
new file mode 100644
index 00000000000..bc1c71c186c
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/scroll-state/scroll-state-scrollable-root.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>@container: scroll-state(scrollable) matching viewport for root element</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#scrollable">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-conditional/container-queries/support/cq-testcommon.js"></script>
+<script src="/css/css-transitions/support/helper.js"></script>
+<style>
+  :root {
+    container-type: scroll-state;
+  }
+  #target {
+    height: 5000px;
+    --top: no;
+    --bottom: no;
+    @container scroll-state(scrollable: top) {
+      --top: yes;
+    }
+    @container scroll-state(scrollable: bottom) {
+      --bottom: yes;
+    }
+  }
+</style>
+<div id="target"></div>
+<script>
+  setup(() => assert_implements_scroll_state_container_queries());
+
+  const root = document.documentElement;
+
+  promise_test(async t => {
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "no");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "yes");
+    assert_equals(root.scrollTop, 0);
+  }, "Check that scroll-state(scrollable) matches bottom before scroll");
+
+  promise_test(async t => {
+    root.scrollTop = 100;
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "yes");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "yes");
+  }, "Check that scroll-state(scrollable) matches both top and bottom in a middle position");
+
+  promise_test(async t => {
+    root.scrollTop = 5000;
+    await waitForAnimationFrames(2);
+    assert_equals(getComputedStyle(target).getPropertyValue("--top"), "yes");
+    assert_equals(getComputedStyle(target).getPropertyValue("--bottom"), "no");
+  }, "Check that scroll-state(scrollable) matches both top when scrolled to the end");
+
+</script>
diff --git a/tests/wpt/tests/css/css-fonts/font-weight-sign-function.html b/tests/wpt/tests/css/css-fonts/font-weight-sign-function.html
new file mode 100644
index 00000000000..d65284fb7a8
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-weight-sign-function.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Fonts test: font-weight with CSS sign() function</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-weight-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+:root {
+  font-size: 16px;
+}
+</style>
+<div id="target"></div>
+<script>
+  test_computed_value("font-weight", "calc(sign(1rem - 1px) * 10)", "10");
+  test_computed_value("font-weight", "calc(sign(1rem - 1px) * -10000)", "1");
+  test_computed_value("font-weight", "calc(sign(1rem - 1px) * 10000)", "1000");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html b/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html
index 763cf00ec1a..6d85c2a06b4 100644
--- a/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html
+++ b/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html
@@ -148,12 +148,12 @@ test_interpolation({
   from: 'shape(from 5% 5px, arc to 15% -15px of 10px 20px, arc by 15% -5px of 30px cw rotate 30deg large, arc to 25% 20px of 10px 5px small)',
   to: 'shape(from 15% 15px, arc to 5% -25px of 20px 30px, arc by 25% -15px of 20px cw rotate 270deg small, arc to 25% 20px of 10px 5px small cw)'
 }, [
-  {at: -0.3, expect: 'shape(from 2% 2px, arc to 18% -12px of 7px 17px ccw small, arc by 12% -2px of 33px 33px rotate -42deg cw large , arc to 25% 20px of 10px 5px ccw small)'},
-  {at: 0, expect: 'shape(from 5% 5px, arc to 15% -15px of 10px 20px, arc by 15% -5px of 30px cw rotate 30deg large, arc to 25% 20px of 10px 5px small)'},
-  {at: 0.3, expect: 'shape(from 8% 8px, arc to 12% -18px of 13px 23px ccw small, arc by 18% -8px of 27px 27px rotate 102deg cw large, arc to 25% 20px of 10px 5px cw small )'},
-  {at: 0.5, expect: 'shape(from 10% 10px, arc to 10% -20px of 15px 25px ccw small, arc by 20% -10px of 25px rotate 150deg cw large, arc to 25% 20px of 10px 5px cw small)'},
-  {at: 1, expect: 'shape(from 15% 15px, arc to 5% -25px of 20px 30px, arc by 25% -15px of 20px rotate 270deg cw small, arc to 25% 20px of 10px 5px cw small)'},
-  {at: 1.5, expect: 'shape(from 20% 20px, arc to 0% -30px of 25px 35px ccw small, arc by 30% -20px of 15px rotate 390deg cw small, arc to 25% 20px of 10px 5px cw small)'},
+  {at: -0.3, expect: 'shape(from 2% 2px, arc to 18% -12px of 7px 17px, arc by 12% -2px of 33px 33px rotate -42deg cw large , arc to 25% 20px of 10px 5px)'},
+  {at: 0, expect: 'shape(from 5% 5px, arc to 15% -15px of 10px 20px, arc by 15% -5px of 30px cw rotate 30deg large, arc to 25% 20px of 10px 5px)'},
+  {at: 0.3, expect: 'shape(from 8% 8px, arc to 12% -18px of 13px 23px, arc by 18% -8px of 27px 27px rotate 102deg cw large, arc to 25% 20px of 10px 5px cw)'},
+  {at: 0.5, expect: 'shape(from 10% 10px, arc to 10% -20px of 15px 25px, arc by 20% -10px of 25px rotate 150deg cw large, arc to 25% 20px of 10px 5px cw)'},
+  {at: 1, expect: 'shape(from 15% 15px, arc to 5% -25px of 20px 30px, arc by 25% -15px of 20px rotate 270deg cw, arc to 25% 20px of 10px 5px cw)'},
+  {at: 1.5, expect: 'shape(from 20% 20px, arc to 0% -30px of 25px 35px, arc by 30% -20px of 15px rotate 390deg cw, arc to 25% 20px of 10px 5px cw)'},
 ]);
 
 test_interpolation({
@@ -270,12 +270,12 @@ test_interpolation({
   from: 'path("M 5 5 A 10,20 0 0,0 15,-15 a 30,30 30 1,1 15,-5 A 10,5 0 0,0 25 20")',
   to: 'shape(from 15px 15px, arc to 5px -25px of 20px 30px, arc by 25px -15px of 20px cw rotate 270deg small, arc to 25px 20px of 10px 5px small cw)' // ccw, cw, cw
 }, [
-  {at: -0.3, expect: 'shape(from 2px 2px, arc to 18px -12px of 7px 17px ccw small, arc by 12px -2px of 33px 33px rotate -42deg cw large, arc to 25px 20px of 10px 5px ccw small)'},
-  {at: 0, expect: 'shape(from 5px 5px, arc to 15px -15px of 10px 20px, arc by 15px -5px of 30px cw rotate 30deg large, arc to 25px 20px of 10px 5px small)'},
-  {at: 0.3, expect: 'shape(from 8px 8px, arc to 12px -18px of 13px 23px ccw small, arc by 18px -8px of 27px 27px rotate 102deg cw large, arc to 25px 20px of 10px 5px cw small )'},
-  {at: 0.5, expect: 'shape(from 10px 10px, arc to 10px -20px of 15px 25px ccw small, arc by 20px -10px of 25px rotate 150deg cw large, arc to 25px 20px of 10px 5px cw small)'},
-  {at: 1, expect: 'shape(from 15px 15px, arc to 5px -25px of 20px 30px, arc by 25px -15px of 20px rotate 270deg cw small, arc to 25px 20px of 10px 5px cw small)'},
-  {at: 1.5, expect: 'shape(from 20px 20px, arc to 0px -30px of 25px 35px ccw small, arc by 30px -20px of 15px rotate 390deg cw small, arc to 25px 20px of 10px 5px cw small)'},
+  {at: -0.3, expect: 'shape(from 2px 2px, arc to 18px -12px of 7px 17px, arc by 12px -2px of 33px 33px rotate -42deg cw large, arc to 25px 20px of 10px 5px)'},
+  {at: 0, expect: 'shape(from 5px 5px, arc to 15px -15px of 10px 20px, arc by 15px -5px of 30px cw rotate 30deg large, arc to 25px 20px of 10px 5px)'},
+  {at: 0.3, expect: 'shape(from 8px 8px, arc to 12px -18px of 13px 23px, arc by 18px -8px of 27px 27px rotate 102deg cw large, arc to 25px 20px of 10px 5px cw)'},
+  {at: 0.5, expect: 'shape(from 10px 10px, arc to 10px -20px of 15px 25px, arc by 20px -10px of 25px rotate 150deg cw large, arc to 25px 20px of 10px 5px cw)'},
+  {at: 1, expect: 'shape(from 15px 15px, arc to 5px -25px of 20px 30px, arc by 25px -15px of 20px rotate 270deg cw, arc to 25px 20px of 10px 5px cw)'},
+  {at: 1.5, expect: 'shape(from 20px 20px, arc to 0px -30px of 25px 35px, arc by 30px -20px of 15px rotate 390deg cw, arc to 25px 20px of 10px 5px cw)'},
 ]);
 
 </script>
diff --git a/tests/wpt/tests/css/css-mixins/at-function-parsing.html b/tests/wpt/tests/css/css-mixins/at-function-parsing.html
new file mode 100644
index 00000000000..6ab77c5e4d8
--- /dev/null
+++ b/tests/wpt/tests/css/css-mixins/at-function-parsing.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<title>Custom Functions: Prelude Parsing</title>
+<link rel="help" href="https://drafts.csswg.org/css-mixins-1/#function-rule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  function test_valid_prelude(rule_without_block) {
+    test(() => {
+      let s = new CSSStyleSheet();
+      s.replaceSync(`${rule_without_block} {}`);
+      assert_equals(s.cssRules.length, 1);
+    }, `${rule_without_block} is valid`);
+  }
+
+  function test_invalid_prelude(rule_without_block) {
+    test(() => {
+      let s = new CSSStyleSheet();
+      s.replaceSync(`${rule_without_block} {}`);
+      assert_equals(s.cssRules.length, 0);
+    }, `${rule_without_block} is invalid`);
+  }
+
+  test_valid_prelude('@function --foo()');
+  test_valid_prelude('@function --foo( )');
+  test_valid_prelude('@function --foo(--x)');
+  test_valid_prelude('@function --foo( --x )');
+
+  test_invalid_prelude('@function --foo ()');
+  test_invalid_prelude('@function --foo (--x)');
+
+  // All single <syntax-component> types.
+  test_valid_prelude('@function --foo(--x auto)');
+  test_valid_prelude('@function --foo(--x <angle>)');
+  test_valid_prelude('@function --foo(--x <color>)');
+  test_valid_prelude('@function --foo(--x <custom-ident>)');
+  test_valid_prelude('@function --foo(--x <image>)');
+  test_valid_prelude('@function --foo(--x <integer>)');
+  test_valid_prelude('@function --foo(--x <length>)');
+  test_valid_prelude('@function --foo(--x <length-percentage>)');
+  test_valid_prelude('@function --foo(--x <number>)');
+  test_valid_prelude('@function --foo(--x <percentage>)');
+  test_valid_prelude('@function --foo(--x <resolution>)');
+  test_valid_prelude('@function --foo(--x <string>)');
+  test_valid_prelude('@function --foo(--x <time>)');
+  test_valid_prelude('@function --foo(--x <url>)');
+  test_valid_prelude('@function --foo(--x <transform-function>)');
+  test_valid_prelude('@function --foo(--x <transform-list>)');
+
+  test_valid_prelude('@function --foo(--x type(auto))');
+  test_valid_prelude('@function --foo(--x type(<length>))');
+  test_valid_prelude('@function --foo(--x type(<length> | auto))');
+  test_valid_prelude('@function --foo(--x type(none | auto))');
+  test_valid_prelude('@function --foo(--x type(*))');
+
+  // Multiple parameters.
+  test_valid_prelude('@function --foo(--x, --y)');
+  test_valid_prelude('@function --foo(--x, --y, --z)');
+  test_valid_prelude('@function --foo(--x <length>, --y, --z)');
+  test_valid_prelude('@function --foo(--x, --y <number>, --z <angle>)');
+
+  // Defaults.
+  test_valid_prelude('@function --foo(--x : 10px)');
+  test_valid_prelude('@function --foo(--x <length>: 10px)');
+  test_valid_prelude('@function --foo(--x <length>: 10px, --y)');
+  test_valid_prelude('@function --foo(--x, --y <length>: 10px)');
+  test_valid_prelude('@function --foo(--x type(<length> | auto): auto)');
+  test_valid_prelude('@function --foo(--x type(<length> | auto) : auto)');
+  // The value does not have to match the type during @function parsing:
+  test_valid_prelude('@function --foo(--x <angle>: 10px)');
+
+  test_invalid_prelude('@function --foo(--x: 10px !important)');
+
+  // Lists.
+  test_valid_prelude('@function --foo(--x <length>#)');
+  test_valid_prelude('@function --foo(--x <length>+)');
+  test_valid_prelude('@function --foo(--x type(<length>+))');
+  test_valid_prelude('@function --foo(--x <transform-function>#)');
+  test_valid_prelude('@function --foo(--x <transform-function>+)');
+  // <transform-list> is special: a multiplier cannot follow it.
+  test_invalid_prelude('@function --foo(--x <transform-list>#)');
+  test_invalid_prelude('@function --foo(--x <transform-list>+)');
+
+  test_invalid_prelude('@function --foo(--x *)');
+  test_invalid_prelude('@function --foo(--x !)');
+  test_invalid_prelude('@function --foo(--x 50px)');
+  test_invalid_prelude('@function --foo(--x <length> | auto)');
+  test_invalid_prelude('@function --foo(--x none | auto)');
+  test_invalid_prelude('@function --foo(--x <dino>)');
+
+  // Return value types.
+  test_valid_prelude('@function --foo(--x) returns type(*)');
+  test_valid_prelude('@function --foo(--x) returns <length>');
+  test_valid_prelude('@function --foo(--x) returns <length>+');
+  test_valid_prelude('@function --foo(--x) returns type(<length>)');
+  test_valid_prelude('@function --foo(--x) returns type(<length> | auto)');
+  test_valid_prelude('@function --foo(--x) returns type(foo | bar)');
+
+  test_invalid_prelude('@function --foo(--x) !');
+  test_invalid_prelude('@function --foo(--x) length');
+  test_invalid_prelude('@function --foo(--x) returns');
+  test_invalid_prelude('@function --foo(--x) returns ');
+  test_invalid_prelude('@function --foo(--x) returns *');
+  test_invalid_prelude('@function --foo(--x) returns <transform-list>#');
+  test_invalid_prelude('@function --foo(--x) returns <transform-list>+');
+  test_invalid_prelude('@function --foo(--x) returns auto | none');
+  test_invalid_prelude('@function --foo(--x): <length>');
+  test_invalid_prelude('@function --foo(--x): length');
+  test_invalid_prelude('@function --foo(--x) returneth <length>');
+</script>
diff --git a/tests/wpt/tests/css/css-mixins/dashed-function-eval.html b/tests/wpt/tests/css/css-mixins/dashed-function-eval.html
new file mode 100644
index 00000000000..eb706ee3c99
--- /dev/null
+++ b/tests/wpt/tests/css/css-mixins/dashed-function-eval.html
@@ -0,0 +1,496 @@
+<!DOCTYPE html>
+<title>Custom Functions: Evaluating a &lt;dashed-function></title>
+<link rel="help" href="https://drafts.csswg.org/css-mixins-1/#substitute-a-dashed-function">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id=target></div>
+<div id=main></div>
+
+<!-- To pass, a test must produce matching computed values for --actual and
+     --expected on #target. -->
+
+<!-- Return value -->
+
+<template data-name="Literal result">
+  <style>
+    @function --f() {
+      result: 12px;
+    }
+    #target {
+      --actual: --f();
+      --expected: 12px;
+    }
+  </style>
+</template>
+
+<template data-name="Literal result, typed return">
+  <style>
+    @function --f() returns <length> {
+      result: 12px;
+    }
+    #target {
+      --actual: --f();
+      --expected: 12px;
+    }
+  </style>
+</template>
+
+<template data-name="Literal result, typed return, calc">
+  <style>
+    @function --f() returns <length> {
+      result: calc(12px + 1px);
+    }
+    #target {
+      --actual: --f();
+      --expected: 13px;
+    }
+  </style>
+</template>
+
+<template data-name="Literal result, typed return, mismatch">
+  <style>
+    @function --f() returns <length> {
+      result: 12s;
+    }
+    #target {
+      --actual: --f();
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+<template data-name="Missing result descriptor">
+  <style>
+    @function --f() {
+    }
+    #target {
+      --actual: --f();
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+<template data-name="Literal result, empty">
+  <style>
+    @function --f() {
+      result:;
+    }
+    #target {
+      --actual: --f();
+      --expected:;
+    }
+  </style>
+</template>
+
+<template data-name="result cascading behavior">
+  <style>
+    @function --f() returns <length> {
+      result: 12px;
+      result: 24px; /* Overwrites previous */
+    }
+    #target {
+      --actual: --f();
+      --expected: 24px;
+    }
+  </style>
+</template>
+
+<template data-name="Another dashed-function in result">
+  <style>
+    @function --f() {
+      result: --g();
+    }
+    @function --g() {
+      result: 12px;
+    }
+    #target {
+      --actual: --f();
+      --expected: 12px;
+    }
+  </style>
+</template>
+
+<!-- Parameters / Arguments -->
+
+<template data-name="Unused argument">
+  <style>
+    @function --f(--x) {
+      result: 12px;
+    }
+    #target {
+      --actual: --f(100px);
+      --expected: 12px;
+    }
+  </style>
+</template>
+
+<template data-name="Single parameter">
+  <style>
+    @function --f(--x) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(100px);
+      --expected: 100px;
+    }
+  </style>
+</template>
+
+<template data-name="Multiple parameters">
+  <style>
+    @function --f(--x, --y, --z) {
+      result: var(--x) var(--y) var(--z);
+    }
+    #target {
+      --actual: --f(100px, auto, red);
+      --expected: 100px auto red;
+    }
+  </style>
+</template>
+
+<template data-name="Single parameter, typed">
+  <style>
+    @function --f(--x <length>) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(100px);
+      --expected: 100px;
+    }
+  </style>
+</template>
+
+<template data-name="Typed parameter with calc()">
+  <style>
+    @function --f(--x <length>) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(calc(100px + 1px));
+      --expected: 101px;
+    }
+  </style>
+</template>
+
+<template data-name="Untyped parameter with calc()">
+  <style>
+    @function --f(--x type(*)) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(calc(100px + 1px));
+      --expected: calc(100px + 1px);
+    }
+  </style>
+</template>
+
+<template data-name="Various typed parameters">
+  <style>
+    @function --f(--x <length>, --y <angle>, --z <time>) {
+      result: var(--x) var(--y) var(--z);
+    }
+    #target {
+      --actual: --f(calc(100px + 1px), 1turn, 1000ms);
+      --expected: 101px 360deg 1s;
+    }
+  </style>
+</template>
+
+<template data-name="Parameter with complex type (auto)">
+  <style>
+    @function --f(--x type(<length> | auto)) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(auto);
+      --expected: auto;
+    }
+  </style>
+</template>
+
+<template data-name="Parameter with complex type (px)">
+  <style>
+    @function --f(--x type(<length> | auto)) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f(10px);
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<template data-name="Passing argument to inner function">
+  <style>
+    @function --f(--x) {
+      result: --g(var(--x));
+    }
+    @function --g(--y) {
+      result: var(--y);
+    }
+    #target {
+      --actual: --f(12px);
+      --expected: 12px;
+    }
+  </style>
+</template>
+
+<!-- Arguments + var() -->
+
+<template data-name="var() in argument resolved before call">
+  <style>
+    @function --f(--x) {
+      --one: FAIL;
+      result: var(--x);
+    }
+    #target {
+      --one: 1px;
+      --actual: --f(calc(100px + var(--one)));
+      --expected: calc(100px + 1px);
+    }
+  </style>
+</template>
+
+<template data-name="var() in argument resolved before call, typed">
+  <style>
+    @function --f(--x <length>) {
+      --one: FAIL;
+      result: var(--x);
+    }
+    #target {
+      --one: 1px;
+      --actual: --f(calc(100px + var(--one)));
+      --expected: 101px;
+    }
+  </style>
+</template>
+
+<!-- Defaults -->
+
+<template data-name="Single parameter with default value">
+  <style>
+    @function --f(--x: PASS) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Multiple parameters with defaults">
+  <style>
+    @function --f(--x, --y: 2px, --z: 3px) {
+      result: var(--x) var(--y) var(--z);
+    }
+    #target {
+      --actual: --f(1px, 5px);
+      --expected: 1px 5px 3px;
+    }
+  </style>
+</template>
+
+<template data-name="Multiple parameters with defaults, typed">
+  <style>
+    @function --f(--x, --y <length>: 2px, --z <length>: 3px) {
+      result: var(--x) var(--y) var(--z);
+    }
+    #target {
+      --actual: --f(1px, 5px);
+      --expected: 1px 5px 3px;
+    }
+  </style>
+</template>
+
+<!-- Locals -->
+
+<template data-name="Unused local">
+  <style>
+    @function --f() {
+      --x: 10px;
+      result: 1px;
+    }
+    #target {
+      --actual: --f();
+      --expected: 1px;
+    }
+  </style>
+</template>
+
+<template data-name="Local does not affect outer scope">
+  <style>
+    @function --f() {
+      --x: 10px;
+      result: 1px;
+    }
+    #target {
+      --x: 20px;
+      --actual: --f() var(--x);
+      --expected: 1px 20px;
+    }
+  </style>
+</template>
+
+<template data-name="Substituting local in result">
+  <style>
+    @function --f() {
+      --x: 10px;
+      result: var(--x);
+    }
+    #target {
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<template data-name="Substituting multiple locals in result">
+  <style>
+    @function --f() {
+      --x: 10px;
+      --y: 17px;
+      result: var(--x) var(--y);
+    }
+    #target {
+      --actual: --f();
+      --expected: 10px 17px;
+    }
+  </style>
+</template>
+
+<template data-name="Local referring to another local">
+  <style>
+    @function --f() {
+      --x: 10px;
+      --y: var(--x);
+      result: var(--y);
+    }
+    #target {
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<template data-name="Locals appearing after result">
+  <style>
+    @function --f() {
+      result: var(--y);
+      --x: 10px;
+      --y: var(--x);
+    }
+    #target {
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<template data-name="Locals cascading behavior">
+  <style>
+    @function --f() {
+      --x: 10px;
+      --y: var(--x);
+      result: var(--y);
+
+      --x: 20px; /* Surprise! */
+    }
+    #target {
+      --actual: --f();
+      --expected: 20px;
+    }
+  </style>
+</template>
+
+<!-- Scoping -->
+
+<template data-name="Custom properties are visible inside function">
+  <style>
+    @function --f() {
+      result: var(--x);
+    }
+    #target {
+      --x: 10px;
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<!--
+  TODO(andruud): Add more tests for dynamic scoping when Issue 10954
+  resolves: https://github.com/w3c/csswg-drafts/issues/10954
+-->
+
+<!-- Shadowing -->
+
+<template data-name="Parameter shadows custom property">
+  <style>
+    @function --f(--x) {
+      result: var(--x);
+    }
+    #target {
+      --x: FAIL;
+      --actual: --f(PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Local shadows parameter">
+  <style>
+    @function --f(--x) {
+      --x: PASS;
+      result: var(--x);
+    }
+    #target {
+      --x: FAIL1;
+      --actual: --f(FAIL2);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<!-- Invalid invocations -->
+
+<template data-name="Missing only argument">
+  <style>
+    @function --f(--x) {
+      result: 10px;
+    }
+    #target {
+      --actual: --f();
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+<template data-name="Missing one argument of several">
+  <style>
+    @function --f(--x, --y, --z) {
+      result: 10px;
+    }
+    #target {
+      --actual: --f(1, 2);
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+
+<!-- Test runner -->
+<script>
+  let templates = document.querySelectorAll('template');
+  for (let template of templates) {
+    test((t) => {
+      t.add_cleanup(() => main.replaceChildren());
+      main.append(template.content.cloneNode(true));
+      let cs = getComputedStyle(target);
+      let actual = cs.getPropertyValue('--actual');
+      let expected = cs.getPropertyValue('--expected');
+      assert_equals(actual, expected);
+    }, template.getAttribute('data-name'));
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-002.html b/tests/wpt/tests/css/css-multicol/getclientrects-002.html
new file mode 100644
index 00000000000..7efdef40e5a
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-002.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>out-of-flow in relpos in multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 0;
+  }
+</style>
+<div style="margin:10px; border:10px solid; padding:5px; columns:3; gap:50px; column-fill:auto; inline-size:400px; block-size:100px;">
+  <div style="block-size:50px;"></div>
+  <div style="position:relative;">
+    <div style="block-size:60px;"></div>
+    <div id="elm" style="position:absolute; inline-size:10px; border:10px solid; block-size:100px;"></div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  let rects = elm.getClientRects();
+  test(()=> { assert_equals(rects.length, 2); }, "Rectangle count");
+  test(()=> { assert_equals(rects[0].left, 175); }, "#0 left");
+  test(()=> { assert_equals(rects[0].top, 35); }, "#0 top");
+  test(()=> { assert_equals(rects[0].width, 30); }, "#0 width");
+  test(()=> { assert_equals(rects[0].height, 90); }, "#0 height");
+  test(()=> { assert_equals(rects[1].left, 325); }, "#1 left");
+  test(()=> { assert_equals(rects[1].top, 25); }, "#1 top");
+  test(()=> { assert_equals(rects[1].width, 30); }, "#1 width");
+  test(()=> { assert_equals(rects[1].height, 30); }, "#1 height");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-003.html b/tests/wpt/tests/css/css-multicol/getclientrects-003.html
new file mode 100644
index 00000000000..df97d6648f6
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-003.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>out-of-flow in relpos in multicol in multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 0;
+  }
+</style>
+<div style="columns:3; gap:50px; column-fill:auto; inline-size:400px; block-size:100px; background:yellow;">
+  <div style="block-size:50px;"></div>
+  <div style="columns:2; column-fill:auto; gap:0; background:cyan;">
+    <div style="position:relative; block-size:350px;">
+      <div style="block-size:160px;"></div>
+      <div id="elm" style="position:absolute; inline-size:10px; border:10px solid; block-size:150px;"></div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  let rects = elm.getClientRects();
+  test(()=> { assert_equals(rects.length, 3); }, "Rectangle count");
+  test(()=> { assert_equals(rects[0].left, 150); }, "#0 left");
+  test(()=> { assert_equals(rects[0].top, 60); }, "#0 top");
+  test(()=> { assert_equals(rects[0].width, 30); }, "#0 width");
+  test(()=> { assert_equals(rects[0].height, 40); }, "#0 height");
+  test(()=> { assert_equals(rects[1].left, 200); }, "#1 left");
+  test(()=> { assert_equals(rects[1].top, 0); }, "#1 top");
+  test(()=> { assert_equals(rects[1].width, 30); }, "#1 width");
+  test(()=> { assert_equals(rects[1].height, 100); }, "#1 height");
+  test(()=> { assert_equals(rects[2].left, 300); }, "#2 left");
+  test(()=> { assert_equals(rects[2].top, 0); }, "#2 top");
+  test(()=> { assert_equals(rects[2].width, 30); }, "#2 width");
+  test(()=> { assert_equals(rects[2].height, 30); }, "#2 height");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-004.html b/tests/wpt/tests/css/css-multicol/getclientrects-004.html
new file mode 100644
index 00000000000..f2519521e54
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-004.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>out-of-flow in relpos in multicol in multicol, vertical-rl</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 0;
+  }
+</style>
+<div style="writing-mode:vertical-rl; columns:3; gap:50px; column-fill:auto; inline-size:400px; block-size:100px; background:yellow;">
+  <div style="block-size:50px;"></div>
+  <div style="columns:2; column-fill:auto; gap:0; background:cyan;">
+    <div style="position:relative; block-size:350px;">
+      <div style="block-size:160px;"></div>
+      <div id="elm" style="position:absolute; inline-size:10px; border:10px solid; block-size:150px;"></div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  let rects = elm.getClientRects();
+  test(()=> { assert_equals(rects.length, 3); }, "Rectangle count");
+  test(()=> { assert_equals(rects[0].left, 0); }, "#0 left");
+  test(()=> { assert_equals(rects[0].top, 150); }, "#0 top");
+  test(()=> { assert_equals(rects[0].width, 40); }, "#0 width");
+  test(()=> { assert_equals(rects[0].height, 30); }, "#0 height");
+  test(()=> { assert_equals(rects[1].left, 0); }, "#1 left");
+  test(()=> { assert_equals(rects[1].top, 200); }, "#1 top");
+  test(()=> { assert_equals(rects[1].width, 100); }, "#1 width");
+  test(()=> { assert_equals(rects[1].height, 30); }, "#1 height");
+  test(()=> { assert_equals(rects[2].left, 70); }, "#2 left");
+  test(()=> { assert_equals(rects[2].top, 300); }, "#2 top");
+  test(()=> { assert_equals(rects[2].width, 30); }, "#2 width");
+  test(()=> { assert_equals(rects[2].height, 30); }, "#2 height");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-invalid.html
similarity index 94%
rename from tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-invalid.html
rename to tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-invalid.html
index 752aa3c865b..a7306df84d6 100644
--- a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-invalid.html
+++ b/tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-invalid.html
@@ -10,7 +10,6 @@
   test_invalid_selector('::scroll-button)');
   test_invalid_selector('::scroll-button(');
   test_invalid_selector('::scroll-button()');
-  test_invalid_selector('::scroll-button(*)');
   test_invalid_selector('::scroll-button(\'up\')');
   test_invalid_selector('::scroll-button(up, down)');
   test_invalid_selector('::scroll-button(north)');
diff --git a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-valid.html b/tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-valid.html
similarity index 87%
rename from tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-valid.html
rename to tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-valid.html
index b4e747efadf..a1af4c89b47 100644
--- a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-buttons-valid.html
+++ b/tests/wpt/tests/css/css-overflow/parsing/scroll-buttons-valid.html
@@ -14,6 +14,11 @@
   test_valid_selector('::scroll-button(inline-start)');
   test_valid_selector('::scroll-button(inline-end)');
   test_valid_selector('::scroll-button(block-end)');
+  test_valid_selector('::scroll-button(*)');
+  test_valid_selector('::scroll-button( up)', '::scroll-button(up)');
+  test_valid_selector('::scroll-button(up )', '::scroll-button(up)');
+  test_valid_selector('::scroll-button( *)', '::scroll-button(*)');
+  test_valid_selector('::scroll-button(* )', '::scroll-button(*)');
 
   // :focus
   test_valid_selector('::scroll-button(up):focus');
diff --git a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-computed.html b/tests/wpt/tests/css/css-overflow/parsing/scroll-markers-computed.html
similarity index 100%
rename from tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-computed.html
rename to tests/wpt/tests/css/css-overflow/parsing/scroll-markers-computed.html
diff --git a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/scroll-markers-invalid.html
similarity index 100%
rename from tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-invalid.html
rename to tests/wpt/tests/css/css-overflow/parsing/scroll-markers-invalid.html
diff --git a/tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-valid.html b/tests/wpt/tests/css/css-overflow/parsing/scroll-markers-valid.html
similarity index 100%
rename from tests/wpt/tests/css/css-overflow/parsing/parsing/scroll-markers-valid.html
rename to tests/wpt/tests/css/css-overflow/parsing/scroll-markers-valid.html
diff --git a/tests/wpt/tests/css/css-overflow/scroll-button-hover-remove.html b/tests/wpt/tests/css/css-overflow/scroll-button-hover-remove.html
new file mode 100644
index 00000000000..af000012b4e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-button-hover-remove.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-button changes on hover via :hover and removes correctly</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: auto;
+    white-space: nowrap;
+  }
+
+  #scroller:hover {
+    background-color: red;
+  }
+
+  .scroller::scroll-button(inline-end) {
+    content: ">";
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: green;
+    display: inline-block;
+  }
+
+  .scroller::scroll-button(inline-end):hover {
+    background-color: blue;
+  }
+</style>
+<div id="scroller" class="scroller">
+  <div id="target"></div>
+  <div></div>
+</div>
+<script>
+  promise_test(async t => {
+    actions_promise = new test_driver.Actions()
+      .pointerMove(15, 15)
+      .send();
+    await actions_promise;
+    assert_equals(getComputedStyle(scroller, "::scroll-button(inline-end)").backgroundColor, "rgb(0, 0, 255)", "::scroll-button changes on hover via :hover");
+    assert_equals(getComputedStyle(scroller).backgroundColor, "rgb(255, 0, 0)", "scroller should be hovered when ::scroll-button is hovered");
+    scroller.classList.remove("scroller");
+    scroller.offsetTop;
+    assert_equals(getComputedStyle(scroller).backgroundColor, "rgb(255, 0, 0)", "scroller should be hovered when ::scroll-button is removed");
+  });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-overflow/scroll-button-hover.html b/tests/wpt/tests/css/css-overflow/scroll-button-hover.html
new file mode 100644
index 00000000000..35ea009cee0
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-button-hover.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-button changes on hover via :hover</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: auto;
+    white-space: nowrap;
+  }
+
+  #scroller div {
+    background: green;
+    display: inline-block;
+    width: 600px;
+    height: 270px;
+  }
+
+  #scroller::scroll-button(inline-end) {
+    content: ">";
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: green;
+    display: inline-block;
+  }
+
+  #scroller::scroll-button(inline-end):hover {
+    background-color: blue;
+  }
+</style>
+<div id="scroller">
+  <div id="target"></div>
+  <div></div>
+</div>
+<script>
+  promise_test(async t => {
+    actions_promise = new test_driver.Actions()
+      .pointerMove(15, 15)
+      .send();
+    await actions_promise;
+    assert_equals(getComputedStyle(scroller, "::scroll-button(inline-end)").backgroundColor, "rgb(0, 0, 255)", "::scroll-button changes on hover via :hover");
+  });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-overflow/scroll-buttons-003.html b/tests/wpt/tests/css/css-overflow/scroll-buttons-003.html
new file mode 100644
index 00000000000..dae822892f5
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-buttons-003.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-button()s box creation with ::scroll-button(*)</title>
+<link rel="match" href="scroll-buttons-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<style>
+  div::scroll-button(block-end), div::scroll-button(block-start) {
+    content: "";
+  }
+  div::scroll-button(*) {
+    background: green;
+    display: flex;
+    height: 50px;
+    width: 100px;
+    border: none;
+  }
+</style>
+<p>Test passes if there is a <strong>filled green rectangle</strong>.
+<div></div>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-buttons-004.html b/tests/wpt/tests/css/css-overflow/scroll-buttons-004.html
new file mode 100644
index 00000000000..f1ac00a326e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-buttons-004.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-button(*)s box creation</title>
+<link rel="match" href="scroll-buttons-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<style>
+  div::scroll-button(*) {
+    content: "";
+    background: green;
+    display: flex;
+    height: 25px;
+    width: 100px;
+    border: none;
+  }
+</style>
+<p>Test passes if there is a <strong>filled green rectangle</strong>.
+<div></div>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping-ref.html b/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping-ref.html
new file mode 100644
index 00000000000..7603e0ce1c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping-ref.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<title>CSS Test: ::scroll-button(*) :disabled triggers when snapping prevents further scrolling</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<style>
+  * {
+    margin: 0;
+    padding: 0;
+  }
+
+  .scroller {
+    width: 50px;
+    height: 50px;
+    overflow: hidden;
+    margin: 20px;
+    box-sizing: border-box;
+  }
+
+  .horizontal {
+    white-space: nowrap;
+    scroll-snap-type: x mandatory;
+    padding: 0 20px;
+  }
+  .vertical {
+    white-space: nowrap;
+    scroll-snap-type: y mandatory;
+    padding: 20px 0;
+  }
+
+  .scroller div {
+    background: lightblue;
+    border: 2px solid blue;
+    width: 50px;
+    height: 50px;
+    box-sizing: border-box;
+    scroll-snap-align: center;
+  }
+
+  .scroller.horizontal div {
+    display: inline-block;
+  }
+
+  .scroll-button {
+    background: green;
+    border: 1px solid black;
+    display: inline-block;
+    height: 20px;
+    width: 20px;
+    color: white;
+    box-sizing: border-box;
+  }
+
+  .scroll-button.disabled {
+    background: gray;
+  }
+
+
+</style>
+<div class="horizontal scroller">
+  <div></div>
+  <div></div>
+</div>
+<div><div class="scroll-button inline-start disabled"></div><div class="scroll-button inline-end"></div></div>
+<div class="horizontal scroller">
+  <div></div>
+  <div></div>
+</div>
+<div><div class="scroll-button inline-start"></div><div class="scroll-button inline-end disabled"></div></div>
+<div class="vertical scroller">
+  <div></div>
+  <div></div>
+</div>
+<div><div class="scroll-button block-start disabled"></div><div class="scroll-button block-end"></div></div>
+<div class="vertical scroller">
+  <div></div>
+  <div></div>
+</div>
+<div><div class="scroll-button block-start"></div><div class="scroll-button block-end disabled"></div></div>
+<script>
+  const scrollers = document.querySelectorAll('.scroller');
+  scrollers[1].scrollLeft = 1000;
+  scrollers[3].scrollTop = 1000;
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping.html b/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping.html
new file mode 100644
index 00000000000..8f6206a31c2
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-buttons-disabled-snapping.html
@@ -0,0 +1,85 @@
+<!doctype html>
+<title>CSS Test: ::scroll-button(inline-end) supports :disabled</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<link rel="match" href="scroll-buttons-disabled-snapping-ref.html">
+<style>
+  * {
+    margin: 0;
+    padding: 0;
+  }
+
+  .scroller {
+    width: 50px;
+    height: 50px;
+    overflow: hidden;
+    margin: 20px;
+    box-sizing: border-box;
+  }
+
+  .horizontal {
+    white-space: nowrap;
+    scroll-snap-type: x mandatory;
+    padding: 0 20px;
+  }
+  .vertical {
+    white-space: nowrap;
+    scroll-snap-type: y mandatory;
+    padding: 20px 0;
+  }
+
+  .scroller div {
+    background: lightblue;
+    border: 2px solid blue;
+    width: 50px;
+    height: 50px;
+    box-sizing: border-box;
+    scroll-snap-align: center;
+  }
+
+  .scroller.horizontal div {
+    display: inline-block;
+  }
+
+  .scroller::scroll-button(*) {
+    box-sizing: border-box;
+    background: green;
+    border: 1px solid black;
+    display: inline-block;
+    height: 20px;
+    width: 20px;
+    color: white;
+  }
+
+  .scroller::scroll-button(*):disabled {
+    background: gray;
+  }
+
+  .scroller.vertical::scroll-button(block-start),
+  .scroller.vertical::scroll-button(block-end),
+  .scroller.horizontal::scroll-button(inline-start),
+  .scroller.horizontal::scroll-button(inline-end) {
+    content: " ";
+  }
+
+</style>
+<div class="horizontal scroller">
+  <div></div>
+  <div></div>
+</div>
+<div class="horizontal scroller">
+  <div></div>
+  <div></div>
+</div>
+<div class="vertical scroller">
+  <div></div>
+  <div></div>
+</div>
+<div class="vertical scroller">
+  <div></div>
+  <div></div>
+</div>
+<script>
+  const scrollers = document.querySelectorAll('.scroller');
+  scrollers[1].scrollLeft = 1000;
+  scrollers[3].scrollTop = 1000;
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-hover-logical.html b/tests/wpt/tests/css/css-overflow/scroll-marker-hover-logical.html
new file mode 100644
index 00000000000..1b865f77885
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-hover-logical.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-marker changes on hover via logical selectors</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: auto;
+    scroll-marker-group: before;
+    white-space: nowrap;
+  }
+
+  #scroller div {
+    background: green;
+    display: inline-block;
+    width: 600px;
+    height: 270px;
+  }
+
+  #scroller::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    width: 40px;
+  }
+
+  #scroller div::scroll-marker {
+    content: "";
+    width: 100px;
+    height: 20px;
+    display: inline-block;
+  }
+
+  #scroller div::scroll-marker:not(:hover) {
+    background-color: green;
+  }
+
+  #scroller div::scroll-marker:is(:hover) {
+    background-color: blue;
+  }
+</style>
+<div id="scroller">
+  <div id="target"></div>
+  <div></div>
+</div>
+<script>
+  promise_test(async t => {
+    assert_equals(getComputedStyle(target, "::scroll-marker").backgroundColor, "rgb(0, 128, 0)", "not hovered ::scroll-marker is styled via logical :not(:hover)");
+    actions_promise = new test_driver.Actions()
+      .pointerMove(15, 15)
+      .send();
+    await actions_promise;
+    assert_equals(getComputedStyle(target, "::scroll-marker").backgroundColor, "rgb(0, 0, 255)", "::scroll-marker changes on hover via logical :is(:hover)");
+  });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-hover-remove.html b/tests/wpt/tests/css/css-overflow/scroll-marker-hover-remove.html
new file mode 100644
index 00000000000..03931905eef
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-hover-remove.html
@@ -0,0 +1,69 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-marker:hover is removed correctly</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: auto;
+    scroll-marker-group: before;
+    white-space: nowrap;
+  }
+
+  #scroller div {
+    background: green;
+    display: inline-block;
+    width: 600px;
+    height: 270px;
+  }
+
+  #scroller div:hover {
+    background-color: blue;
+  }
+
+  #scroller::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    width: 40px;
+  }
+
+  .scroller div::scroll-marker {
+    content: "";
+    width: 100px;
+    height: 20px;
+    background-color: green;
+    display: inline-block;
+  }
+
+  .scroller div::scroll-marker:hover {
+    background-color: blue;
+  }
+</style>
+<div id="scroller" class="scroller">
+  <div id="target"></div>
+  <div></div>
+</div>
+<script>
+  promise_test(async t => {
+    actions_promise = new test_driver.Actions()
+      .pointerMove(15, 15)
+      .send();
+    await actions_promise;
+    assert_equals(getComputedStyle(target, "::scroll-marker").backgroundColor, "rgb(0, 0, 255)", "::scroll-marker changes on hover via :hover");
+    assert_equals(getComputedStyle(target).backgroundColor, "rgb(0, 0, 255)", "::scroll-marker's originating element is hovered when ::scroll-marker is hovered");
+    scroller.classList.remove("scroller");
+    requestAnimationFrame(() => {
+      assert_equals(getComputedStyle(target).backgroundColor, "rgb(0, 128, 0)", "::scroll-marker's originating element is not hovered when ::scroll-marker is removed");
+    });
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-hover.html b/tests/wpt/tests/css/css-overflow/scroll-marker-hover.html
new file mode 100644
index 00000000000..12273af2bba
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-hover.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-marker changes on hover via :hover</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: auto;
+    scroll-marker-group: before;
+    white-space: nowrap;
+  }
+
+  #scroller div {
+    background: green;
+    display: inline-block;
+    width: 600px;
+    height: 270px;
+  }
+
+  #scroller::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    width: 40px;
+  }
+
+  #scroller div::scroll-marker {
+    content: "";
+    width: 100px;
+    height: 20px;
+    background-color: green;
+    display: inline-block;
+  }
+
+  #scroller div::scroll-marker:hover {
+    background-color: blue;
+  }
+</style>
+<div id="scroller">
+  <div id="target"></div>
+  <div></div>
+</div>
+<script>
+  promise_test(async t => {
+    actions_promise = new test_driver.Actions()
+      .pointerMove(15, 15)
+      .send();
+    await actions_promise;
+    assert_equals(getComputedStyle(target, "::scroll-marker").backgroundColor, "rgb(0, 0, 255)", "::scroll-marker changes on hover via :hover");
+  });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex-ref.html
new file mode 100644
index 00000000000..731c34488aa
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<div style="scrollbar-width: none; position: relative; display: flex; flex-direction: column-reverse; overflow-y: scroll; width: 100px; height: 100px;">
+  <div style="position: absolute; bottom: 0; height: 50px; width: 50px; background: green"></div>
+  <div style="min-height: 400px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex.html
new file mode 100644
index 00000000000..29ed888fc2b
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-column-reverse-flex.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+  <meta name="assert" content="Position sticky works correctly with column-reverse flex" />
+  <link rel="match" href="position-sticky-column-reverse-flex-ref.html" />
+  <script src="/common/reftest-wait.js"></script>
+
+  <style>
+    #scroller {
+      position: relative;
+      display: flex;
+      flex-direction: column-reverse;
+      overflow-y: scroll;
+      width: 100px;
+      height: 100px;
+      scrollbar-width: none;
+    }
+    #sticky {
+      position: sticky;
+      bottom: 0;
+      width: 50px;
+      min-height: 50px;
+      background: green;
+    }
+  </style>
+
+  <div id=scroller>
+    <div id=sticky ></div>
+    <div style="min-height: 400px;"></div>
+  </div>
+  <script>
+  onload = () => {
+    scroller.scrollTo(0, -400);
+    takeScreenshot();
+  }
+  </script>
+</html>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-001.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-001.html
similarity index 100%
rename from tests/wpt/tests/css/css-scoping/has-slotted-001.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-001.html
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-002.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-002.html
similarity index 100%
rename from tests/wpt/tests/css/css-scoping/has-slotted-002.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-002.html
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-003.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-003.html
similarity index 100%
rename from tests/wpt/tests/css/css-scoping/has-slotted-003.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-003.html
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-changing-001.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-changing-001.html
similarity index 100%
rename from tests/wpt/tests/css/css-scoping/has-slotted-changing-001.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-changing-001.html
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-changing-002.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-changing-002.html
similarity index 100%
rename from tests/wpt/tests/css/css-scoping/has-slotted-changing-002.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-changing-002.html
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.html
similarity index 92%
rename from tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.tentative.html
rename to tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.html
index 0235f99e21f..cd6436a7145 100644
--- a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.tentative.html
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-001.html
@@ -19,6 +19,6 @@
             }
             </style>
             <slot></slot>
-        </template><slot></slot></div>
+        </template><slot><div></div></slot></div>
     </template>
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.html
new file mode 100644
index 00000000000..84e4c63953e
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>:has-slotted negative test: no children or white space</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div id="ancestor"><template shadowrootmode="open"><div id="host"><template shadowrootmode="open"><style>
+  slot {
+      display: block;
+      width: 100px;
+      height: 100px;
+      background-color: green;
+  }
+  :has-slotted {
+      background-color: red;
+  }
+</style><slot></slot></template></div></template></div>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.tentative.html
deleted file mode 100644
index f37b6217789..00000000000
--- a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-002.tentative.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>:has-slotted negative test: no children or white space</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
-<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
-<p>Test passes if there is a filled green square.</p>
-<div id="ancestor"><template shadowrootmode="open">
-    <div id="host"><template shadowrootmode="open">
-        <style>
-        slot {
-            display: block;
-            width: 100px;
-            height: 100px;
-            background-color: green;
-        }
-        :has-slotted {
-            background-color: red;
-        }
-        </style>
-        <slot></slot>
-    </template></div>
-</template></div>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.html
new file mode 100644
index 00000000000..e16abd7be89
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>:has-slotted populated, flattened through multiple slots</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div id="ancestor"><template shadowrootmode="open"><div id="host"><template shadowrootmode="open"><style>
+  slot {
+      display: block;
+      width: 100px;
+      height: 100px;
+      background-color: red;
+  }
+  :has-slotted {
+      background-color: green;
+  }
+</style><slot></slot></template><slot></slot></div></template><div></div></div>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.tentative.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.tentative.html
deleted file mode 100644
index 5f007fbd1b0..00000000000
--- a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-003.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>:has-slotted flattened through multiple slots</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
-<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
-<p>Test passes if there is a filled green square.</p>
-<div id="ancestor">
-    <template shadowrootmode="open">
-        <div id="host"><template shadowrootmode="open">
-            <style>
-            slot {
-                display: block;
-                width: 100px;
-                height: 100px;
-                background-color: red;
-            }
-            :has-slotted {
-                background-color: green;
-            }
-            </style>
-            <slot></slot>
-        </template><slot></slot></div>
-    </template>
-    <div></div>
-</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-flattened-004.html b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-004.html
new file mode 100644
index 00000000000..365aad154dc
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-flattened-004.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>:has-slotted negative test: empty nested slot</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div id="ancestor"><template shadowrootmode="open"><div id="host"><template shadowrootmode="open"><style>
+  slot {
+      display: block;
+      width: 100px;
+      height: 100px;
+      background-color: green;
+  }
+  :has-slotted {
+      background-color: red;
+  }
+</style><slot></slot></template><slot></slot></div></template></div>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-manual-assignment.html b/tests/wpt/tests/css/css-scoping/has-slotted-manual-assignment.html
new file mode 100644
index 00000000000..02be3861ead
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-manual-assignment.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<meta charset="utf-8" />
+<title>:has-slotted with manual assignment</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<test-element id="host"></test-element>
+<script>
+  customElements.define('test-element', class extends HTMLElement {
+    connectedCallback() {
+      this.attachShadow({mode: 'open', slotAssignment: 'manual'});
+      this.shadowRoot.append(document.createElement('slot'))
+    }
+    assign(...nodes) {
+      this.shadowRoot.querySelector('slot').assign(...nodes)
+    }
+  });
+
+  const slot = host.shadowRoot.querySelector('slot');
+
+  test(function () {
+    assert_equals(slot.assignedNodes().length, 0, "slot element should not match :has-slotted");
+    assert_equals(host.shadowRoot.querySelectorAll(':has-slotted').length, 0, "slot element should not match :has-slotted");
+    assert_false(slot.matches(':has-slotted'), "slot element should not match :has-slotted");
+  }, ":has-slotted does not match or querySelector with no manual assigned nodes");
+
+  test(function () {
+    host.append(document.createElement("div"));
+    assert_equals(slot.assignedNodes().length, 0, "slot element should not match :has-slotted");
+    assert_equals(host.shadowRoot.querySelectorAll(':has-slotted').length, 0, "slot element should not match :has-slotted");
+    assert_false(slot.matches(':has-slotted'), "slot element should not match :has-slotted");
+  }, ":has-slotted does not match or querySelector with no manual assigned nodes - 2");
+
+  test(function () {
+    host.assign(...host.children);
+    assert_equals(slot.assignedNodes().length, 1, "slot element should match :has-slotted with 1 child node");
+    assert_equals(host.shadowRoot.querySelectorAll(':has-slotted').length, 1, "slot element should match :has-slotted with 1 child node");
+    assert_true(slot.matches(':has-slotted'), "slot element should match :has-slotted with 1 child node");
+  }, ":has-slotted does match when a child is manually assigned");
+
+  test(function () {
+    host.assign();
+    assert_equals(slot.assignedNodes().length, 0, "slot element should not match :has-slotted after empty");
+    assert_equals(host.shadowRoot.querySelectorAll(':has-slotted').length, 0, "slot element should not match :has-slotted after empty");
+    assert_false(slot.matches(':has-slotted'), "slot element should not match :has-slotted after empty");
+  }, ":has-slotted no longer matches when no children become manually assigned");
+</script>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-query-selector.html b/tests/wpt/tests/css/css-scoping/has-slotted-query-selector.html
new file mode 100644
index 00000000000..88da744a67b
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-query-selector.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<meta charset="utf-8" />
+<title>:has-slotted and query-selector</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="ancestor"><template shadowrootmode="open"><div id="host"><template shadowrootmode="open"><style>
+  slot {
+    color: rgb(0, 0, 0);
+  }
+  :has-slotted {
+    color: rgb(0, 255, 0);
+  }
+</style><slot></slot></template><slot></slot></div></template></div>
+<script>
+  const host = ancestor.shadowRoot.querySelector('#host');
+  for(const container of [host, ancestor]) {
+    host.replaceChildren(document.createElement('slot'));
+    ancestor.replaceChildren();
+    const slot = host.shadowRoot.querySelector("slot");
+
+    test(function () {
+      assert_equals(slot.assignedNodes({flatten: true}).length, 0, "slot should have 0 nodes");
+      assert_false(slot.matches(":has-slotted"), "slot element should not match :has-slotted");
+      assert_equals(getComputedStyle(slot).color, "rgb(0, 0, 0)", "slot element should not match :has-slotted");
+      assert_equals(host.shadowRoot.querySelectorAll(":has-slotted").length, 0, "slot element should not match :has-slotted");
+    }, ":has-slotted does not match or querySelector when there are no assigned nodes" + (container == ancestor ? " (flattened)" : ""));
+
+    test(function () {
+      container.append(document.createElement("div"));
+      assert_equals(slot.assignedNodes({flatten: true}).length, 1, "slot should have 1 node");
+      assert_true(slot.matches(":has-slotted"), "slot element should match :has-slotted with 1 child node");
+      assert_equals(getComputedStyle(slot).color, "rgb(0, 255, 0)", "slot element should match :has-slotted with 1 child node");
+      assert_equals(host.shadowRoot.querySelectorAll(":has-slotted").length, 1, "slot element should match :has-slotted with 1 child node");
+    }, ":has-slotted must match/querySelector when an element is assigned" + (container == ancestor ? " (flattened)" : ""));
+
+    test(function () {
+      container.replaceChildren();
+      assert_equals(slot.assignedNodes({flatten: true}).length, 0, "slot should have 0 nodes");
+      assert_false(slot.matches(":has-slotted"), "slot element should not match :has-slotted after empty");
+      assert_equals(getComputedStyle(slot).color, "rgb(0, 0, 0)", "slot element should not match :has-slotted after empty");
+      assert_equals(host.shadowRoot.querySelectorAll(":has-slotted").length, 0, "slot element should not match :has-slotted after empty");
+    }, ":has-slotted does not when child nodes are replaced" + (container == ancestor ? " (flattened)" : ""));
+
+    test(function () {
+      container.append(document.createTextNode(""));
+      assert_equals(slot.assignedNodes({flatten: true}).length, 1, "slot should have 1 node");
+      assert_true(slot.matches(":has-slotted"), "slot element should match :has-slotted with 1 text node");
+      assert_equals(getComputedStyle(slot).color, "rgb(0, 255, 0)", "slot element should match :has-slotted with 1 text node");
+      assert_equals(host.shadowRoot.querySelectorAll(":has-slotted").length, 1, "slot element should match :has-slotted with 1 text node");
+    }, ":has-slotted must match/querySelector when a text node is assigned" + (container == ancestor ? " (flattened)" : ""));
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-transitions/after-change-style-inherited-try-fallback.html b/tests/wpt/tests/css/css-transitions/after-change-style-inherited-try-fallback.html
new file mode 100644
index 00000000000..9f359d57e5b
--- /dev/null
+++ b/tests/wpt/tests/css/css-transitions/after-change-style-inherited-try-fallback.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<title>CSS Transitions Test: trigger transitions on inherited after-change styles for anchored element using fallback</title>
+<link rel="help" href="https://drafts.csswg.org/css-transitions-1/#after-change-style">
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  body { margin: 0; }
+  #outer, #inner {
+    transition: 2s steps(2, start);
+    transition-property: color, width;
+  }
+  #outer {
+    anchor-name: --anchor;
+    width: 100px;
+    height: 100px;
+    background-color: orange;
+  }
+  #inner.wide {
+    width: 300px !important;
+  }
+  #inner {
+    width: 100px;
+    height: 100px;
+    position: absolute;
+    position-anchor: --anchor;
+    position-area: left center;
+    position-try-fallbacks: --fallback;
+    background-color: teal;
+  }
+  @position-try --fallback {
+    position-area: right center;
+    width: 200px;
+  }
+
+  #outer { color: red; }
+  #inner { color: black; }
+  #outer.green { color: lime; }
+  #outer.green #inner { color: unset; }
+</style>
+<div id="outer">
+  <div>
+    <div id="inner" class="wide"></div>
+  </div>
+</div>
+<script>
+  test(() => {
+    outer.offsetTop;
+    assert_equals(inner.offsetLeft, 100, "Initially using fallback position");
+    assert_equals(inner.offsetWidth, 300, "Initially using important #inner.wide");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 0, 0)", "#inner initially black");
+    outer.className = "green";
+    inner.className = "";
+    assert_equals(inner.offsetLeft, 100, "Still using fallback position");
+    assert_equals(inner.offsetWidth, 250, "Transitioning from !important width to fallback width");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 128, 0)", "#inner halfway between black and lime");
+  }, "Position fallback correctly applied to after-change style");
+</script>
diff --git a/tests/wpt/tests/css/css-transitions/after-change-style-inherited.html b/tests/wpt/tests/css/css-transitions/after-change-style-inherited.html
index 75570a90a19..f80a8a69b00 100644
--- a/tests/wpt/tests/css/css-transitions/after-change-style-inherited.html
+++ b/tests/wpt/tests/css/css-transitions/after-change-style-inherited.html
@@ -108,3 +108,71 @@
     assert_equals(getComputedStyle(a3).wordSpacing, "50px", ".a3 word-spacing transitioning between 0px and 100px");
   }, "Start inner transitions based on inherited after-change color and word-spacing from two different ancestors");
 </script>
+
+<style>
+  #t4 :is(.outer, .inner) { transition: color 1000s steps(2, start); }
+  #t4 .outer { color: red; }
+  #t4 .inner { color: black; }
+  #t4 .outer.green { color: lime; }
+  #t4 .outer.green .inner { color: unset; }
+  @starting-style {
+    #t4 .outer.green { color: pink; }
+  }
+</style>
+<div id="t4">
+  <div class="outer">
+    <div>
+      <div class="inner"></div>
+    </div>
+  </div>
+</div>
+<script>
+  test(() => {
+    const outer = document.querySelector("#t4 .outer");
+    const inner = document.querySelector("#t4 .inner");
+    outer.offsetTop;
+    assert_equals(getComputedStyle(outer).color, "rgb(255, 0, 0)",
+                  ".outer initially red");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 0, 0)",
+                  ".inner initially black");
+    outer.classList.add("green");
+    assert_equals(getComputedStyle(outer).color, "rgb(128, 128, 0)",
+                  ".outer halfway between red and lime");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 128, 0)",
+                  ".inner halfway between black and lime");
+  }, "@starting-style rules should not apply to after-change style");
+</script>
+
+<style>
+  #t5 :is(.outer, .inner) { transition: color 1000s steps(2, start); }
+  #t5 .outer { color: red; }
+  #t5 .inner { color: black; }
+  #t5 .outer.green { color: lime; }
+  #t5 .container { container-type: inline-size; }
+  @container (width < 100000px) {
+    #t5 .outer.green .inner { color: unset; }
+  }
+</style>
+<div id="t5">
+  <div class="outer">
+    <div class="container">
+      <div class="inner"></div>
+    </div>
+  </div>
+</div>
+<script>
+  test(() => {
+    const outer = document.querySelector("#t5 .outer");
+    const inner = document.querySelector("#t5 .inner");
+    outer.offsetTop;
+    assert_equals(getComputedStyle(outer).color, "rgb(255, 0, 0)",
+                  ".outer initially red");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 0, 0)",
+                  ".inner initially black");
+    outer.classList.add("green");
+    assert_equals(getComputedStyle(outer).color, "rgb(128, 128, 0)",
+                  ".outer halfway between red and lime");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 128, 0)",
+                  ".inner halfway between black and lime");
+  }, "@container rules apply to after-change style");
+</script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-click-002.html b/tests/wpt/tests/css/css-ui/interactivity-inert-click-002.html
new file mode 100644
index 00000000000..80772f0552b
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-click-002.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: inert attribute does not imply host language inertness</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  #inert {
+    interactivity: auto;
+    width: 100px;
+    height: 100px;
+    background: lime;
+  }
+</style>
+<div inert id="target"></div>
+<script>
+  let clicked = false;
+  target.addEventListener('click', () => clicked = true);
+
+  promise_test(async () => {
+    await test_driver.click(target);
+    assert_true(clicked);
+  }, "Click event should work when interactivity:auto overrides inert attribute UA style");
+</script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-click.tentative.html b/tests/wpt/tests/css/css-ui/interactivity-inert-click.html
similarity index 91%
rename from tests/wpt/tests/css/css-ui/interactivity-inert-click.tentative.html
rename to tests/wpt/tests/css/css-ui/interactivity-inert-click.html
index 0a724a929f7..c1b882c7023 100644
--- a/tests/wpt/tests/css/css-ui/interactivity-inert-click.tentative.html
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-click.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Basic User Interface Test: interactivity:inert blocks click events</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10711#issuecomment-2379913684">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-focus.tentative.html b/tests/wpt/tests/css/css-ui/interactivity-inert-focus.html
similarity index 89%
rename from tests/wpt/tests/css/css-ui/interactivity-inert-focus.tentative.html
rename to tests/wpt/tests/css/css-ui/interactivity-inert-focus.html
index 79b6f367d80..af7cf7469ea 100644
--- a/tests/wpt/tests/css/css-ui/interactivity-inert-focus.tentative.html
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-focus.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Basic User Interface Test: interactivity:inert blocks focus()</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10711#issuecomment-2379913684">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-html-attribute-ua.html b/tests/wpt/tests/css/css-ui/interactivity-inert-html-attribute-ua.html
new file mode 100644
index 00000000000..1f118d56f79
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-html-attribute-ua.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: UA style interactivity for [inert]</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .auto { interactivity: auto; }
+</style>
+<div id="t1" inert></div>
+<div inert>
+  <div id="t2"></div>
+  <div id="t3" class="auto"></div>
+</div>
+<div id="t4" inert class="auto"></div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(t1).interactivity, "inert");
+  }, "[inert] { interactivity: inert }");
+
+  test(() => {
+    assert_equals(getComputedStyle(t2).interactivity, "inert");
+  }, "[inert] { interactivity: inert } inherited");
+
+  test(() => {
+    assert_equals(getComputedStyle(t3).interactivity, "auto");
+  }, "Author interactivity:auto overrides inherited UA [inert] { interactivity: inert }");
+
+  test(() => {
+    assert_equals(getComputedStyle(t4).interactivity, "auto");
+  }, "Author interactivity:auto overrides UA [inert] { interactivity: inert }");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-modal-dialog-ua.html b/tests/wpt/tests/css/css-ui/interactivity-inert-modal-dialog-ua.html
new file mode 100644
index 00000000000..e8094f88a69
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-modal-dialog-ua.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: UA style interactivity for dialog:modal</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<dialog id="t1"></dialog>
+<dialog id="t2" inert></dialog>
+<div inert>
+  <dialog id="t3"></dialog>
+</div>
+<dialog id="d4">
+  <div id="t4" inert>
+</dialog>
+<dialog id="t5" style="interactivity:inert"></dialog>
+<script>
+  test((t) => {
+    t.add_cleanup(() => { t1.close(); });
+    assert_equals(getComputedStyle(t1).interactivity, "auto", "before showModal");
+    t1.showModal();
+    assert_equals(getComputedStyle(t1).interactivity, "auto", "after showModal");
+  }, "UA dialog:modal interactivity rule");
+
+  test((t) => {
+    t.add_cleanup(() => { t2.close(); });
+    assert_equals(getComputedStyle(t2).interactivity, "inert", "before showModal");
+    t2.showModal();
+    assert_equals(getComputedStyle(t2).interactivity, "auto", "after showModal");
+  }, "UA dialog:modal inert rule wins over [inert] rule");
+
+  test((t) => {
+    t.add_cleanup(() => { t3.close(); });
+    assert_equals(getComputedStyle(t3).interactivity, "inert", "before showModal");
+    t3.showModal();
+    assert_equals(getComputedStyle(t3).interactivity, "auto", "after showModal");
+  }, "UA dialog:modal rule overriding inherited [inert] 'interactivity:inert' rule");
+
+  test((t) => {
+    t.add_cleanup(() => { d4.close(); });
+    assert_equals(getComputedStyle(t4).interactivity, "inert", "before showModal");
+    d4.showModal();
+    assert_equals(getComputedStyle(t4).interactivity, "inert", "after showModal");
+  }, "UA [inert] rule overriding inherited dialog:modal 'interactivity:auto' rule");
+
+  test((t) => {
+    t.add_cleanup(() => { t5.close(); });
+    assert_equals(getComputedStyle(t5).interactivity, "inert", "before showModal");
+    t5.showModal();
+    assert_equals(getComputedStyle(t5).interactivity, "inert", "after showModal");
+  }, "Author 'interactivity:inert' overrides UA dialog:modal 'interactivity:auto' rule");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/parsing/interactivity-computed.tentative.html b/tests/wpt/tests/css/css-ui/parsing/interactivity-computed.html
similarity index 87%
rename from tests/wpt/tests/css/css-ui/parsing/interactivity-computed.tentative.html
rename to tests/wpt/tests/css/css-ui/parsing/interactivity-computed.html
index 7ead06c0045..3806b943d7e 100644
--- a/tests/wpt/tests/css/css-ui/parsing/interactivity-computed.tentative.html
+++ b/tests/wpt/tests/css/css-ui/parsing/interactivity-computed.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Basic User Interface Test: interactivity - computed values</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10711#issuecomment-2379913684">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-ui/parsing/interactivity.tentative.html b/tests/wpt/tests/css/css-ui/parsing/interactivity.html
similarity index 87%
rename from tests/wpt/tests/css/css-ui/parsing/interactivity.tentative.html
rename to tests/wpt/tests/css/css-ui/parsing/interactivity.html
index 219db2178de..99176ef9b9a 100644
--- a/tests/wpt/tests/css/css-ui/parsing/interactivity.tentative.html
+++ b/tests/wpt/tests/css/css-ui/parsing/interactivity.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Basic User Interface Test: parsing interactivity</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10711#issuecomment-2379913684">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations-rerun.html b/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations-rerun.html
new file mode 100644
index 00000000000..a7c3247479d
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations-rerun.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>CSS Animations on view transition pseudos run more than once</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations-1/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../css-animations/support/testcommon.js"></script>
+<style>
+:root::view-transition,
+:root::view-transition-group(root),
+:root::view-transition-image-pair(root),
+:root::view-transition-old(root),
+:root::view-transition-new(root) {
+    animation: view-transition-animation 1ms;
+}
+@keyframes view-transition-animation {
+    to { opacity: 0 }
+}
+</style>
+<div id="log"></div>
+<script>
+"use strict";
+promise_test(async t => {
+    let viewTransition = document.startViewTransition(() => {});
+    await viewTransition.ready;
+    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 5, "Starting a view transition should start related animations.");
+
+    await viewTransition.finished;
+    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 0, "Stopping a view transition should stop related animations.");
+
+    await waitForNextFrame();
+    viewTransition = document.startViewTransition(() => {});
+    await viewTransition.ready;
+    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 5, "Re-starting a view-transition should restart related animations.");
+}, "CSS Animations on view transitions are canceled and restarted when the view transition starts and ends.");
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations.html b/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations.html
index a7c3247479d..b5cde702733 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-element-animations.html
@@ -1,36 +1,138 @@
 <!doctype html>
 <meta charset=utf-8>
-<title>CSS Animations on view transition pseudos run more than once</title>
+<title>CSS Animations and Web Animations on view transition pseudos</title>
 <link rel="help" href="https://drafts.csswg.org/css-animations-1/">
+<link rel="help" href="https://drafts.csswg.org/web-animations-1/#dom-animatable-animate">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../css-animations/support/testcommon.js"></script>
 <style>
-:root::view-transition,
-:root::view-transition-group(root),
-:root::view-transition-image-pair(root),
-:root::view-transition-old(root),
-:root::view-transition-new(root) {
-    animation: view-transition-animation 1ms;
+/* Override UA stylesheet to avoid any impact on our tests */
+:root {
+  view-transition-name: none;
 }
-@keyframes view-transition-animation {
-    to { opacity: 0 }
+:root::view-transition,
+:root::view-transition-group(*),
+:root::view-transition-image-pair(*),
+:root::view-transition-old(*),
+:root::view-transition-new(*) {
+  animation: unset;
+}
+
+@keyframes css-anim {
+  from { margin-left: 100px; }
+  to { margin-left: 100px; }
 }
 </style>
 <div id="log"></div>
 <script>
 "use strict";
+
 promise_test(async t => {
-    let viewTransition = document.startViewTransition(() => {});
-    await viewTransition.ready;
-    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 5, "Starting a view transition should start related animations.");
+  document.documentElement.style.viewTransitionName = "test";
+  const ruleText =
+    ":root::view-transition, :root::view-transition-group(test) {" +
+    "  animation: css-anim 10s;"
+    "}";
+  const index = document.styleSheets[0].cssRules.length;
+  document.styleSheets[0].insertRule(ruleText, index);
 
-    await viewTransition.finished;
-    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 0, "Stopping a view transition should stop related animations.");
+  let viewTransition = document.startViewTransition(() => {});
+  await viewTransition.ready;
+
+  let anims = document.documentElement.getAnimations({ subtree: true });
+  assert_equals(anims.length, 2, "Has 2 CSS Animations.");
+  let style = getComputedStyle(document.documentElement,
+    "::view-transition-group(test)");
+  assert_equals(style.marginLeft, "100px");
+
+  viewTransition.skipTransition();
+  document.styleSheets[0].deleteRule(index);
+  document.documentElement.style.viewTransitionName = "none";
+}, "The specified CSS Animations work on view transition pseudos.");
+
+promise_test(async t => {
+  document.documentElement.style.viewTransitionName = "test";
+  const ruleText =
+    ":root::view-transition, :root::view-transition-group(test) {" +
+    "animation: css-anim 10s;"
+    "}";
+  const index = document.styleSheets[0].cssRules.length;
+  document.styleSheets[0].insertRule(ruleText, index);
+
+  let viewTransition = document.startViewTransition(() => {});
+  await viewTransition.ready;
+
+  let anim1 = document.documentElement.animate(
+    { opacity: [0.5, 0.5] },
+    { duration: 10000, pseudoElement: '::view-transition-group(test)' }
+  );
+  await anim1.ready;
+
+  let kf = new KeyframeEffect(
+    document.documentElement,
+    { translate: ["200px", "200px"] },
+    { duration: 10000, pseudoElement: '::view-transition-old(test)' }
+  );
+  let anim2 = new Animation(kf, document.timeline);
+  anim2.play();
+  await anim2.ready;
+
+  let anims = document.documentElement.getAnimations({ subtree: true });
+  assert_equals(anims.length, 4,
+    "Has 2 CSS Animations and 2 script animations.");
+
+  let style = getComputedStyle(document.documentElement,
+    "::view-transition-group(test)");
+  assert_equals(style.marginLeft, "100px");
+  assert_equals(style.opacity, "0.5");
+  assert_equals(
+    getComputedStyle(document.documentElement,
+      "::view-transition-old(test)").translate,
+    "200px"
+  );
+
+  anim1.finish();
+  anim2.finish();
+  viewTransition.skipTransition();
+  document.styleSheets[0].deleteRule(index);
+  document.documentElement.style.viewTransitionName = "none";
+}, "The specified CSS Animations and script animations work on view "+
+   "transition pseudos");
+
+promise_test(async t => {
+  document.documentElement.style.viewTransitionName = "test";
+  let ruleText =
+    ":root::view-transition, " +
+    ":root::view-transition-group(test), " +
+    ":root::view-transition-image-pair(test) {" +
+    "  animation: css-anim 10s;"
+    "}";
+  const index = document.styleSheets[0].cssRules.length;
+  document.styleSheets[0].insertRule(ruleText, index);
+
+  let viewTransition = document.startViewTransition(() => {});
+  await viewTransition.ready;
+
+  let anims = document.documentElement.getAnimations({ subtree: true });
+  assert_equals(anims.length, 3, "Has 3 CSS Animations.");
+
+  // Make the pseudo-element display:none.
+  ruleText = ":root::view-transition-image-pair(test) { display: none; }";
+  document.styleSheets[0].insertRule(ruleText, index + 1);
+  anims = document.documentElement.getAnimations({ subtree: true });
+  assert_equals(anims.length, 2, "One CSS Animation was removed.");
+
+  // Destroy all frames.
+  document.documentElement.style.display = "none";
+  anims = document.documentElement.getAnimations({ subtree: true });
+  assert_equals(anims.length, 0, "All CSS Animation were removed.");
+
+  viewTransition.skipTransition();
+  document.styleSheets[0].deleteRule(index + 1);
+  document.styleSheets[0].deleteRule(index);
+  document.documentElement.style.viewTransitionName = "none";
+  document.documentElement.style.display = "inline";
+}, "The specified CSS Animations are removed if setting display:none.");
 
-    await waitForNextFrame();
-    viewTransition = document.startViewTransition(() => {});
-    await viewTransition.ready;
-    assert_equals(document.documentElement.getAnimations({ subtree: true }).length, 5, "Re-starting a view-transition should restart related animations.");
-}, "CSS Animations on view transitions are canceled and restarted when the view transition starts and ends.");
 </script>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/input-range-block-size.html b/tests/wpt/tests/css/css-writing-modes/forms/input-range-block-size.html
new file mode 100644
index 00000000000..142a946cf56
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/input-range-block-size.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Setting block-size/min-block-size/max-block-size on input[type=range] should be honored.</title>
+    <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+    <link rel="help" href="https://drafts.csswg.org/css-writing-modes/">
+</head>
+<body>
+    <input type="range" id="input">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+        const writingModes = [
+            "horizontal-tb",
+            "vertical-lr",
+            "vertical-rl",
+            "sideways-lr",
+            "sideways-rl",
+        ];
+        for (let writingMode of writingModes) {
+            test(t => {
+                t.add_cleanup(() => {
+                    input.style = "";
+                });
+                input.style.writingMode = writingMode;
+                input.style.blockSize = "10px";
+                const blockSize = () => {
+                    return writingMode == "horizontal-tb" ? getComputedStyle(input).height : getComputedStyle(input).width;
+                };
+                assert_equals(blockSize(), "10px", "block-size applies");
+                input.style.maxBlockSize = "8px";
+                assert_equals(blockSize(), "8px", "max-block-size applies");
+                input.style.minBlockSize = "15px";
+                assert_equals(blockSize(), "15px", "min-block-size applies");
+            }, `writing-mode: ${writingMode}`);
+        }
+    </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/input-range-inline-size.html b/tests/wpt/tests/css/css-writing-modes/forms/input-range-inline-size.html
new file mode 100644
index 00000000000..57068039383
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/input-range-inline-size.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Setting inline-size/min-inline-size/max-inline-size on input[type=range] should be honored.</title>
+    <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+    <link rel="help" href="https://drafts.csswg.org/css-writing-modes/">
+</head>
+<body>
+    <input type="range" id="input">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+        const writingModes = [
+            "horizontal-tb",
+            "vertical-lr",
+            "vertical-rl",
+            "sideways-lr",
+            "sideways-rl",
+        ];
+        for (let writingMode of writingModes) {
+            test(t => {
+                t.add_cleanup(() => {
+                    input.style = "";
+                });
+                input.style.writingMode = writingMode;
+                input.style.inlineSize = "10px";
+                const inlineSize = () => {
+                    return writingMode == "horizontal-tb" ? getComputedStyle(input).width : getComputedStyle(input).height;
+                };
+                assert_equals(inlineSize(), "10px", "inline-size applies");
+                input.style.maxInlineSize = "8px";
+                assert_equals(inlineSize(), "8px", "max-inline-size applies");
+                input.style.minInlineSize = "15px";
+                assert_equals(inlineSize(), "15px", "min-inline-size applies");
+            }, `writing-mode: ${writingMode}`);
+        }
+    </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size-ref.html b/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size-ref.html
new file mode 100644
index 00000000000..f5900394ca6
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<body>
+    <style>
+        div {
+            display: flex;
+        }
+        span {
+            display: inline-block;
+            border-inline-start: 1px solid green;
+        }
+        input[type=range] {
+            visibility: hidden;
+            margin: 0;
+        }
+    </style>
+
+    <p>Test passes if you see no red:</p>
+
+    <div><span></span><input type="range"></div>
+    <div style="writing-mode: vertical-lr;"><span></span><span></span><span></span><span></span><input type="range"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size.html b/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size.html
new file mode 100644
index 00000000000..2779a2e73ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/input-range-zero-inline-size.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Setting inline-size to zero on input[type=range] should be honored.</title>
+    <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+    <link rel="help" href="https://drafts.csswg.org/css-writing-modes/">
+    <link rel="match" href="input-range-zero-inline-size-ref.html">
+</head>
+<body>
+    <style>
+        div {
+            display: flex;
+            background-color: red;
+            border-inline-start: 1px solid green;
+        }
+        .horizontal {
+            background-color: transparent;
+        }
+        input[type=range] {
+            visibility: hidden;
+            inline-size: 0;
+            margin: 0;
+        }
+    </style>
+
+    <p>Test passes if you see no red:</p>
+
+    <div class="horizontal"><span style="display: inline-flex; background-color: red;"><input type="range"></span></div>
+    <div style="writing-mode: vertical-lr;"><input type="range"></div>
+    <div style="writing-mode: vertical-rl;"><input type="range"></div>
+    <div style="writing-mode: sideways-lr;"><input type="range"></div>
+    <div style="writing-mode: sideways-rl;"><input type="range"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-negative-margins.html b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-negative-margins.html
new file mode 100644
index 00000000000..26eb41466e4
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-negative-margins.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollwidth">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollheight">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936156">
+<title>scroll{Width,Height} shouldn't account for collapsed margins, in order not to report unnecessary overflow</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target {
+    width: 20px;
+    flex-direction: column;
+  }
+  #target > div {
+    background-color: green;
+    margin: -5px -7px;
+  }
+
+  #target > div > div {
+    height: 20px;
+    width: 20px;
+  }
+</style>
+<div id="target">
+  <div><div></div></div>
+  <div><div></div></div>
+  <div><div></div></div>
+  <div><div></div></div>
+</div>
+<script>
+let target = document.getElementById("target");
+// "clip" is not really scrollable, but should match as well.
+for (let overflow of ["visible", "hidden", "auto", "scroll", "clip"]) {
+  // First one creates no overflow, last one does create overflow.
+  // TODO(emilio): Figure out why the overflow padding and some of the grid cases
+  // are not interoperable across platforms / engines. Maybe scrollbar-width dependent?
+  for (let padding of ["10px 20px" /* , "2px" */]) {
+    for (let border of ["0", "3px solid"]) {
+      for (let display of ["flex", "block", "flow-root", "inline-block", "inline-flex", /*  "grid", "inline-grid" */]) {
+        test(function() {
+          let [expectedOverflowY, expectedOverflowX] = padding == "10px 20px" ? [0, 0] : [3, 5];
+          target.style.overflow = overflow;
+          target.style.display = display;
+          target.style.border = border;
+          target.style.padding = padding;
+          let sh = target.scrollHeight;
+          let sw = target.scrollWidth;
+          let ch = target.clientHeight;
+          let cw = target.clientWidth;
+          assert_equals(sh, ch + expectedOverflowY, `scrollHeight expecting ${expectedOverflowY}px of overflow`);
+          assert_equals(sw, cw + expectedOverflowX, `scrollWidth expecting ${expectedOverflowX}px of overflow`);
+        }, `scroll{Width,Height} with negative margins with overflow: ${overflow}, padding: ${padding}, border: ${border}, display: ${display}`);
+      }
+    }
+  }
+}
+</script>
diff --git a/tests/wpt/tests/digital-credentials/META.yml b/tests/wpt/tests/digital-credentials/META.yml
index fc8f6a62cda..7273f019d78 100644
--- a/tests/wpt/tests/digital-credentials/META.yml
+++ b/tests/wpt/tests/digital-credentials/META.yml
@@ -3,3 +3,4 @@ suggested_reviewers:
   - marcoscaceres
   - samuelgoto
   - tplooker
+  - pkotwicz
diff --git a/tests/wpt/tests/dom/nodes/MutationObserver-textContent.html b/tests/wpt/tests/dom/nodes/MutationObserver-textContent.html
new file mode 100644
index 00000000000..404cc259340
--- /dev/null
+++ b/tests/wpt/tests/dom/nodes/MutationObserver-textContent.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<meta charset=utf-8>
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+
+async function test() {
+
+  let testElement1 = async_test("Setting Element.textContent");
+  let el = document.createElement("div");
+  let m = new MutationObserver((records) => testElement1.step(()=> {
+    assert_equals(records.length, 1, "Should have one record");
+    assert_equals(records[0].addedNodes[0].nodeType, Node.TEXT_NODE, "Should have gotten a text node as a child.");
+    assert_equals(records[0].addedNodes[0].data, "foo");
+    m.disconnect();
+    testElement1.done();
+  }));
+  m.observe(el, { childList: true });
+  el.textContent = "foo";
+
+  await Promise.resolve(); // Run microtasks
+
+  let testElement2 = async_test("Setting Element.textContent to the same value");
+  m = new MutationObserver((records) => testElement2.step(()=> {
+    assert_equals(records.length, 1, "Should have one record");
+    assert_equals(records[0].removedNodes[0].nodeType, Node.TEXT_NODE, "Should have removed a text node.");
+    assert_equals(records[0].removedNodes[0].data, "foo");
+    assert_equals(records[0].addedNodes[0].nodeType, Node.TEXT_NODE, "Should have gotten a text node as a child.");
+    assert_equals(records[0].addedNodes[0].data, "foo");
+    m.disconnect();
+    testElement2.done();
+  }));
+  m.observe(el, { childList: true });
+  testElement2.step(() => { assert_equals(el.textContent, "foo"); });
+  el.textContent = "foo";
+
+  await Promise.resolve(); // Run microtasks
+
+  let testElement3 = async_test("Setting Element.textContent to a different value");
+  m = new MutationObserver((records) => testElement3.step(()=> {
+    assert_equals(records.length, 1, "Should have one record");
+    assert_equals(records[0].removedNodes[0].nodeType, Node.TEXT_NODE, "Should have removed a text node.");
+    assert_equals(records[0].removedNodes[0].data, "foo");
+    assert_equals(records[0].addedNodes[0].nodeType, Node.TEXT_NODE, "Should have gotten a text node as a child.");
+    assert_equals(records[0].addedNodes[0].data, "bar");
+    m.disconnect();
+    testElement3.done();
+  }));
+  m.observe(el, { childList: true });
+  testElement3.step(() => { assert_equals(el.textContent, "foo"); });
+  el.textContent = "bar";
+
+  await Promise.resolve(); // Run microtasks
+
+  let testElement4 = async_test("Setting Element.textContent to the same value when the old node is a CDATASection");
+  let xml = new DOMParser().parseFromString("<root></root>", "text/xml");
+  el = xml.createElement("somelement");
+  el.appendChild(xml.createCDATASection("foo"));
+  m = new MutationObserver((records) => testElement4.step(()=> {
+    assert_equals(records.length, 1, "Should have one record");
+    assert_equals(records[0].removedNodes[0].nodeType, Node.CDATA_SECTION_NODE, "Should have removed a cdata node.");
+    assert_equals(records[0].removedNodes[0].data, "foo");
+    assert_equals(records[0].addedNodes[0].nodeType, Node.TEXT_NODE, "Should have gotten a text node as a child.");
+    assert_equals(records[0].addedNodes[0].data, "foo");
+    m.disconnect();
+    testElement4.done();
+  }));
+  m.observe(el, { childList: true });
+  testElement4.step(() => { assert_equals(el.textContent, "foo"); });
+  el.textContent = "foo";
+
+}
+test();
+
+</script>
diff --git a/tests/wpt/tests/dom/observable/tentative/idlharness.html b/tests/wpt/tests/dom/observable/tentative/idlharness.html
index 9a3842c4e67..ea8743528f6 100644
--- a/tests/wpt/tests/dom/observable/tentative/idlharness.html
+++ b/tests/wpt/tests/dom/observable/tentative/idlharness.html
@@ -1,7 +1,7 @@
 <!doctype html>
   <meta charset="utf-8" />
   <meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-  <link rel="help" href="https://open-ui.org/components/invokers.explainer/" />
+  <link rel="help" href="https://github.com/WICG/observable" />
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/WebIDLParser.js"></script>
diff --git a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
index d90104ffcd6..f305d2de670 100644
--- a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
+++ b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
@@ -133,8 +133,14 @@ test(() => {
 
 // This tests that once `Observable.from()` detects a non-null and non-undefined
 // `[Symbol.iterator]` property, we've committed to converting as an iterable.
-// If the value of that property is not callable, we don't silently move on to
-// the next conversion type — we throw a TypeError;
+// If the value of that property is then not callable, we don't silently move on
+// to the next conversion type — we throw a TypeError.
+//
+// That's because that's what TC39's `GetMethod()` [1] calls for, which is what
+// `Observable.from()` first uses in the iterable conversion branch [2].
+//
+// [1]: https://tc39.es/ecma262/multipage/abstract-operations.html#sec-getmethod
+// [2]: http://wicg.github.io/observable/#from-iterable-conversion
 test(() => {
   let results = [];
   const iterable = {
@@ -149,11 +155,84 @@ test(() => {
   }
 
   assert_true(errorThrown instanceof TypeError);
-  assert_equals(errorThrown.message,
-      "Failed to execute 'from' on 'Observable': @@iterator must be a " +
-      "callable.");
 }, "from(): [Symbol.iterator] not callable");
 
+test(() => {
+  let results = [];
+  const iterable = {
+    calledOnce: false,
+    get [Symbol.iterator]() {
+      if (this.calledOnce) {
+        // Return a non-callable primitive the second time `@@iterator` is
+        // called.
+        return 10;
+      }
+
+      this.calledOnce = true;
+      return this.validImplementation;
+    },
+    validImplementation: () => {
+      return {
+        next() { return {done: true}; }
+      }
+    }
+  };
+
+  let errorThrown = null;
+
+  const observable = Observable.from(iterable);
+  observable.subscribe({
+    next: v => results.push("should not be called"),
+    error: e => {
+      errorThrown = e;
+      results.push(e);
+    },
+  });
+
+  assert_array_equals(results, [errorThrown],
+      "An error was plumbed through the Observable");
+  assert_true(errorThrown instanceof TypeError);
+}, "from(): [Symbol.iterator] not callable AFTER SUBSCRIBE throws");
+
+test(() => {
+  let results = [];
+  const iterable = {
+    calledOnce: false,
+    validImplementation: () => {
+      return {
+        next() { return {done: true}; }
+      }
+    },
+    get [Symbol.iterator]() {
+      if (this.calledOnce) {
+        // Return null the second time `@@iterator` is called.
+        return null;
+      }
+
+      this.calledOnce = true;
+      return this.validImplementation;
+    }
+  };
+
+  let errorThrown = null;
+
+  const observable = Observable.from(iterable);
+  observable.subscribe({
+    next: v => results.push("should not be called"),
+    error: e => {
+      errorThrown = e;
+      results.push(e);
+    },
+  });
+
+  assert_array_equals(results, [errorThrown],
+      "An error was plumbed through the Observable");
+  assert_true(errorThrown instanceof TypeError);
+  assert_equals(errorThrown.message,
+      "Failed to execute 'subscribe' on 'Observable': @@iterator must not be " +
+      "undefined or null");
+}, "from(): [Symbol.iterator] returns null AFTER SUBSCRIBE throws");
+
 test(() => {
   let results = [];
   const customError = new Error("@@iterator override error");
@@ -520,24 +599,6 @@ test(() => {
 }, "from(): Rethrows the error when Converting an object whose @@iterator " +
    "method *getter* throws an error");
 
-test(() => {
-  const obj = {};
-  // Non-undefined & non-null values of the `@@iterator` property are not
-  // allowed. Specifically they fail the the `IsCallable()` test, which fails
-  // Observable conversion.
-  obj[Symbol.iterator] = 10;
-
-  try {
-    Observable.from(obj);
-    assert_unreached("from() conversion throws");
-  } catch(e) {
-    assert_true(e instanceof TypeError);
-    assert_equals(e.message,
-        "Failed to execute 'from' on 'Observable': @@iterator must be a callable.");
-  }
-}, "from(): Throws 'callable' error when @@iterator property is a " +
-   "non-callable primitive");
-
 // This test exercises the line of spec prose that says:
 //
 // "If |asyncIteratorMethodRecord|'s [[Value]] is undefined or null, then jump
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax-innerhtml.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax-innerhtml.tentative.html
index 932c0a392a3..5eb89b6f2e3 100644
--- a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax-innerhtml.tentative.html
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax-innerhtml.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>DOM Parts: Basic object structure, {{}} declarative API</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html
index 70fc471bc61..a4e911391b1 100644
--- a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>DOM Parts: Basic object structure, {{}} declarative API</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
index f2199362c4d..dffc1fcc2c5 100644
--- a/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>DOM Parts: Basic object structure, imperative API</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-002-crash.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-002-crash.tentative.html
index bd2a0b588ba..c352c503495 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-parseparts-002-crash.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-002-crash.tentative.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 
 <table>
   <template>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-crash.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-crash.tentative.html
index e0f7782e23a..ad6649d8540 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-parseparts-crash.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-crash.tentative.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 
 <template parseparts></template>
 
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html
index 542c7b2881a..57a7c600646 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <title>DOM Parts: parseparts on body</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html
index e65c0d728fe..e170fc026a2 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html
@@ -3,7 +3,7 @@
 <head parseparts>
   <title>{{#}}{{/}}DOM Parts: parseparts on head</title>
 
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html
index f3ba3eaf6bf..5cb9a3c0fec 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html parseparts>
 <title>DOM Parts: parseparts on root</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-valid-node-types.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-valid-node-types.tentative.html
index f9ed167e605..bb783797f60 100644
--- a/tests/wpt/tests/dom/parts/dom-parts-valid-node-types.tentative.html
+++ b/tests/wpt/tests/dom/parts/dom-parts-valid-node-types.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>DOM Parts: Valid node types for constructors</title>
-<meta name="author" href="mailto:masonf@chromium.org">
+<link rel=author href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/domparts-utils.js"></script>
diff --git a/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js b/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js
index fac31cbb3e5..0c6d3c6c64d 100644
--- a/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js
+++ b/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js
@@ -400,6 +400,11 @@ function runTest(config) {
         }
     ];
 
+    function assertIsObjectOrFunction(value) {
+        const type = typeof value;
+        assert_true(type === 'object' || type === 'function');
+    }
+
     // This function checks that calling |testCase.func| creates a
     // MediaKeySession object with some default values. It also
     // allows for an NotSupportedError to be generated and treated as a
@@ -418,8 +423,14 @@ function runTest(config) {
         assert_equals(typeof mediaKeySession.expiration, 'number');
         assert_equals(typeof mediaKeySession.closed, 'object');
         assert_equals(typeof mediaKeySession.keyStatuses, 'object');
-        assert_equals(typeof mediaKeySession.onkeystatuseschange, 'object');
-        assert_equals(typeof mediaKeySession.onmessage, 'object');
+
+       // When unset, the onevent handlers are null, which is equal to an
+       // object. When set however, the onevent handlers should be
+       // compared to functions. This makeshift function should cover both
+       // cases.
+        assertIsObjectOrFunction(mediaKeySession.onkeystatuseschange);
+        assertIsObjectOrFunction(mediaKeySession.onmessage);
+
         assert_equals(typeof mediaKeySession.generateRequest, 'function');
         assert_equals(typeof mediaKeySession.load, 'function');
         assert_equals(typeof mediaKeySession.update, 'function');
diff --git a/tests/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
index 4f261086360..b30156b41b2 100644
--- a/tests/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
@@ -15,16 +15,6 @@ async function loadElement(el) {
   await loaded;
 }
 
-// `host` may be cross-origin
-async function loadFetchLaterIframe(host, targetUrl) {
-  const url = `${host}/fetch/fetch-later/resources/fetch-later.html?url=${
-      encodeURIComponent(targetUrl)}`;
-  const iframe = document.createElement('iframe');
-  iframe.src = url;
-  await loadElement(iframe);
-  return iframe;
-}
-
 parallelPromiseTest(async t => {
   const uuid = token();
   const url = generateSetBeaconURL(uuid);
@@ -39,17 +29,3 @@ parallelPromiseTest(async t => {
   // The iframe should have sent the request.
   await expectBeacon(uuid, {count: 1});
 }, 'A blank iframe can trigger fetchLater.');
-
-parallelPromiseTest(async t => {
-  const uuid = token();
-  const url = generateSetBeaconURL(uuid);
-
-  // Loads a same-origin iframe that fires a fetchLater request.
-  await loadFetchLaterIframe(HTTPS_ORIGIN, url);
-
-  // The iframe should have sent the request.
-  await expectBeacon(uuid, {count: 1});
-}, 'A same-origin iframe can trigger fetchLater.');
-
-// The test to load a cross-origin iframe that fires a fetchLater request is in
-// /fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js
diff --git a/tests/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
index 27922f46266..5a64eb596e1 100644
--- a/tests/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
@@ -11,11 +11,32 @@ const {
 
 function fetchLaterPopupUrl(host, targetUrl) {
   return `${host}/fetch/fetch-later/resources/fetch-later.html?url=${
-      encodeURIComponent(targetUrl)}`;
+      encodeURIComponent(targetUrl)}&activateAfter=0`;
+}
+
+async function receiveMessageFromPopup(url) {
+  const expect =
+      new FetchLaterIframeExpectation(FetchLaterExpectationType.DONE);
+  const messageType = await new Promise((resolve, reject) => {
+    window.addEventListener('message', function handler(e) {
+      try {
+        if (expect.run(e, url)) {
+          window.removeEventListener('message', handler);
+          resolve(e.data.type);
+        }
+      } catch (err) {
+        reject(err);
+      }
+    });
+  });
+
+  assert_equals(messageType, FetchLaterIframeMessageType.DONE);
 }
 
 for (const target of ['', '_blank']) {
-  for (const features in ['', 'popup', 'popup,noopener']) {
+  // NOTE: noopener popup window cannot communicate back. It will be too
+  // unreliable to only use `expectBeacon()` to test such window.
+  for (const features of ['', 'popup']) {
     parallelPromiseTest(
         async t => {
           const uuid = token();
@@ -43,7 +64,7 @@ for (const target of ['', '_blank']) {
 
           // Opens a same-origin popup that fires a fetchLater request.
           const w = window.open(popupUrl, target, features);
-          await new Promise(resolve => w.addEventListener('load', resolve));
+          await receiveMessageFromPopup(popupUrl);
 
           // The popup should have sent the request.
           await expectBeacon(uuid, {count: 1});
@@ -60,10 +81,7 @@ for (const target of ['', '_blank']) {
 
           // Opens a cross-origin popup that fires a fetchLater request.
           const w = window.open(popupUrl, target, features);
-          // As events from cross-origin window is not accessible, waiting for
-          // its message instead.
-          await new Promise(
-              resolve => window.addEventListener('message', resolve));
+          await receiveMessageFromPopup(popupUrl);
 
           // The popup should have sent the request.
           await expectBeacon(uuid, {count: 1});
diff --git a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js
index 707d6d1fa54..13870bc94b0 100644
--- a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-allowed-by-permissions-policy-attribute-redirect.tentative.https.window.js
@@ -13,6 +13,7 @@ const {
 } = get_host_info();
 
 const baseUrl = '/permissions-policy/resources/redirect-on-load.html#';
+// https://whatpr.org/fetch/1647.html#dom-permissionspolicy-deferred-fetch-minimal
 const description = 'Permissions policy allow="deferred-fetch"';
 
 async_test(t => {
@@ -20,12 +21,14 @@ async_test(t => {
       'fetchLater()', t,
       getDeferredFetchPolicyInIframeHelperUrl(`${baseUrl}${HTTPS_ORIGIN}`),
       expect_feature_available_default, /*feature_name=*/ 'deferred-fetch');
-}, `${description} allows same-origin navigation in an iframe.`);
+}, `${description} allows fetchLater() from a redirected same-origin iframe.`);
 
+// By default, "deferred-fetch" is off for cross-origin iframe.
+// It requires a Permissions-Policy header in addition to the allow attribute.
 async_test(t => {
   test_feature_availability(
       'fetchLater()', t,
       getDeferredFetchPolicyInIframeHelperUrl(
           `${baseUrl}${HTTPS_NOTSAMESITE_ORIGIN}`),
-      expect_feature_available_default, /*feature_name=*/ 'deferred-fetch');
-}, `${description} allows cross-origin navigation in an iframe.`);
+      expect_feature_unavailable_default, /*feature_name=*/ 'deferred-fetch');
+}, `${description} disallows fetchLater() from a redirected cross-origin iframe.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js
index a4cc45ef6be..4982221952f 100644
--- a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-default-permissions-policy.tentative.https.window.js
@@ -12,7 +12,12 @@ const {
   HTTPS_NOTSAMESITE_ORIGIN,
 } = get_host_info();
 
-const description = 'Default "deferred-fetch" permissions policy ["self"]';
+// https://whatpr.org/fetch/1647.html#dom-permissionspolicy-deferred-fetch
+const deferredFetchPolicy =
+    'Default "deferred-fetch" permissions policy ["self"]';
+// https://whatpr.org/fetch/1647.html#dom-permissionspolicy-deferred-fetch-minimal
+const deferredFetchMinimalPolicy =
+    'Default "deferred-fetch-minimal" permissions policy ["*"]';
 
 parallelPromiseTest(async _ => {
   const uuid = token();
@@ -22,17 +27,17 @@ parallelPromiseTest(async _ => {
   fetchLater(url, {activateAfter: 0});
 
   await expectBeacon(uuid, {count: 1});
-}, `${description} allows fetchLater() in the top-level document.`);
+}, `${deferredFetchPolicy} allows fetchLater() in the top-level document.`);
 
 async_test(t => {
   test_feature_availability(
       'fetchLater()', t, getDeferredFetchPolicyInIframeHelperUrl(HTTPS_ORIGIN),
       expect_feature_available_default);
-}, `${description} allows fetchLater() in the same-origin iframe.`);
+}, `${deferredFetchPolicy} allows fetchLater() in the same-origin iframe.`);
 
 async_test(t => {
   test_feature_availability(
       'fetchLater()', t,
       getDeferredFetchPolicyInIframeHelperUrl(HTTPS_NOTSAMESITE_ORIGIN),
       expect_feature_available_default);
-}, `${description} allows fetchLater() in the cross-origin iframe.`);
+}, `${deferredFetchMinimalPolicy} allows fetchLater() in the cross-origin iframe.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-supported-by-permissions-policy.tentative.window.js b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-supported-by-permissions-policy.tentative.window.js
index e89f1edb856..385b0e054ed 100644
--- a/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-supported-by-permissions-policy.tentative.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/permissions-policy/deferred-fetch-supported-by-permissions-policy.tentative.window.js
@@ -5,4 +5,5 @@
 // https://wicg.github.io/local-fonts/#permissions-policy
 test(() => {
   assert_in_array('deferred-fetch', document.featurePolicy.features());
+  assert_in_array('deferred-fetch-minimal', document.featurePolicy.features());
 }, 'document.featurePolicy.features should advertise deferred-fetch.');
diff --git a/tests/wpt/tests/fetch/fetch-later/permissions-policy/resources/helper.js b/tests/wpt/tests/fetch/fetch-later/permissions-policy/resources/helper.js
index 5cbb183acf1..502e07aa4b5 100644
--- a/tests/wpt/tests/fetch/fetch-later/permissions-policy/resources/helper.js
+++ b/tests/wpt/tests/fetch/fetch-later/permissions-policy/resources/helper.js
@@ -1,8 +1,9 @@
 'use strict';
 
 /**
- * Returns an URL to a document that can be used to initialize an iframe to test
- * whether the "deferred-fetch"policy is enabled.
+ * Returns a URL to a document that can be used to initialize an iframe to test
+ * whether the Permissions Policy "deferred-fetch" or "deferred-fetch-minimal"
+ * is enabled.
  */
 function getDeferredFetchPolicyInIframeHelperUrl(iframeOrigin) {
   if (!iframeOrigin.endsWith('/')) {
diff --git a/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
deleted file mode 100644
index 400be405095..00000000000
--- a/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
+++ /dev/null
@@ -1,134 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=/common/utils.js
-// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
-
-'use strict';
-
-const QUOTA_PER_ORIGIN = 64 * 1024;  // 64 kilobytes per spec.
-const {ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
-const TEST_ENDPOINT = '/fetch-later';
-
-// Runs a test case that cover a single fetchLater() call with `body` in its
-// request payload. The call is not expected to throw any errors.
-function fetchLaterPostTest(body, description) {
-  test(() => {
-    const controller = new AbortController();
-    const result = fetchLater(
-        TEST_ENDPOINT, {method: 'POST', signal: controller.signal, body: body});
-    assert_false(result.activated);
-    // Release quota taken by the pending request for subsequent tests.
-    controller.abort();
-  }, description);
-}
-
-// Test small payload for each supported data types.
-for (const [dataType, skipCharset] of Object.entries(
-         BeaconDataTypeToSkipCharset)) {
-  fetchLaterPostTest(
-      makeBeaconData(generateSequentialData(0, 1024, skipCharset), dataType),
-      `A fetchLater() call accept small data in POST request of ${dataType}.`);
-}
-
-// Test various size of payloads for the same origin.
-
-// Test max possible size of payload.
-// Length of absolute URL to the endpoint.
-const POST_TEST_REQUEST_URL_SIZE = (ORIGIN + TEST_ENDPOINT).length;
-// Total size of the request header.
-const POST_TEST_REQUEST_HEADER_SIZE = 36;
-// Runs this test only for String type beacon, as browser adds extra bytes to
-// body for some other types (FormData & URLSearchParams), and the request
-// header sizes varies for every other types. It is difficult to test a request
-// right at the quota limit.
-fetchLaterPostTest(
-    // Generates data that is exactly 64 kilobytes.
-    makeBeaconData(
-        generatePayload(
-            QUOTA_PER_ORIGIN - POST_TEST_REQUEST_URL_SIZE -
-            POST_TEST_REQUEST_HEADER_SIZE),
-        BeaconDataType.String),
-    `A single fetchLater() call takes up the per-origin quota for its ` +
-        `body of String.`);
-
-// Test empty payload.
-for (const dataType in BeaconDataType) {
-  test(
-      () => {
-        assert_throws_js(
-            TypeError, () => fetchLater('/', {method: 'POST', body: ''}));
-      },
-      `A single fetchLater() call does not accept empty data in POST request ` +
-          `of ${dataType}.`);
-}
-
-// Test oversized payload.
-for (const dataType in BeaconDataType) {
-  test(
-      () => {
-        assert_throws_dom(
-            'QuotaExceededError',
-            () => fetchLater('/fetch-later', {
-              method: 'POST',
-              // Generates data that exceeds 64 kilobytes.
-              body: makeBeaconData(
-                  generatePayload(QUOTA_PER_ORIGIN + 1), dataType)
-            }));
-      },
-      `A single fetchLater() call is not allowed to exceed per-origin quota ` +
-          `for its body of ${dataType}.`);
-}
-
-// Test accumulated oversized request.
-for (const dataType in BeaconDataType) {
-  test(
-      () => {
-        const controller = new AbortController();
-        // Makes the 1st call that sends only half of allowed quota.
-        fetchLater('/fetch-later', {
-          method: 'POST',
-          signal: controller.signal,
-          body: makeBeaconData(generatePayload(QUOTA_PER_ORIGIN / 2), dataType)
-        });
-
-        // Makes the 2nd call that sends half+1 of allowed quota.
-        assert_throws_dom('QuotaExceededError', () => {
-          fetchLater('/fetch-later', {
-            method: 'POST',
-            signal: controller.signal,
-            body: makeBeaconData(
-                generatePayload(QUOTA_PER_ORIGIN / 2 + 1), dataType)
-          });
-        });
-        // Release quota taken by the pending requests for subsequent tests.
-        controller.abort();
-      },
-      `The 2nd fetchLater() call is not allowed to exceed per-origin quota ` +
-          `for its body of ${dataType}.`);
-}
-
-// Test various size of payloads across different origins.
-for (const dataType in BeaconDataType) {
-  test(
-      () => {
-        const controller = new AbortController();
-        // Makes the 1st call that sends only half of allowed quota.
-        fetchLater('/fetch-later', {
-          method: 'POST',
-          signal: controller.signal,
-          body: makeBeaconData(generatePayload(QUOTA_PER_ORIGIN / 2), dataType)
-        });
-
-        // Makes the 2nd call that sends half+1 of allowed quota, but to a
-        // different origin.
-        fetchLater(`${HTTPS_NOTSAMESITE_ORIGIN}/fetch-later`, {
-          method: 'POST',
-          signal: controller.signal,
-          body: makeBeaconData(
-              generatePayload(QUOTA_PER_ORIGIN / 2 + 1), dataType)
-        });
-        // Release quota taken by the pending requests for subsequent tests.
-        controller.abort();
-      },
-      `The 2nd fetchLater() call to another origin does not exceed per-origin` +
-          ` quota for its body of ${dataType}.`);
-}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/README.md b/tests/wpt/tests/fetch/fetch-later/quota/README.md
new file mode 100644
index 00000000000..fc59ea73f4e
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/README.md
@@ -0,0 +1,10 @@
+# Quota Tests
+
+This folder contains tests to cover the `fetchLater()` API's
+per-reporting-origin quota.
+
+See the following links:
+
+- Initial Proposal: https://github.com/WICG/pending-beacon/issues/87#issuecomment-1985358609.
+- fetch PR: https://github.com/whatwg/fetch/pull/1647
+- html PR: https://github.com/whatwg/html/pull/10903
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..6439b392e2a
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/accumulated-oversized-payload.tentative.https.window.js
@@ -0,0 +1,63 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+const requestUrl = `${HTTPS_ORIGIN}/`;
+const quota = getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers);
+const halfQuota = Math.ceil(quota / 2);
+
+
+// Tests that a reporting origin only allow queuing requests within its quota.
+test(
+    () => {
+      const controller = new AbortController();
+
+      // Queues with the 1st call (POST) that sends max/2 quota.
+      fetchLater(requestUrl, {
+        method: 'POST',
+        signal: controller.signal,
+        body: makeBeaconData(generatePayload(halfQuota), dataType),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+
+      // Makes the 2nd call (POST) to the same reporting origin that sends
+      // max bytes, which should be rejected.
+      assert_throws_dom('QuotaExceededError', () => {
+        fetchLater(requestUrl, {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(generatePayload(quota), dataType),
+          // Required, as the size of referrer also take up quota.
+          referrer: '',
+        });
+      });
+
+      // Makes the 3rd call (GET) to the same reporting origin, where its
+      // request size is len(requestUrl) + headers, which should be accepted.
+      fetchLater(requestUrl, {
+        method: 'GET',
+        signal: controller.signal,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+
+      // Release quota taken by the pending requests for subsequent tests.
+      controller.abort();
+    },
+    `The 2nd fetchLater(same-origin) call in the top-level document is not allowed to exceed per-origin quota for its POST body of ${
+        dataType}.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/README.md b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/README.md
new file mode 100644
index 00000000000..bd802f0b2d2
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/README.md
@@ -0,0 +1,9 @@
+# Quota Tests for Cross-Origin iframes
+
+This folder contains tests to cover fetchLater() requests from cross-origin
+iframe.
+
+According to [spec], up to 16 cross-origin iframes can get a minimal quota (8kb)
+to make fetchLater() calls.
+
+[spec]: https://whatpr.org/fetch/1647.html#available-deferred-fetch-quota
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..071a9c600b7
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
@@ -0,0 +1,56 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+const requestUrl = `${HTTPS_ORIGIN}/`;
+const quota = getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers);
+const SMALL_REQUEST_BODY_SIZE = 20;
+
+// Tests that a reporting origin's quota is not shared with another cross-origin
+// iframe.
+promise_test(
+    async _ => {
+      const controller = new AbortController();
+
+      // Queues with the 1st call (POST) that sends max quota.
+      fetchLater(requestUrl, {
+        method: 'POST',
+        signal: controller.signal,
+        body: makeBeaconData(generatePayload(quota), dataType),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+
+      // In a default cross-origin iframe, makes the 2nd call (POST) to the
+      // same reporting origin that sends some bytes, which should also be
+      // accepted, as the iframe has its own QUOTA_PER_CROSS_ORIGIN for
+      // fetchLater.
+      await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        targetUrl: requestUrl,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: SMALL_REQUEST_BODY_SIZE,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+
+      // Release quota taken by the pending requests for subsequent tests.
+      controller.abort();
+    },
+    `The 2nd fetchLater(same-origin) call in a default cross-origin child iframe has its owned per-origin quota for a request POST body of ${
+        dataType}.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js
new file mode 100644
index 00000000000..6c7becfacaf
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/empty-payload.tentative.https.window.js
@@ -0,0 +1,37 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// In a cross-origin iframe, test making a POST request with empty
+// payload, which is not accepted by fetchLater API.
+for (const dataType in BeaconDataType) {
+  if (dataType === BeaconDataType.FormData) {
+    // An empty FormData object serializes to non-empty String. Hence, there
+    // will be no error thrown from fetchLater.
+    parallelPromiseTest(
+        async _ => await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+          activateAfter: 0,
+          method: 'POST',
+          bodyType: dataType,
+          bodySize: 0,
+        }),
+        `fetchLater() accepts a non-empty POST request body of ${
+            dataType} in a default cross-origin iframe.`);
+    continue;
+  }
+
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: 0,
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_JS, TypeError),
+      }),
+      `fetchLater() does not accept empty POST request body of ${
+          dataType} in a default cross-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js
new file mode 100644
index 00000000000..480f90988bf
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/max-payload.tentative.https.window.js
@@ -0,0 +1,113 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+
+// In a cross-origin iframe, test making a POST request (same origin as parent
+// frame) with max possible payload.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        targetUrl: requestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize:
+            getRemainingQuota(QUOTA_PER_CROSS_ORIGIN, requestUrl, headers),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+    },
+    `fetchLater() accepts max payload in a parent-frame-origin POST request body of ${
+        dataType} in a default cross-origin iframe.`);
+
+// In a cross-origin iframe, test making a POST request (same origin as parent
+// frame) with max possible payload + 1 byte.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        targetUrl: requestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize:
+            getRemainingQuota(QUOTA_PER_CROSS_ORIGIN, requestUrl, headers) + 1,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      });
+    },
+    `fetchLater() rejects max+1 payload in a parent-frame-origin POST request body of ${
+        dataType} in a default cross-origin iframe.`);
+
+// In a cross-origin iframe, test making a POST request (same origin as iframe)
+// with max possible payload.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const crossOriginRequestUrl =
+          generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        targetUrl: crossOriginRequestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: getRemainingQuota(
+            QUOTA_PER_CROSS_ORIGIN, crossOriginRequestUrl, headers),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+    },
+    `fetchLater() accepts max payload in a self-frame-origin POST request body of ${
+        dataType} in a default cross-origin iframe.`);
+
+// In a cross-origin iframe, test making a POST request (same origin as iframe)
+// with max possible payload + 1 byte.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const crossOriginRequestUrl =
+          generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        targetUrl: crossOriginRequestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: getRemainingQuota(
+                      QUOTA_PER_CROSS_ORIGIN, crossOriginRequestUrl, headers) +
+            1,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      });
+    },
+    `fetchLater() rejects max+1 payload in a self-frame-origin POST request body of ${
+        dataType} in a default cross-origin iframe.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js
new file mode 100644
index 00000000000..3538c73a396
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/multiple-iframes.tentative.https.window.js
@@ -0,0 +1,62 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+// Test 2 direct cross-origin iframes does not share the same quota, even if
+// they are same origin.
+promise_test(async _ => {
+  const controller = new AbortController();
+  const uuid = token();
+  const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+  // Queues a max bytes request in the 1st cross-origin iframe.
+  await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+    targetUrl: requestUrl,
+    method: 'POST',
+    bodyType: dataType,
+    bodySize: getRemainingQuota(QUOTA_PER_CROSS_ORIGIN, requestUrl, headers),
+    // Required, as the size of referrer also take up quota.
+    referrer: '',
+  });
+
+  // Queues a max bytes request in the 2nd cross-origin iframe, which should
+  // still be accepted.
+  await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+    targetUrl: requestUrl,
+    method: 'POST',
+    bodyType: dataType,
+    bodySize: getRemainingQuota(QUOTA_PER_CROSS_ORIGIN, requestUrl, headers),
+    // Required, as the size of referrer also take up quota.
+    referrer: '',
+  });
+
+  // Queues a max bytes request in the root document, which should be
+  // accepted.
+  fetchLater(requestUrl, {
+    method: 'POST',
+    body: generatePayload(QUOTA_PER_ORIGIN, dataType),
+    signal: controller.signal,
+    body: generatePayload(
+        getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers), dataType),
+    // Required, as the size of referrer also take up quota.
+    referrer: '',
+  });
+
+  // Release quota taken by the pending requests for subsequent tests.
+  document.body.innerHTML = '';
+  controller.abort();
+}, `fetchLater() request quota are delegated to cross-origin iframes and not shared, even if they are same origin.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..43a60515134
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/oversized-payload.tentative.https.window.js
@@ -0,0 +1,25 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+const OVERSIZED_REQUEST_BODY_SIZE = QUOTA_PER_CROSS_ORIGIN + 1;
+
+for (const dataType in BeaconDataType) {
+  // In a cross-origin iframe, test making a POST request with
+  // oversized payload, which should be rejected by fetchLater API.
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: OVERSIZED_REQUEST_BODY_SIZE,
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      }),
+      `fetchLater() does not accept payload[size=${
+          OVERSIZED_REQUEST_BODY_SIZE}] exceeding per-origin quota in a POST request body of ${
+          dataType} in a default cross-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js
new file mode 100644
index 00000000000..ad73db5516e
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/cross-origin-iframe/small-payload.tentative.https.window.js
@@ -0,0 +1,22 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const {HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+const SMALL_REQUEST_BODY_SIZE = 20;
+
+for (const dataType in BeaconDataType) {
+  // In a cross-origin iframe, test making a POST request with small
+  // payload.
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: SMALL_REQUEST_BODY_SIZE,
+      }),
+      `fetchLater() accepts payload[size=${
+          SMALL_REQUEST_BODY_SIZE}] in a POST request body of ${
+          dataType} in a default cross-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/empty-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/empty-payload.tentative.https.window.js
new file mode 100644
index 00000000000..c2c4dd50326
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/empty-payload.tentative.https.window.js
@@ -0,0 +1,37 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Test making a HTTP POST request with empty payload, which is not accepted by
+// fetchLater API.
+for (const dataType in BeaconDataType) {
+  const requestInit = {
+    activateAfter: 0,
+    method: 'POST',
+    body: makeBeaconData('', dataType)
+  };
+
+  if (dataType === BeaconDataType.FormData) {
+    // An empty FormData object serializes to non-empty String. Hence, there
+    // will be no error thrown from fetchLater.
+    parallelPromiseTest(async _ => {
+      expectFetchLater(requestInit);
+    }, `fetchLater() accepts a non-empty POST request body of ${dataType}.`);
+    continue;
+  }
+  test(
+      () => assert_throws_js(TypeError, () => fetchLater('/', requestInit)),
+      `fetchLater() does not accept an empty POST request body of ${
+          dataType}.`);
+}
+
+// Test making HTTP non-POST requests, which has no payload and should be
+// accepted by fetchLater API.
+for (const method of ['GET', 'DELETE', 'PUT']) {
+  parallelPromiseTest(
+      async _ => expectFetchLater({activateAfter: 0, method: method}),
+      `fetchLater() accept a ${method} request.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/max-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/max-payload.tentative.https.window.js
new file mode 100644
index 00000000000..8457060797a
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/max-payload.tentative.https.window.js
@@ -0,0 +1,48 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+// Test making a POST request with max possible payload.
+promise_test(async _ => {
+  const uuid = token();
+  const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+  await expectFetchLater(
+      {
+        activateAfter: 0,
+        method: 'POST',
+        bodySize: getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers),
+      },
+      {
+        targetUrl: requestUrl,
+        uuid: uuid,
+      });
+}, `fetchLater() accepts max payload in a POST request body of ${dataType}.`);
+
+// Test making a POST request with max+1 possible payload.
+test(_ => {
+  const uuid = token();
+  const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+  assert_throws_dom(
+      'QuotaExceededError',
+      () => fetchLater(requestUrl, {
+        activateAfter: 0,
+        method: 'POST',
+        body: generatePayload(
+            getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers) + 1,
+            dataType),
+      }));
+}, `fetchLater() rejects max+1 payload in a POST request body of ${dataType}.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js
new file mode 100644
index 00000000000..5849068e4d5
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/multiple-origins.tentative.https.window.js
@@ -0,0 +1,43 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+for (const dataType in BeaconDataType) {
+  // Tests multiple request reporting origins within same document.
+  test(
+      () => {
+        const controller = new AbortController();
+
+        // Makes the 1st call (POST) that sends max/2+1 quota to `HTTPS_ORIGIN`.
+        fetchLater(`${HTTPS_ORIGIN}/`, {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(
+              generatePayload(QUOTA_PER_REPORTING_ORIGIN / 2 + 1), dataType)
+        });
+
+        // Makes the 2nd call (POST) that sends max/2+1 of allowed quota, but to
+        // a different reporting origin `HTTPS_NOTSAMESITE_ORIGIN`.
+        fetchLater(`${HTTPS_NOTSAMESITE_ORIGIN}/`, {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(
+              generatePayload(QUOTA_PER_REPORTING_ORIGIN / 2 + 1), dataType)
+        });
+
+        // Makes the 3rd call (GET) to `HTTPS_NOTSAMESITE_ORIGIN`.
+        fetchLater(`${HTTPS_NOTSAMESITE_ORIGIN}/`, {
+          method: 'GET',
+          signal: controller.signal,
+        });
+
+        // Release quota taken by the pending requests for subsequent tests.
+        controller.abort();
+      },
+      `fetchLater() has per-request-origin quota for its POST body of ${
+          dataType}.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..0036d040d8e
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/oversized-payload.tentative.https.window.js
@@ -0,0 +1,24 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const OVERSIZED_REQUEST_BODY_SIZE = QUOTA_PER_ORIGIN + 1;
+
+for (const dataType in BeaconDataType) {
+  // Test making a POST request with oversized payload, which should be rejected
+  // by fetchLater API.
+  test(
+      () => assert_throws_dom(
+          'QuotaExceededError',
+          () => fetchLater('/', {
+            activateAfter: 0,
+            method: 'POST',
+            body: makeBeaconData(
+                generatePayload(OVERSIZED_REQUEST_BODY_SIZE), dataType),
+          })),
+      `fetchLater() does not accept payload[size=${
+          OVERSIZED_REQUEST_BODY_SIZE}] exceeding per-origin quota in a POST request body of ${
+          dataType}.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/resources/helper.js b/tests/wpt/tests/fetch/fetch-later/quota/resources/helper.js
new file mode 100644
index 00000000000..bd9571c82f5
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/resources/helper.js
@@ -0,0 +1,35 @@
+'use strict';
+
+// See the max returned value from
+// https://whatpr.org/fetch/1647.html#available-deferred-fetch-quota
+const QUOTA_PER_ORIGIN = 64 * 1024;  // 64 kibibytes.
+// See the "minimal quota" from
+// https://whatpr.org/fetch/1647.html#available-deferred-fetch-quota
+const QUOTA_PER_CROSS_ORIGIN = 8 * 1024;  // 8 kibibytes.
+// See the "quotaForRequestOrigin" from
+// https://whatpr.org/fetch/1647.html#available-deferred-fetch-quota
+const QUOTA_PER_REPORTING_ORIGIN = 64 * 1024;  // 64 kibibytes.
+
+
+/**
+ * Calculates max possible remaining quota for a fetchLater request.
+ *
+ * Note that this function does NOT know how many fetchLater calls has been made
+ * before calling, nor does it know anything about requests within the URL
+ * origin, and both of them take up quota for the origin.
+ *
+ * @param {number} maxQuota The max quota to deduct from. Caller must ensure
+ *                          this is actually used by its owned context.
+ * @param {String} url The URL for a fetchLater call.
+ * @param {Headers=} headers The headers for a fetchLater call.
+ * @return {number} The max possible per-origin quota for fetchLater calls.
+ */
+function getRemainingQuota(maxQuota, url, headers = {}) {
+  let quota = maxQuota - url.length;
+  if (headers instanceof Headers) {
+    for (const kv of headers.entries()) {
+      quota -= kv[0].length + kv[1].length;
+    }
+  }
+  return quota > 0 ? quota : 0;
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/README.md b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/README.md
new file mode 100644
index 00000000000..025422314ed
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/README.md
@@ -0,0 +1,9 @@
+# Quota Tests for Same-Origin iframes
+
+This folder contains tests to cover fetchLater() requests from same-origin
+iframe.
+
+According to [spec], all same-origin iframes share the same quota with their
+same-origin parent document.
+
+[spec]: https://whatpr.org/fetch/1647.html#available-deferred-fetch-quota
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..8b894c011ad
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/accumulated-oversized-payload.tentative.https.window.js
@@ -0,0 +1,55 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+const requestUrl = `${HTTPS_ORIGIN}/`;
+const quota = getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers);
+const SMALL_REQUEST_BODY_SIZE = 20;
+
+// Tests that a reporting origin's quota is shared across same-origin frames.
+promise_test(
+    async _ => {
+      const controller = new AbortController();
+
+      // Queues with the 1st call (POST) that sends max quota.
+      fetchLater(requestUrl, {
+        method: 'POST',
+        signal: controller.signal,
+        body: makeBeaconData(generatePayload(quota), dataType),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+
+      // In a same-origin iframe, makes the 2nd call (POST) to the same
+      // reporting origin that sends some bytes, which should be rejected.
+      await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        targetUrl: requestUrl,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: SMALL_REQUEST_BODY_SIZE,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      });
+
+      // Release quota taken by the pending requests for subsequent tests.
+      controller.abort();
+    },
+    `The 2nd fetchLater(same-origin) call in a same-origin child iframe is not allowed to exceed per-origin quota for its POST body of ${
+        dataType}.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js
new file mode 100644
index 00000000000..53cae60047e
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/empty-payload.tentative.https.window.js
@@ -0,0 +1,37 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// In a same-origin iframe, test making a POST request with empty payload,
+// which is not accepted by fetchLater API.
+for (const dataType in BeaconDataType) {
+  if (dataType === BeaconDataType.FormData) {
+    // An empty FormData object serializes to non-empty String. Hence, there
+    // will be no error thrown from fetchLater.
+    parallelPromiseTest(
+        async _ => await loadFetchLaterIframe(HTTPS_ORIGIN, {
+          activateAfter: 0,
+          method: 'POST',
+          bodyType: dataType,
+          bodySize: 0,
+        }),
+        `fetchLater() accepts a non-empty POST request body of ${
+            dataType} in same-origin iframe.`);
+    continue;
+  }
+
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: 0,
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_JS, TypeError),
+      }),
+      `fetchLater() does not accept empty POST request body of ${
+          dataType} in same-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js
new file mode 100644
index 00000000000..9d865eeb5ee
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/max-payload.tentative.https.window.js
@@ -0,0 +1,61 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+// In a same-origin iframe, test making a POST request with max possible
+// payload.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        targetUrl: requestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers),
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+      });
+    },
+    `fetchLater() accepts max payload in a POST request body of ${
+        dataType} in same-origin iframe.`);
+
+// In a same-origin iframe, test making a POST request with max possible
+// payload + 1 byte.
+promise_test(
+    async _ => {
+      const uuid = token();
+      const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+      await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        targetUrl: requestUrl,
+        uuid: uuid,
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers) + 1,
+        // Required, as the size of referrer also take up quota.
+        referrer: '',
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      });
+    },
+    `fetchLater() rejects max+1 payload in a POST request body of ${
+        dataType} in same-origin iframe.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js
new file mode 100644
index 00000000000..3f46f84a5fc
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/multiple-iframes.tentative.https.window.js
@@ -0,0 +1,61 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Skips FormData & URLSearchParams, as browser adds extra bytes to them
+// in addition to the user-provided content. It is difficult to test a
+// request right at the quota limit.
+// Skips File & Blob as it's difficult to estimate what additional data are
+// added into them.
+const dataType = BeaconDataType.String;
+
+// Request headers are counted into total request size.
+const headers = new Headers({'Content-Type': 'text/plain;charset=UTF-8'});
+
+// Test 2 direct same-origin iframes use the same quota with top-level document.
+promise_test(async _ => {
+  const uuid = token();
+  const requestUrl = generateSetBeaconURL(uuid, {host: HTTPS_ORIGIN});
+
+  // Queues a max bytes request in the 1st same-origin iframe.
+  await loadFetchLaterIframe(HTTPS_ORIGIN, {
+    targetUrl: requestUrl,
+    method: 'POST',
+    bodyType: dataType,
+    bodySize: getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers),
+    // Required, as the size of referrer also take up quota.
+    referrer: '',
+  });
+
+  // Queues a max bytes request in the 2nd same-origin iframe.
+  // TODO(crbug.com/40276121): Confirm whether this should be rejected from
+  // https://github.com/whatwg/fetch/pull/1647/files#r1919611046
+  await loadFetchLaterIframe(HTTPS_ORIGIN, {
+    targetUrl: requestUrl,
+    method: 'POST',
+    bodyType: dataType,
+    bodySize: getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers),
+    // Required, as the size of referrer also take up quota.
+    referrer: '',
+  });
+
+  // Queues a max bytes request in the root document.
+  // TODO(crbug.com/40276121): Confirm whether this should be rejected from
+  // https://github.com/whatwg/fetch/pull/1647/files#r1919611046
+  fetchLater(requestUrl, {
+    method: 'POST',
+    body: generatePayload(
+        getRemainingQuota(QUOTA_PER_ORIGIN, requestUrl, headers), dataType),
+    // Required, as the size of referrer also take up quota.
+    referrer: ''
+  });
+
+  // Release quota taken by the pending requests for subsequent tests.
+  for (const element of document.querySelectorAll('iframe')) {
+    element.remove();
+  }
+}, `fetchLater() request quota are shared by same-origin iframes and root.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js
new file mode 100644
index 00000000000..d71b87190ce
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/oversized-payload.tentative.https.window.js
@@ -0,0 +1,25 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+// META: script=/fetch/fetch-later/quota/resources/helper.js
+'use strict';
+
+const {HTTPS_ORIGIN} = get_host_info();
+const OVERSIZED_REQUEST_BODY_SIZE = QUOTA_PER_ORIGIN + 1;
+
+for (const dataType in BeaconDataType) {
+  // In a same-origin iframe, test making a POST request with oversized
+  // payload, which should be rejected by fetchLater API.
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: OVERSIZED_REQUEST_BODY_SIZE,
+        expect: new FetchLaterIframeExpectation(
+            FetchLaterExpectationType.ERROR_DOM, 'QuotaExceededError'),
+      }),
+      `fetchLater() does not accept payload[size=${
+          OVERSIZED_REQUEST_BODY_SIZE}] exceeding per-origin quota in a POST request body of ${
+          dataType} in same-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js
new file mode 100644
index 00000000000..2b20a6fc629
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/same-origin-iframe/small-payload.tentative.https.window.js
@@ -0,0 +1,21 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const {HTTPS_ORIGIN} = get_host_info();
+const SMALL_REQUEST_BODY_SIZE = 20;
+
+for (const dataType in BeaconDataType) {
+  // In a same-origin iframe, test making a POST request with small payload.
+  parallelPromiseTest(
+      async _ => await loadFetchLaterIframe(HTTPS_ORIGIN, {
+        activateAfter: 0,
+        method: 'POST',
+        bodyType: dataType,
+        bodySize: SMALL_REQUEST_BODY_SIZE,
+      }),
+      `fetchLater() accepts payload[size=${
+          SMALL_REQUEST_BODY_SIZE}] in a POST request body of ${
+          dataType} in same-origin iframe.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/quota/small-payload.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota/small-payload.tentative.https.window.js
new file mode 100644
index 00000000000..862ca09affd
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota/small-payload.tentative.https.window.js
@@ -0,0 +1,19 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/fetch/fetch-later/resources/fetch-later-helper.js
+'use strict';
+
+const SMALL_REQUEST_BODY_SIZE = 20;
+
+for (const dataType in BeaconDataType) {
+  // Test making a POST request with small payload.
+  parallelPromiseTest(
+      async _ => expectFetchLater({
+        activateAfter: 0,
+        method: 'POST',
+        body:
+            makeBeaconData(generatePayload(SMALL_REQUEST_BODY_SIZE), dataType),
+      }),
+      `fetchLater() accepts small payload in a POST request body of ${
+          dataType}.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/resources/fetch-later-helper.js b/tests/wpt/tests/fetch/fetch-later/resources/fetch-later-helper.js
index 566b3e0a1a4..ef1d7090a8f 100644
--- a/tests/wpt/tests/fetch/fetch-later/resources/fetch-later-helper.js
+++ b/tests/wpt/tests/fetch/fetch-later/resources/fetch-later-helper.js
@@ -1,3 +1,7 @@
+/**
+ * IMPORTANT: Before using this file, you must also import the following files:
+ * - /common/utils.js
+ */
 'use strict';
 
 const ROOT_NAME = 'fetch/fetch-later';
@@ -204,3 +208,307 @@ async function loadScriptAsIframe(script) {
   await iframeLoaded;
   return iframe;
 }
+
+/**
+ * A helper to make a fetchLater request and wait for it being received.
+ *
+ * This function can also be used when the caller does not care about where a
+ * fetchLater() makes request to.
+ *
+ * @param {!RequestInit} init The request config to pass into fetchLater() call.
+ */
+async function expectFetchLater(
+    init, {targetUrl = undefined, uuid = undefined} = {}) {
+  if ((targetUrl && !uuid) || (!targetUrl && uuid)) {
+    throw new Error('uuid and targetUrl must be provided together.');
+  }
+  if (uuid && targetUrl && !targetUrl.includes(uuid)) {
+    throw new Error(`Conflicting uuid=${
+        uuid} is provided: must also be included in the targetUrl ${
+        targetUrl}`);
+  }
+  if (!uuid) {
+    uuid = token();
+  }
+  if (!targetUrl) {
+    targetUrl = generateSetBeaconURL(uuid);
+  }
+
+  fetchLater(targetUrl, init);
+
+  await expectBeacon(uuid, {count: 1});
+}
+
+/**
+ * A helper to append `el` into document and wait for it being loaded.
+ * @param {!Element} el
+ */
+async function loadElement(el) {
+  const loaded = new Promise(resolve => el.onload = resolve);
+  document.body.appendChild(el);
+  await loaded;
+}
+
+/**
+ * The options to configure a fetchLater() call in an iframe.
+ * @record
+ */
+class FetchLaterIframeOptions {
+  constructor() {
+    /**
+     * @type {string=} The url to pass to the fetchLater() call.
+     */
+    this.targetUrl;
+
+    /**
+     * @type {string=} The uuid to wait for. Must also be part of `targetUrl`.
+     */
+    this.uuid;
+
+    /**
+     * @type {number=} The activateAfter field of DeferredRequestInit to pass
+     * to the fetchLater() call.
+     * https://whatpr.org/fetch/1647.html#dictdef-deferredrequestinit
+     */
+    this.activateAfter;
+
+    /**
+     * @type {string=} The method field of DeferredRequestInit to pass to the
+     * fetchLater() call.
+     * https://whatpr.org/fetch/1647.html#dictdef-deferredrequestinit
+     */
+    this.method;
+
+    /**
+     * @type {string=} The referrer field of DeferredRequestInit to pass to the
+     * fetchLater() call.
+     * https://whatpr.org/fetch/1647.html#requestinit
+     */
+    this.referrer;
+
+    /**
+     * @type {string=} One of the `BeaconDataType` to tell the iframe how to
+     * generate the body for its fetchLater() call.
+     */
+    this.bodyType;
+
+    /**
+     * @type {number=} The size to tell the iframe how to generate the body of
+     * its fetchLater() call.
+     */
+    this.bodySize;
+
+    /**
+     * @type {bool} Whether to set allow="deferred-fetch" attribute for the
+     * iframe. Combing with a Permissions-Policy header, this will enable
+     * fetchLater() being used in a cross-origin iframe.
+     */
+    this.allowDeferredFetch;
+
+    /**
+     * @type {FetchLaterIframeExpectation=} The expectation on the iframe's
+     * behavior.
+     */
+    this.expect;
+  }
+}
+
+/**
+ * The enum to classify the messages posted from an iframe that has called
+ * fetchLater() API.
+ * @enum {string}
+ */
+const FetchLaterIframeMessageType = {
+  // Tells that a fetchLater() call has been executed without any error thrown.
+  DONE: 'fetchLater.done',
+  // Tells that there are some error thrown from a fetchLater() call.
+  ERROR: 'fetchLater.error',
+};
+
+/**
+ * The enum to indicate what type of iframe behavior the caller is expecting.
+ * @enum {number}
+ */
+const FetchLaterExpectationType = {
+  // A fetchLater() call should have been made without any errors.
+  DONE: 0,
+  // A fetchLater() call is made and an JS error is thrown.
+  ERROR_JS: 1,
+  // A fetchLater() call is made and an DOMException is thrown.
+  ERROR_DOM: 2,
+};
+
+class FetchLaterExpectationError extends Error {
+  constructor(src, actual, expected) {
+    const message = `iframe[src=${src}] threw ${actual}, expected ${expected}`;
+    super(message);
+  }
+}
+
+class FetchLaterIframeExpectation {
+  constructor(expectationType, expectedError) {
+    this.expectationType = expectationType;
+    if (expectationType == FetchLaterExpectationType.DONE && !expectedError) {
+      this.expectedErrorType = undefined;
+    } else if (
+        expectationType == FetchLaterExpectationType.ERROR_JS &&
+        typeof expectedError == 'function') {
+      this.expectedErrorType = expectedError;
+    } else if (
+        expectationType == FetchLaterExpectationType.ERROR_DOM &&
+        typeof expectedError == 'string') {
+      this.expectedDomErrorName = expectedError;
+    } else {
+      throw Error(`Expectation type "${expectationType}" and expected error "${
+          expectedError}" do not match`);
+    }
+  }
+
+  /**
+   * Verifies the message from `e` against the configured expectation.
+   *
+   * @param {MessageEvent} e
+   * @param {string} url The source URL of the iframe where `e` is dispatched
+   * from.
+   * @return {bool}
+   * - Returns true if the expected message event is passed into the function
+   *   and the expectation is fulfilled. The caller should be able to safely
+   *   remove the message event listener afterwards.
+   * - Returns false if the passed in event is not of the expected type. The
+   *   caller should continue waiting for another message event and call this
+   *   function again.
+   * @throws {Error} Throws an error if the expected message event is passed but
+   *   the expectation fails. The caller should remove the message event
+   *   listener and perform test failure handling.
+   */
+  run(e, url) {
+    if (this.expectationType === FetchLaterExpectationType.DONE) {
+      if (e.data.type === FetchLaterIframeMessageType.DONE) {
+        return true;
+      }
+      if (e.data.type === FetchLaterIframeMessageType.ERROR &&
+          e.data.error !== undefined) {
+        throw new FetchLaterExpectationError(
+            url, e.data.error.name, 'no error');
+      }
+    }
+
+    if (this.expectationType === FetchLaterExpectationType.ERROR_JS) {
+      if (e.data.type === FetchLaterIframeMessageType.DONE) {
+        throw new FetchLaterExpectationError(
+            url, 'nothing', this.expectedErrorType.name);
+      }
+      if (e.data.type === FetchLaterIframeMessageType.ERROR) {
+        if (e.data.error.constructor === this.expectedErrorType &&
+            e.data.error.name === this.expectedErrorType.name) {
+          return true;
+        }
+        throw new FetchLaterExpectationError(
+            url, e.data.error, this.expectedErrorType.name);
+      }
+    }
+
+    if (this.expectationType === FetchLaterExpectationType.ERROR_DOM) {
+      if (e.data.type === FetchLaterIframeMessageType.DONE) {
+        throw new FetchLaterExpectationError(
+            url, 'nothing', this.expectedDomErrorName);
+      }
+      if (e.data.type === FetchLaterIframeMessageType.ERROR) {
+        const actual = e.data.error.name || e.data.error.type;
+        if (e.data.error.constructor.name === 'DOMException' &&
+            actual == this.expectedDomErrorName) {
+          return true;
+        }
+        throw new FetchLaterExpectationError(
+            url, actual, this.expectedDomErrorName);
+      }
+    }
+
+    return false;
+  }
+}
+
+/**
+ * A helper to load an iframe of the specified `origin` that makes a fetchLater
+ * request to `targetUrl`.
+ *
+ * If `targetUrl` is not provided, this function generates a target URL by
+ * itself.
+ *
+ * If `expect` is not provided:
+ * - If `targetUrl` is not provided, this function will wait for the fetchLater
+ *   request being received by the test server before returning.
+ * - If `targetUrl` is provided and `uuid` is missing, it will NOT wait for the
+ *   request.
+ * - If both `targetUrl` and `uuid` are provided, it will wait for the request.
+ *
+ * Note that the iframe posts various messages back to its parent document.
+ *
+ * @param {!string} origin The origin URL of the iframe to load.
+ * @param {FetchLaterIframeOptions=} nameIgnored
+ * @return {!HTMLIFrameElement} the loaded iframe.
+ */
+async function loadFetchLaterIframe(origin, {
+  targetUrl = undefined,
+  uuid = undefined,
+  activateAfter = undefined,
+  referrer = undefined,
+  method = undefined,
+  bodyType = undefined,
+  bodySize = undefined,
+  allowDeferredFetch = false,
+  expect = undefined
+} = {}) {
+  if (uuid && targetUrl && !targetUrl.includes(uuid)) {
+    throw new Error(`Conflicted uuid=${
+        uuid} is provided: must also be included in the targetUrl ${
+        targetUrl}`);
+  }
+  if (!uuid) {
+    uuid = targetUrl ? undefined : token();
+  }
+  targetUrl = targetUrl || generateSetBeaconURL(uuid);
+  const params = new URLSearchParams(Object.assign(
+      {},
+      {url: encodeURIComponent(targetUrl)},
+      activateAfter !== undefined ? {activateAfter} : null,
+      referrer !== undefined ? {referrer} : null,
+      method !== undefined ? {method} : null,
+      bodyType !== undefined ? {bodyType} : null,
+      bodySize !== undefined ? {bodySize} : null,
+      ));
+  const url =
+      `${origin}/fetch/fetch-later/resources/fetch-later.html?${params}`;
+  expect =
+      expect || new FetchLaterIframeExpectation(FetchLaterExpectationType.DONE);
+
+  const iframe = document.createElement('iframe');
+  if (allowDeferredFetch) {
+    iframe.allow = 'deferred-fetch';
+  }
+  iframe.src = url;
+
+  const messageReceived = new Promise((resolve, reject) => {
+    addEventListener('message', function handler(e) {
+      if (e.source !== iframe.contentWindow) {
+        return;
+      }
+      try {
+        if (expect.run(e, url)) {
+          removeEventListener('message', handler);
+          resolve(e.data.type);
+        }
+      } catch (err) {
+        reject(err);
+      }
+    });
+  });
+
+  await loadElement(iframe);
+  const messageType = await messageReceived;
+  if (messageType === FetchLaterIframeMessageType.DONE && uuid) {
+    await expectBeacon(uuid, {count: 1});
+  }
+
+  return iframe;
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/resources/fetch-later.html b/tests/wpt/tests/fetch/fetch-later/resources/fetch-later.html
index b569e1a076a..b295be116c7 100644
--- a/tests/wpt/tests/fetch/fetch-later/resources/fetch-later.html
+++ b/tests/wpt/tests/fetch/fetch-later/resources/fetch-later.html
@@ -2,13 +2,35 @@
 <head>
 </head>
 <body>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/fetch/fetch-later/resources/fetch-later-helper.js"></script>
   <script>
     const PARAMS = new URL(location.href).searchParams;
     const TARGET_URL= decodeURIComponent(PARAMS.get('url')) || '';
+    const BODY_TYPE = PARAMS.get('bodyType');
+    const BODY_SIZE = PARAMS.get('bodySize');
+    const BODY = BODY_TYPE !== null && BODY_SIZE !== null ? makeBeaconData(generatePayload(BODY_SIZE), BODY_TYPE) : null;
+    const REQUEST_INIT = Object.assign({},
+      PARAMS.has('activateAfter') ? {activateAfter: parseInt(PARAMS.get('activateAfter'), 10)} : null,
+      PARAMS.has('method') ? {method: PARAMS.get('method')} : null,
+      PARAMS.has('referrer') ? {referrer: PARAMS.get('referrer')} : null,
+      BODY !== null ? {body: BODY} : null,
+    );
 
-    fetchLater(TARGET_URL, {activateAfter: 0});
-    if (window.opener) {
-      window.opener.postMessage("done", "*");
+    function postMessageBack(message) {
+      if (window.opener) {
+        window.opener.postMessage(message, '*');
+      } else {
+        parent.postMessage(message, '*');
+      }
+    }
+
+    try {
+      fetchLater(TARGET_URL, REQUEST_INIT);
+      postMessageBack({type: FetchLaterIframeMessageType.DONE});
+    } catch (e) {
+      postMessageBack({type: FetchLaterIframeMessageType.ERROR, error: e});
     }
   </script>
 </body>
diff --git a/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js b/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
index 205391d21ff..da48a843dc5 100644
--- a/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
@@ -10,6 +10,7 @@
 // META: variant=?5-8
 // META: variant=?9-12
 // META: variant=?13-16
+// META: variant=?17-last
 
 // These tests focus on the navigator.getInterestGroupAdAuctionData() method.
 
@@ -618,3 +619,169 @@ subsetTest(promise_test, async test => {
   assert_own_property(decoded.message, 'enforceKAnon');
   assert_equals(decoded.message.enforceKAnon, true);
 }, 'getInterestGroupAdAuctionData() requests k-anon.');
+
+
+/*************************************************************************
+ * Tests for the multi-seller variant of the API
+ *************************************************************************/
+
+ async function validateForSeller(adAuctionData, seller) {
+  assert_equals(adAuctionData.seller, seller);
+  assert_not_own_property(adAuctionData, 'error');
+  assert_own_property(adAuctionData, 'request');
+  assert_true(adAuctionData.request.length > 0);
+
+  let decoded = await BA.decodeInterestGroupData(adAuctionData.request);
+  let ig = validateWithOneIg(decoded);
+
+  assert_equals(ig.name, DEFAULT_INTEREST_GROUP_NAME);
+  assert_array_equals(ig.ads, ['a', 'b']);
+
+  assert_true(ig.components instanceof Array);
+  assert_array_equals(ig.components, ['ca', 'cb', 'cc']);
+
+  assert_array_equals(ig.biddingSignalsKeys, ['alpha', 'beta']);
+  assert_equals(ig.userBiddingSignals, '14');
+}
+
+ subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  const result = await navigator.getInterestGroupAdAuctionData({
+    sellers: [{
+      coordinatorOrigin: await BA.configureCoordinator(),
+      seller: window.location.origin,
+    }]
+  });
+
+  assert_true(result.requestId !== null);
+  assert_own_property(result, 'requests');
+  assert_equals(result.requests.length, 1);
+  validateForSeller(result.requests[0], window.location.origin);
+}, 'getInterestGroupAdAuctionData() multi-seller with single seller');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  const result = await navigator.getInterestGroupAdAuctionData({
+    sellers: [{
+        coordinatorOrigin: await BA.configureCoordinator(),
+        seller: window.location.origin,
+      }, {
+        coordinatorOrigin: await BA.configureCoordinator(),
+        seller: OTHER_ORIGIN1,
+    }]
+  });
+
+  assert_true(result.requestId !== null);
+  assert_own_property(result, 'requests');
+  assert_equals(result.requests.length, 2, JSON.stringify(result));
+  result.requests.sort((a,b)=> (a.seller < b.seller ? -1 : +(a.seller > b.seller)));
+
+  await validateForSeller(result.requests[0], OTHER_ORIGIN1);
+  await validateForSeller(result.requests[1], window.location.origin);
+
+  assert_not_equals(result.requests[0].request.toString(), result.requests[1].request.toString());
+}, 'getInterestGroupAdAuctionData() multi-seller with multiple sellers - valid');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  const result = await navigator.getInterestGroupAdAuctionData({
+    sellers: [{
+        coordinatorOrigin: await BA.configureCoordinator(),
+        seller: window.location.origin,
+      }, {
+        coordinatorOrigin: "https://invalid.coordinator.test/",
+        seller: OTHER_ORIGIN1,
+    }]
+  });
+
+  assert_true(result.requestId !== null);
+  assert_own_property(result, 'requests');
+  assert_equals(result.requests.length, 2, JSON.stringify(result));
+  result.requests.sort((a,b)=> (a.seller < b.seller ? -1 : +(a.seller > b.seller)));
+
+  assert_equals(result.requests[0].seller, OTHER_ORIGIN1);
+  assert_own_property(result.requests[0], 'error');
+  assert_not_own_property(result.requests[0], 'request');
+
+  await validateForSeller(result.requests[1], window.location.origin);
+}, 'getInterestGroupAdAuctionData() multi-seller with multiple sellers - one invalid coordinator');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  await promise_rejects_js(test, TypeError, navigator.getInterestGroupAdAuctionData({
+    sellers: [{
+        coordinatorOrigin: await BA.configureCoordinator(),
+        seller: window.location.origin,
+      }, {
+        coordinatorOrigin: await BA.configureCoordinator(),
+        seller: "http://not.secure.test/",
+    }]
+  }));
+}, 'getInterestGroupAdAuctionData() multi-seller with multiple sellers - one invalid seller');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  await promise_rejects_js(test, TypeError, navigator.getInterestGroupAdAuctionData({
+  }));
+}, 'getInterestGroupAdAuctionData() one of "seller" and "sellers" is required');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  await promise_rejects_js(test, TypeError, navigator.getInterestGroupAdAuctionData({
+    seller: window.location.origin,
+    sellers: [{
+      coordinatorOrigin: await BA.configureCoordinator(),
+      seller: window.location.origin,
+    }]
+  }));
+}, 'getInterestGroupAdAuctionData() doesn\'t allow "seller" and "sellers" fields');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  await promise_rejects_js(test, TypeError, navigator.getInterestGroupAdAuctionData({
+    coordinatorOrigin: window.location.origin,
+    sellers: [{
+      coordinatorOrigin: await BA.configureCoordinator(),
+      seller: window.location.origin,
+    }]
+  }));
+}, 'getInterestGroupAdAuctionData() doesn\'t allow "coordinatorOrigin" and "sellers" fields');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const igConfig = makeTemplateIgConfig(uuid);
+  await joinInterestGroup(test, uuid, igConfig);
+
+  await promise_rejects_js(test, TypeError, navigator.getInterestGroupAdAuctionData({
+    coordinatorOrigin: window.location.origin,
+    sellers: [{
+      coordinatorOrigin: await BA.configureCoordinator(),
+      seller: window.location.origin,
+    }, {
+      coordinatorOrigin: await BA.configureCoordinator(),
+      seller: window.location.origin,
+    }
+  ]
+  }));
+}, 'getInterestGroupAdAuctionData() doesn\'t allow duplicate sellers in "sellers" field');
diff --git a/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py b/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
index 92733eedf43..b7456282d81 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
+++ b/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
@@ -112,6 +112,15 @@ def decode_trusted_scoring_signals_params(request):
           adComponentRenderURLs = list(map(unquote_plus, pair[1].split(",")))
           urlLists.append({"type":"adComponentRenderURLs", "urls":adComponentRenderURLs})
           continue
+      # Ignore the various creative scanning params; they're expected, but we
+      # don't parse them here.
+      if (pair[0] == 'adCreativeScanningMetadata' or
+            pair[0] == 'adComponentCreativeScanningMetadata' or
+            pair[0] == 'adSizes' or
+            pair[0] == 'adComponentSizes' or
+            pair[0] == 'adBuyer' or
+            pair[0] == 'adComponentBuyer'):
+          continue
       raise ValueError("Unexpected query parameter: " + param)
 
   # "hostname" and "renderUrls" are mandatory.
diff --git a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
index ea08ded9e8e..0c3b4054395 100644
--- a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
@@ -14,7 +14,8 @@
 // META: variant=?36-40
 // META: variant=?41-45
 // META: variant=?46-50
-// META: variant=?51-last
+// META: variant=?51-55
+// META: variant=?56-last
 
 "use strict";
 
@@ -786,3 +787,313 @@ subsetTest(promise_test, async test => {
 
   await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
 }, 'Trusted scoring signals splits the request if the combined URL length exceeds the limit of small value.');
+
+// A little helper to extract out trusted signals query params echoed back
+// by trusted-scoring-signals.py; sticks them in a map named `parsed`.
+function makeParseHelper(renderURL) {
+  return `
+    let payload = trustedScoringSignals.renderURL['${renderURL}'];
+    payload = payload.substring(payload.indexOf('?') + 1).split('&');
+    let parsed = new Map();
+    for (let entry of payload) {
+      let kv = entry.split('=');
+      parsed.set(kv[0], decodeURIComponent(kv[1]));
+    }
+  `;
+}
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL =
+      createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'url');
+
+  const bidder_origin = OTHER_ORIGIN1;
+
+  await joinCrossOriginInterestGroup(
+      test, uuid, bidder_origin,
+      {ads: [{renderURL: renderURL, creativeScanningMetadata: 'hello'}]});
+
+  const scoreAdBody = `
+    ${makeParseHelper(renderURL)}
+    if (parsed.get('renderUrls') !== '${renderURL}')
+      throw 'Wrong URL';
+    if (parsed.get('adCreativeScanningMetadata') !== 'hello')
+      throw 'Wrong creative scanning metadata';
+    if (parsed.get('adSizes') !== ',')
+      throw 'Wrong adSizes';
+    if (parsed.get('adBuyer') !== '${bidder_origin}')
+      throw 'Wrong adBuyer';
+    if (parsed.has('adComponentRenderUrls'))
+      throw 'Unexpected adComponentRenderUrls';
+    if (parsed.has('adComponentCreativeScanningMetadata'))
+      throw 'Unexpected adComponentCreativeScanningMetadata';
+    if (parsed.has('adComponentSizes'))
+      throw 'Unexpected adComponentSizes';
+    if (parsed.has('adComponentBuyer'))
+      throw 'Unexpected adComponentBuyer';
+  `;
+
+  const auctionConfigOverrides = {
+    interestGroupBuyers : [bidder_origin],
+    trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+    sendCreativeScanningMetadata: true,
+    decisionLogicURL: createDecisionScriptURL(uuid, {scoreAd: scoreAdBody})
+  };
+
+  await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
+}, 'Creative scanning metadata - basic data flow');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL =
+      createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'url');
+
+  const bidder_origin = OTHER_ORIGIN1;
+
+  await joinCrossOriginInterestGroup(
+      test, uuid, bidder_origin,
+      {ads: [{renderURL: renderURL}]});
+
+  const scoreAdBody = `
+    ${makeParseHelper(renderURL)}
+    if (parsed.get('renderUrls') !== '${renderURL}')
+      throw 'Wrong URL';
+    if (parsed.get('adCreativeScanningMetadata') !== '')
+      throw 'Wrong creative scanning metadata';
+    if (parsed.get('adSizes') !== ',')
+      throw 'Wrong adSizes';
+    if (parsed.get('adBuyer') !== '${bidder_origin}')
+      throw 'Wrong adBuyer';
+    if (parsed.has('adComponentRenderUrls'))
+      throw 'Unexpected adComponentRenderUrls';
+    if (parsed.has('adComponentCreativeScanningMetadata'))
+      throw 'Unexpected adComponentCreativeScanningMetadata';
+    if (parsed.has('adComponentSizes'))
+      throw 'Unexpected adComponentSizes';
+    if (parsed.has('adComponentBuyer'))
+      throw 'Unexpected adComponentBuyer';
+  `;
+
+  const auctionConfigOverrides = {
+    interestGroupBuyers : [bidder_origin],
+    trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+    sendCreativeScanningMetadata: true,
+    decisionLogicURL: createDecisionScriptURL(uuid, {scoreAd: scoreAdBody})
+  };
+
+  await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
+}, 'Creative scanning metadata - sending enabled but no metadata specified');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL =
+      createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'url');
+
+  await joinInterestGroup(
+      test, uuid,
+      {ads: [{renderURL: renderURL, creativeScanningMetadata: 'hello'}]});
+
+  const scoreAdBody = `
+    ${makeParseHelper(renderURL)}
+    if (parsed.get('renderUrls') !== '${renderURL}')
+      throw 'Wrong URL';
+    if (parsed.has('adCreativeScanningMetadata'))
+      throw 'Unexpected creative scanning metadata';
+    if (parsed.has('adSizes'))
+      throw 'Unexpected adSizes';
+    if (parsed.has('adBuyer'))
+      throw 'Unexpected adBuyer';
+    if (parsed.has('adComponentRenderUrls'))
+      throw 'Unexpected adComponentRenderUrls';
+    if (parsed.has('adComponentCreativeScanningMetadata'))
+      throw 'Unexpected adComponentCreativeScanningMetadata';
+    if (parsed.has('adComponentSizes'))
+      throw 'Unexpected adComponentSizes';
+    if (parsed.has('adComponentBuyer'))
+      throw 'Unexpected adComponentBuyer';
+  `;
+
+  const auctionConfigOverrides = {
+    trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+    sendCreativeScanningMetadata: false,
+    decisionLogicURL: createDecisionScriptURL(uuid, {scoreAd: scoreAdBody})
+  };
+
+  await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
+}, 'Creative scanning metadata - disabled');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL =
+      createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'url');
+
+  const generateBidBody = `
+    return {
+      bid: 1,
+      render: {
+        url: interestGroup.ads[0].renderURL,
+        width: '100px',
+        height: '10sh'
+      }
+    };
+  `;
+
+  await joinInterestGroup(test, uuid, {
+    ads: [{
+      renderURL: renderURL,
+      creativeScanningMetadata: 'hello',
+      sizeGroup: 'flexible'
+    }],
+    sizeGroups: {'flexible': ['small', 'big']},
+    adSizes: {
+      'small': {width: '100px', height: '10sh'},
+      'big': {width: '50sw', height: '200px'},
+    },
+    biddingLogicURL: createBiddingScriptURL({generateBid: generateBidBody})
+  });
+
+  const scoreAdBody = `
+    ${makeParseHelper(renderURL)}
+    if (parsed.get('renderUrls') !== '${renderURL}')
+      throw 'Wrong URL';
+    if (parsed.get('adCreativeScanningMetadata') !== 'hello')
+      throw 'Wrong creative scanning metadata';
+    if (parsed.get('adSizes') !== '100px,10sh')
+      throw 'Wrong adSizes';
+    if (parsed.get('adBuyer') !== '${window.location.origin}')
+      throw 'Wrong adBuyer';
+    if (parsed.has('adComponentRenderUrls'))
+      throw 'Unexpected adComponentRenderUrls';
+    if (parsed.has('adComponentCreativeScanningMetadata'))
+      throw 'Unexpected adComponentCreativeScanningMetadata';
+    if (parsed.has('adComponentSizes'))
+      throw 'Unexpected adComponentSizes';
+    if (parsed.has('adComponentBuyer'))
+      throw 'Unexpected adComponentBuyer';
+  `;
+
+  const auctionConfigOverrides = {
+    trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+    sendCreativeScanningMetadata: true,
+    decisionLogicURL: createDecisionScriptURL(uuid, {scoreAd: scoreAdBody})
+  };
+
+  await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
+}, 'Creative scanning metadata - ad size');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL =
+      createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'url');
+  const componentURL1 = createRenderURL(
+      uuid, /*script=*/null, /*signalsParam=*/'url,component1');
+  const componentURL2 = createRenderURL(
+      uuid, /*script=*/null, /*signalsParam=*/'url,component2');
+
+  const generateBidBody = `
+    return {
+      bid: 1,
+      render: {
+        url: interestGroup.ads[0].renderURL,
+      },
+      'adComponents': [
+        {url: '${componentURL1}'},
+        {url: '${componentURL2}', width: '50sw', height: '200px'},
+      ]
+    };
+  `;
+
+  await joinInterestGroup(test, uuid, {
+    ads: [{
+      renderURL: renderURL,
+      creativeScanningMetadata: 'hello',
+      sizeGroup: 'flexible'
+    }],
+    adComponents: [
+      {
+        renderUrl: componentURL1,
+        sizeGroup: 'flexible',
+        creativeScanningMetadata: 'c1'
+      },
+      {
+        renderUrl: componentURL2,
+        sizeGroup: 'flexible',
+        creativeScanningMetadata: 'c2'
+      }
+    ],
+    sizeGroups: {'flexible': ['small', 'big']},
+    adSizes: {
+      'small': {width: '100px', height: '10sh'},
+      'big': {width: '50sw', height: '200px'},
+    },
+    biddingLogicURL: createBiddingScriptURL({generateBid: generateBidBody})
+  });
+
+  const scoreAdBody = `
+    ${makeParseHelper(renderURL)}
+    if (parsed.get('renderUrls') !== '${renderURL}')
+      throw 'Wrong URL';
+    if (parsed.get('adCreativeScanningMetadata') !== 'hello')
+      throw 'Wrong creative scanning metadata';
+    if (parsed.get('adSizes') !== ',')
+      throw 'Wrong adSizes';
+    if (parsed.get('adBuyer') !== '${window.location.origin}')
+      throw 'Wrong adBuyer';
+
+    // We have to be careful here since we don't order which order the
+    // components are going to be reported in; so we normalize them and sort
+    // them.
+    let adComponentRenderUrls = parsed.get('adComponentRenderUrls').split(',');
+    let adComponentCreativeScanningMetadata =
+        parsed.get('adComponentCreativeScanningMetadata').split(',');
+    let adComponentSizes = parsed.get('adComponentSizes').split(',');
+    let adComponentBuyer = parsed.get('adComponentBuyer').split(',');
+
+    if (adComponentCreativeScanningMetadata.length !=
+        adComponentRenderUrls.length) {
+      throw 'Wrong adComponentCreativeScanningMetadata.length';
+    }
+
+    if (adComponentSizes.length !== 2 * adComponentRenderUrls.length) {
+      throw 'Wrong adComponentSizes.length';
+    }
+
+    if (adComponentBuyer.length !== adComponentRenderUrls.length) {
+      throw 'Wrong adComponentBuyer.length';
+    }
+
+    let composed = [];
+    for (let i = 0; i < adComponentRenderUrls.length; ++i) {
+      let entry = 'url:' + adComponentRenderUrls[i] +
+          '; creativeScanningMetadata:' +
+          adComponentCreativeScanningMetadata[i] +
+          '; size:' + adComponentSizes[2*i] + 'x' + adComponentSizes[2*i+1] +
+          '; buyer:' + adComponentBuyer[i];
+      entry = entry.replaceAll('${componentURL1}', 'componentURL1');
+      entry = entry.replaceAll('${componentURL2}', 'componentURL2');
+      entry = entry.replaceAll('${window.location.origin}', 'buyer');
+      composed.push(entry);
+    }
+    composed.sort();
+    if (composed.length !== 2) {
+      throw 'Wrong # of component entries overall';
+    }
+    if (composed[0] !==
+        'url:componentURL1; creativeScanningMetadata:c1; size:x; buyer:buyer') {
+      throw 'Wrong component 0';
+    }
+    if (composed[1] !==
+        'url:componentURL2; creativeScanningMetadata:c2; size:50swx200px; ' +
+        'buyer:buyer') {
+      throw 'Wrong component 1';
+    }
+  `;
+
+  const auctionConfigOverrides = {
+    trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+    sendCreativeScanningMetadata: true,
+    decisionLogicURL: createDecisionScriptURL(uuid, {scoreAd: scoreAdBody})
+  };
+
+  await runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides);
+}, 'Creative scanning metadata - ad components');
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html
index fbb7adbbb92..9bcac1f3bfc 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.clear.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'clear';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html
index a769d1fa61c..fad9701dfbf 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.copy.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html
index c285bfe3893..b6f6f745a35 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.destination-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html
index 7089c30a0d7..b370cd8e6d8 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.destination-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html
index 75db37c67f6..c5c13b49800 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.destination-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-out';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html
index af0e0488a2a..186a9676170 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.destination-over.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-over';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html
index 9dfb7592ab9..622e0d1bdaa 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.lighter.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'lighter';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html
index 120cd64ce7a..fe990661fa5 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.source-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-atop';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html
index 342413686d6..15679fefa27 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.source-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html
index f82e45775cf..2728477500e 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.source-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html
index 44b30c0fdd8..3f8bfc3db91 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.source-over.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-over';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html
index b55a605ea4f..ba0a3575c4f 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html
@@ -17,21 +17,25 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.canvas.xor.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
 
-  var canvas2 = document.createElement('canvas');
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  const canvas2 = document.createElement('canvas');
   canvas2.width = canvas.width;
   canvas2.height = canvas.height;
-  var ctx2 = canvas2.getContext('2d');
-  ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const ctx2 = canvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'xor';
   ctx.drawImage(canvas2, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html
index 0c353f5d6b3..b990e32b541 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html
index afc73376ccb..960b59cd79f 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html
index 82e6e1a9ceb..113c9d04de0 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html
index 519dec749a4..325fa7198b7 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html
index 95c6be78467..4774edf25f4 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html
index f3b83e30f98..24744032337 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html
index 87ddf286572..9cc05d68b0c 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html
index be9ccbdad4b..3698cf5363e 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html
index e1837904637..b54bd07cb9a 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html
index e943a7eb21d..11b66cfab75 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html
index fa5054311c2..55d217c6744 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html
index 3464088c48e..fb4e3df65f5 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html
@@ -27,8 +27,7 @@ _addTest(function(canvas, ctx) {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html
index 1a562e27404..94e6dad1fba 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.clear.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'clear';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html
index 809b8e37bb4..2e0e7f22d51 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.copy.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html
index b23f9fab42b..c2869e315c3 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.destination-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html
index 707d3e17536..e5c0065ec84 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.destination-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html
index 7bbc3c14c29..878d52134c0 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.destination-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-out';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html
index 88290edf8e9..2918a7d7cb6 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.destination-over.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-over';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html
index c5f35859c77..7f299a97b0b 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.lighter.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'lighter';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html
index 204365b2453..6d83a674cf3 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.source-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-atop';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html
index c14a5d31b13..c3c0428d345 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.source-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html
index ccc1b0b5b5e..8a0db7b95ed 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.source-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html
index e9250a35149..5380a1d4a0b 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.source-over.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-over';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html
index df435be55ab..6c7bf9f026b 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html
@@ -17,16 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.image.xor.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'xor';
-  ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
   _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
-<img src="/images/yellow75.png" id="yellow75.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html
index 4f8ade8a8ad..bdb3de546c5 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html
@@ -17,17 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.image.copy.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-  _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html
index d728a4f2fed..b294010d8d1 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html
@@ -17,17 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.image.destination-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-  _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html
index 644be0bdb4c..03bb30602f3 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html
@@ -17,17 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.image.destination-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-  _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html
index 8828c42fe20..1e23ead0960 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html
@@ -17,17 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.image.source-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-  _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html
index 7bb4734be41..fa0bc40b309 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html
@@ -17,17 +17,20 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.image.source-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-  _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html
index 9dd5d0bc6b0..4d9ccf0df50 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html
@@ -17,17 +17,21 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.pattern.copy.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
   ctx.fillRect(0, 50, 100, 50);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html
index a0637ffb54d..f15587a449d 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html
@@ -17,17 +17,21 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.pattern.destination-atop.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
   ctx.fillRect(0, 50, 100, 50);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html
index ed65ba9a057..4a9387c6a4a 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html
@@ -17,17 +17,21 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.pattern.destination-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
   ctx.fillRect(0, 50, 100, 50);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html
index cc42f36d59f..edb578c0238 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html
@@ -17,17 +17,21 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.pattern.source-in.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
   ctx.fillRect(0, 50, 100, 50);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html
index b192208e5fd..4b1b7ca83fd 100644
--- a/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html
+++ b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html
@@ -17,17 +17,21 @@
 <p class="output expectedtext">Expected output:<p><img src="2d.composite.uncovered.pattern.source-out.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-_addTest(function(canvas, ctx) {
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
   ctx.fillRect(0, 50, 100, 50);
   _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
-<img src="/images/yellow.png" id="yellow.png" class="resource">
 
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction-ref.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction-ref.html
new file mode 100644
index 00000000000..e7f685244d9
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction-ref.html
@@ -0,0 +1,24 @@
+<!doctype HTML>
+<html>
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test Reference:  The direction attribute.</title>
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <script>
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.getContext("2d");
+
+        ctx.font = "25px serif";
+        ctx.direction = "rtl";
+        ctx.fillText("ABC!", 60, 50);
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html
new file mode 100644
index 00000000000..c6eee5d9a8c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.canvas.html
@@ -0,0 +1,29 @@
+<!doctype HTML>
+<html dir="ltr">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test: The direction attribute inherits from the canvas</title>
+    <link rel="match" href="canvas.2d.direction-ref.html"/>
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help"
+      href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="When the canvas element has a dir attribute, override the document."/>
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.getContext("2d");
+
+        // The default for direction is inherit
+        ctx.font = "25px serif";
+        ctx.fillText("ABC!", 60, 50);
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas dir="rtl" id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html
new file mode 100644
index 00000000000..0499563763a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.disconnected.canvas.html
@@ -0,0 +1,38 @@
+<!doctype HTML>
+<html>
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test: The direction attribute inherits from a disconnected canvas element</title>
+    <link rel="match" href="canvas.2d.direction-ref.html"/>
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help"
+      href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="Verify that a disconnected canvas with no style uses the canvas direction."/>
+    <style>
+      canvas {
+        position: absolute;
+        top: 8px;
+        left: 8px;
+      }
+    </style>
+  </head>
+  <body>
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <script type="text/javascript">
+      var canvas = document.createElement("canvas");
+      canvas.setAttribute("dir", "rtl");
+      canvas.setAttribute("width", "300");
+      canvas.setAttribute("height", "150");
+      var ctx = canvas.getContext("2d");
+
+      // The default for direction is inherit
+      ctx.font = "25px serif";
+      ctx.fillText("ABC!", 60, 50);
+
+      document.body.appendChild(canvas);
+    </script>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html
new file mode 100644
index 00000000000..c9a3e3bdfd0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.document.html
@@ -0,0 +1,34 @@
+<!doctype HTML>
+<html dir="rtl">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  The direction attribute inherits correctly</title>
+    <link rel="match" href="canvas.2d.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="When the canvas element has no direction attribute, inherit it from the document." />
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.getContext("2d");
+
+        // The default for direction is inherit, so no need to set any text styles
+        ctx.font = "25px serif";
+        ctx.fillText("ABC!", 60, 50);
+      }
+    </script>
+    <style>
+      canvas {
+        position: absolute;
+        top: 8px;
+        left: 8px;
+      }
+    </style>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html
new file mode 100644
index 00000000000..8405f56443e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.direction.inherit.style.html
@@ -0,0 +1,33 @@
+<!doctype HTML>
+<html>
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  The direction attribute inherits from the canvas style</title>
+    <link rel="match" href="canvas.2d.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="When the canvas element has a direction CSS property it should override the dir attribute." />
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.getContext("2d");
+
+        // The default for direction is inherit
+        ctx.font = "25px serif";
+        ctx.fillText("ABC!", 60, 50);
+      }
+    </script>
+    <style>
+      canvas {
+        direction: rtl;
+      }
+    </style>
+  </head>
+  <body onload="runTest()">
+    <canvas dir="ltr" id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html
index 72dc4bb6947..b17173a0b89 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'clear';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'clear';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js
index 2f9fb92da1e..d2c449e0961 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'clear';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'clear';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html
index cfc5a33de1b..88454419958 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'copy';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'copy';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js
index 5b071665ce4..9362cbb7ddb 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'copy';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'copy';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html
index 3a1f86c8ed9..e26a3929008 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-atop';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-atop';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js
index 58828619a32..76774a4f85d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-atop';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-atop';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html
index c8480a961dc..dfb57444b31 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-in';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-in';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js
index 4e2ec058eca..597e4f074ae 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-in';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-in';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html
index f35bc25e419..76b5b08c04c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-out';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-out';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js
index bc7be056a1d..bcb134ed40b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-out';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-out';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html
index 676b43608d9..0df9dc542e2 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-over';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-over';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js
index c1d15a09591..1bd55fac506 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'destination-over';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'destination-over';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html
index 4c913506faf..798221d01a9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'lighter';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'lighter';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js
index df494f22d33..6cb3c64820e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'lighter';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'lighter';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html
index f6e03874001..72f08fde674 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-atop';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-atop';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js
index 781a89c1b6c..74a2050ca16 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-atop';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-atop';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html
index ea7acd8bbbc..2b8fafa7b44 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-in';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-in';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js
index 484399acfcc..f9e63d57874 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-in';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-in';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html
index 7b2de941de1..185ed298d6e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-out';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-out';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js
index d0d6cc12e95..300926c9cd4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-out';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-out';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html
index fe833737eef..f37338b6625 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-over';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-over';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js
index 848fbf3becc..dbbec70c5f0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'source-over';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'source-over';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html
index d89e6de267f..db1af5399cd 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html
@@ -11,37 +11,22 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'xor';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'xor';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js
index 250bba4bacc..b6e33df894c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js
@@ -6,36 +6,20 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
-  var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-  var ctx2 = offscreenCanvas2.getContext('2d');
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx2.drawImage(bitmap, 0, 0);
-          ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-          ctx.fillRect(0, 0, 100, 50);
-          ctx.globalCompositeOperation = 'xor';
-          ctx.drawImage(offscreenCanvas2, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+  const ctx2 = offscreenCanvas2.getContext('2d');
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx2.drawImage(bitmap, 0, 0);
+  ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+  ctx.fillRect(0, 0, 100, 50);
+  ctx.globalCompositeOperation = 'xor';
+  ctx.drawImage(offscreenCanvas2, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html
index ba555feeb94..7bf385e0002 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js
index abae05ac241..ba85656feb1 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html
index 061a2560034..053ab46ed77 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js
index dfebd98a6b7..f6ec2a5f0a7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html
index 19b05ef098a..54089dc4710 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js
index 9c8fa79c5aa..19459117b51 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html
index f57414616d5..5aa3ae5eb23 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js
index a98624f8248..b0b1c71abb3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html
index bdf8c7bc905..8b201109b82 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js
index 0cf915d1c77..3fad74e4739 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html
index 4c484b667df..47b99c2e87f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js
index b1b5eee6f4e..9e5cb738a47 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html
index 8a1ed3f2149..2c1d60bbaba 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js
index 8576d9db7c4..5da6bb8602d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html
index 0bc3e975e29..9fe31e892ec 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js
index fd220f52b3c..21aa591ca34 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html
index f91862bf707..a8ae684294a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js
index 0c61fb77945..ea9d5b64d01 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html
index b93ebf368d0..2284d05b424 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js
index ec57663af18..97d85978745 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html
index 90125c003a1..98ec1da6a40 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js
index 15c322ee597..e4ff4a3dd83 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html
index d35b53c9e44..102b3857fc2 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html
@@ -28,8 +28,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js
index 30bae44aa99..d3b39219810 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js
@@ -23,8 +23,7 @@ t.step(function() {
   ctx.clip();
   ctx.fillStyle = '#f00';
   ctx.fillRect(0, 0, 50, 50);
-  _assertPixel(canvas, 25,25, 0,255,0,255);
-  _assertPixel(canvas, 75,25, 0,255,0,255);
+  _assertPixel(canvas, 50,25, 0,255,0,255);
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html
index 2582a6bfaf0..cf7720a1701 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'clear';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js
index f152cee739b..e60b521f6a9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'clear';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html
index d0fe687a1df..9645e2ada2d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js
index 05ccab17116..a6b90d892e8 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,191, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html
index 78d352ea6e5..100921a4ab3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js
index 43648142d50..99962b16fc4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 128,255,128,191, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html
index 8f8e188a950..b81df3e2efa 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js
index 2787237c569..39d11f567f5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html
index 410a019ec7a..76c02812987 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js
index e030f533a05..843652a86b8 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 0,255,255,32, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html
index c9e33da8855..e17fe382f9e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-over';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js
index 964df4ae8bc..3bb9d4ee372 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-over';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 109,255,146,223, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html
index 15176dc3666..ebe4eda9ec5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'lighter';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js
index f3828b6411d..d361064a1ce 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'lighter';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,128,255, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html
index 9d8b850972e..19b42105f7e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js
index 7b1618e3f96..067bbfa682e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html
index 1d63fc17df1..5fd392ec754 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js
index 9accfb35c46..7b5ffbc6327 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html
index 5ab29d018f0..38b23d9b152 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js
index 8e8d9116bb1..fe785a5e24a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 255,255,0,96, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html
index 55ad292bf39..5371724d488 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-over';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js
index 679aa19ef98..a9304b305ef 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-over';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 219,255,36,223, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html
index edc42d5b057..f0a28e24fe9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,21 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'xor';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
 
-});
+}, "");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js
index 83a04928b5d..c8822bc98f5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js
@@ -6,33 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'xor';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow75.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 0, 0);
-          _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow75.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 0, 0);
+  _assertPixelApprox(canvas, 50,25, 191,255,64,128, 5);
+}, "");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html
index 4311bb39003..566e5abb477 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js
index 0e56b4f71d4..e93962ce6d6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js
@@ -6,34 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html
index 6453ff3c572..0e014c80f3d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js
index 4c4a0a4c951..3cea3620424 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js
@@ -6,34 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html
index aebd6f86d81..3a3ac4a400c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js
index af1dc50c9bb..d96c112d646 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js
@@ -6,34 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html
index 95d23038a8b..0b54d39320c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js
index 490ce4d0012..5b6bad7d38c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js
@@ -6,34 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html
index 573ab8acdb0..bae97a6779f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,11 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js
index 3647e34574b..fa44cb7556d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js
@@ -6,34 +6,17 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-          _assertPixelApprox(canvas, 15,15, 0,0,0,0, 5);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html
index bf15282f873..e9a0d85d952 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,12 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js
index a5944be6954..bd59189e6d3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js
@@ -6,34 +6,18 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'copy';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html
index 015d6b6c8d1..a2250a89720 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,12 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
index c34c748059a..17ebb53db00 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
@@ -6,34 +6,18 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-atop';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html
index 2747f851a5b..558e14aab0b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,12 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
index 10042455a79..62ae7f569d7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
@@ -6,34 +6,18 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'destination-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html
index edcd6bf6a2b..63b432c065d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,12 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js
index c658da8c991..03a3b2f072f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js
@@ -6,34 +6,18 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-in';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html
index 35e7b589ea9..a714dc648ce 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html
@@ -11,12 +11,7 @@
 
 
 <script>
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
+promise_test(async t => {
 
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
@@ -24,22 +19,12 @@ t.step(function() {
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
 
-});
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js
index 86baf476feb..0fff2442913 100644
--- a/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js
@@ -6,34 +6,18 @@
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
-var t_pass = t.done.bind(t);
-var t_fail = t.step_func(function(reason) {
-    throw reason;
-});
-t.step(function() {
-
+promise_test(async t => {
   var canvas = new OffscreenCanvas(100, 50);
   var ctx = canvas.getContext('2d');
 
   ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
   ctx.fillRect(0, 0, 100, 50);
   ctx.globalCompositeOperation = 'source-out';
-  var promise = new Promise(function(resolve, reject) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", '/images/yellow.png');
-      xhr.responseType = 'blob';
-      xhr.send();
-      xhr.onload = function() {
-          resolve(xhr.response);
-      };
-  });
-  promise.then(function(response) {
-      return createImageBitmap(response).then(bitmap => {
-          ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-          ctx.fillRect(0, 50, 100, 50);
-          _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
-      });
-  }).then(t_pass, t_fail);
-});
+  const response = await fetch('/images/yellow.png')
+  const blob = await response.blob();
+  const bitmap = await createImageBitmap(blob);
+  ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+  ctx.fillRect(0, 50, 100, 50);
+  _assertPixelApprox(canvas, 50,25, 0,0,0,0, 5);
+}, "Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html
new file mode 100644
index 00000000000..8949caa8486
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction-ref.html
@@ -0,0 +1,22 @@
+<!doctype HTML>
+<html>
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test Reference:  The direction attribute in an offscreen canvas</title>
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <script>
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.getContext("2d");
+
+        ctx.font = "25px serif";
+        ctx.direction = "rtl";
+        ctx.fillText("ABC!", 60, 50);
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html
new file mode 100644
index 00000000000..422cbac3082
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.direction.html
@@ -0,0 +1,37 @@
+<!doctype HTML>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  The direction attribute in offscreen canvas</title>
+    <link rel="match" href="canvas.2d.offscreen.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="An offscreen canvas respects the direction text attribute." />
+    <script src="/common/reftest-wait.js"></script>
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var bitmap_ctx = canvas.getContext("bitmaprenderer");
+
+        var offscreen = new OffscreenCanvas(300, 150);
+        var offscreen_ctx = offscreen.getContext('2d');
+
+        offscreen_ctx.font = "25px serif";
+        offscreen_ctx.direction = "rtl";
+        offscreen_ctx.fillText("ABC!", 60, 50);
+
+        const bitmap = offscreen.transferToImageBitmap();
+        bitmap_ctx.transferFromImageBitmap(bitmap);
+
+        requestAnimationFrame(() => takeScreenshot());
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html
new file mode 100644
index 00000000000..670a8036eac
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.document.html
@@ -0,0 +1,38 @@
+<!doctype HTML>
+<html dir="rtl" class="reftest-wait">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  The direction attribute inherits from the document</title>
+    <link rel="match" href="canvas.2d.offscreen.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="An offscreen transferred from a canvas inherits the document dir when the canvas element has none." />
+    <script src="/common/reftest-wait.js"></script>
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.transferControlToOffscreen().getContext("2d");
+
+        // The default for direction is inherit
+        ctx.font = "25px serif";
+        ctx.fillText("ABC!", 60, 50);
+
+        requestAnimationFrame(() => takeScreenshot());
+      }
+    </script>
+    <style>
+      canvas {
+        position: absolute;
+        top: 8px;
+        left: 8px;
+      }
+    </style>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html
new file mode 100644
index 00000000000..2e32faf863b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.direction.inherit.html
@@ -0,0 +1,30 @@
+<!doctype HTML>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  Direction inherit in a transferred offscreen</title>
+    <link rel="match" href="canvas.2d.offscreen.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="An offscreen transferred from that canvas inherits the canvas direction."/>
+    <script src="/common/reftest-wait.js"></script>
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var ctx = canvas.transferControlToOffscreen().getContext("2d");
+
+        ctx.font = "25px serif";
+        ctx.fillText("ABC!", 60, 50);
+
+        requestAnimationFrame(() => takeScreenshot());
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas dir="rtl" id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html
new file mode 100644
index 00000000000..c35359b5808
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.direction.html
@@ -0,0 +1,30 @@
+<!doctype HTML>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <head>
+    <title>HTML5 Canvas Test:  The direction attribute is respected in offscreen worker canvas</title>
+    <link rel="match" href="canvas.2d.offscreen.direction-ref.html" />
+    <link rel="author" href="mailto:schenney@chromium.org"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+    <meta name="assert" content="An offscreen canvas in a worker respects the direction text attribute." />
+    <script src="/common/reftest-wait.js"></script>
+    <script type="text/javascript">
+      function runTest()
+      {
+        var canvas = document.getElementById("canvas1");
+        var offscreen = canvas.transferControlToOffscreen();
+
+        const worker = new Worker('text-direction-worker.js');
+        worker.postMessage({canvas: offscreen}, [offscreen]);
+
+        requestAnimationFrame(requestAnimationFrame(() => takeScreenshot()));
+      }
+    </script>
+  </head>
+  <body onload="runTest()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/text-direction-worker.js b/tests/wpt/tests/html/canvas/offscreen/manual/text/text-direction-worker.js
new file mode 100644
index 00000000000..9375ec16f23
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/text-direction-worker.js
@@ -0,0 +1,8 @@
+self.onmessage = function(e) {
+  offscreen = e.data.canvas;
+  offscreen_ctx = offscreen.getContext("2d");
+
+  offscreen_ctx.font = "25px serif";
+  offscreen_ctx.direction = "rtl";
+  offscreen_ctx.fillText("ABC!", 60, 50);
+}
\ No newline at end of file
diff --git a/tests/wpt/tests/html/canvas/tools/gentestutils.py b/tests/wpt/tests/html/canvas/tools/gentestutils.py
index 8fa33e3975c..ee0385fc701 100644
--- a/tests/wpt/tests/html/canvas/tools/gentestutils.py
+++ b/tests/wpt/tests/html/canvas/tools/gentestutils.py
@@ -280,7 +280,39 @@ def _generate_test(test: Mapping[str, str], templates: Mapping[str, str],
     else:
         context_args = "'2d'"
 
+    begin_test_worker = None
+    if test.get('test_type') == 'promise':
+        if is_offscreen_canvas:
+            begin_test = 'promise_test(async t => {\n'
+            begin_test_worker = 'promise_test(async t => {'
+        else:
+            begin_test = textwrap.dedent('''\
+                promise_test(async t => {
+
+                  var canvas = document.getElementById('c');
+                  var ctx = canvas.getContext('2d');''')
+        end_test = '}, "%(escaped_desc)s");' % {'escaped_desc': escaped_desc}
+    else:
+        if is_offscreen_canvas:
+            begin_test = textwrap.dedent('''\
+                var t = async_test("%(escaped_desc)s");
+                var t_pass = t.done.bind(t);
+                var t_fail = t.step_func(function(reason) {
+                    throw reason;
+                });
+                t.step(function() {
+                ''' % {'escaped_desc': escaped_desc})
+            end_test = '});'
+        else:
+            begin_test = textwrap.dedent('''\
+                var t = async_test("%(escaped_desc)s");
+                _addTest(function(canvas, ctx) {''' % {'escaped_desc':
+                                                       escaped_desc})
+            end_test = '}%(attributes)s);' % {'attributes': attributes}
+
     template_params = {
+        'begin_test': begin_test,
+        'end_test': end_test,
         'name': name,
         'desc': desc,
         'escaped_desc': escaped_desc,
@@ -307,6 +339,9 @@ def _generate_test(test: Mapping[str, str], templates: Mapping[str, str],
     if is_offscreen_canvas:
         pathlib.Path(f'{test_path}.html').write_text(
             templates['offscreen'] % template_params, 'utf-8')
+
+        if begin_test_worker:
+            template_params['begin_test'] = begin_test_worker
         pathlib.Path(f'{test_path}.worker.js').write_text(
             templates['worker'] % template_params, 'utf-8')
     else:
diff --git a/tests/wpt/tests/html/canvas/tools/templates.yaml b/tests/wpt/tests/html/canvas/tools/templates.yaml
index 4ca690e2b42..dcef1b85ecf 100644
--- a/tests/wpt/tests/html/canvas/tools/templates.yaml
+++ b/tests/wpt/tests/html/canvas/tools/templates.yaml
@@ -12,19 +12,13 @@ offscreen: |
 
     %(notes)s
     <script>
-    var t = async_test("%(escaped_desc)s");
-    var t_pass = t.done.bind(t);
-    var t_fail = t.step_func(function(reason) {
-        throw reason;
-    });
-    t.step(function() {
-
+    %(begin_test)s
       var canvas = new OffscreenCanvas(%(width)s, %(height)s);
       var ctx = canvas.getContext(%(context_args)s);
 
     %(code)s
 
-    });
+    %(end_test)s
     </script>
 
 
@@ -37,18 +31,12 @@ worker: |
     importScripts("/resources/testharness.js");
     importScripts("/html/canvas/resources/canvas-tests.js");
 
-    var t = async_test("%(escaped_desc)s");
-    var t_pass = t.done.bind(t);
-    var t_fail = t.step_func(function(reason) {
-        throw reason;
-    });
-    t.step(function() {
-
+    %(begin_test)s
       var canvas = new OffscreenCanvas(%(width)s, %(height)s);
       var ctx = canvas.getContext(%(context_args)s);
 
     %(code)s
-    });
+    %(end_test)s
     done();
 
 
@@ -72,11 +60,10 @@ element: |
     %(expected)s
     <ul id="d"></ul>
     <script>
-    var t = async_test("%(escaped_desc)s");
-    _addTest(function(canvas, ctx) {
+    %(begin_test)s
 
     %(code)s
 
-    }%(attributes)s);
+    %(end_test)s
     </script>
     %(images)s
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
index 65ef32cb31b..091f61147df 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
@@ -83,12 +83,15 @@
             expected = calc_output(src, dest, FA_code, FB_code)
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
-                'images': [ 'yellow75.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
+    const response = await fetch('/images/yellow75.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.drawImage(bitmap, 0, 0);
     @assert pixel 50,25 ==~ %s +/- 5;
     """ % (dest, op, to_test(expected)),
                 'expected': """size 100 50
@@ -103,13 +106,16 @@
             expected = calc_output(src, dest, FA_code, FB_code)
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
-                'images': [ 'yellow75.png' ],
+                'test_type': 'promise',
                 'code': """
-    var canvas2 = document.createElement('canvas');
+    const canvas2 = document.createElement('canvas');
     canvas2.width = canvas.width;
     canvas2.height = canvas.height;
-    var ctx2 = canvas2.getContext('2d');
-    ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+    const ctx2 = canvas2.getContext('2d');
+    const response = await fetch('/images/yellow75.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx2.drawImage(bitmap, 0, 0);
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
@@ -154,15 +160,17 @@
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
                 'desc': 'drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.',
-                'images': [ 'yellow.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10);
-    @assert pixel 15,15 ==~ %s +/- 5;
+    const response = await fetch('/images/yellow.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
     @assert pixel 50,25 ==~ %s +/- 5;
-    """ % (dest, op, to_test(expected0), to_test(expected0)),
+    """ % (dest, op, to_test(expected0)),
                 'expected': """size 100 50
     cr.set_source_rgba(%s)
     cr.rectangle(0, 0, 100, 50)
@@ -199,12 +207,15 @@
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
                 'desc': 'Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.',
-                'images': [ 'yellow.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+    const response = await fetch('/images/yellow.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     @assert pixel 50,25 ==~ %s +/- 5;
     """ % (dest, op, to_test(expected0)),
@@ -227,8 +238,7 @@
     ctx.clip();
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 50, 50);
-    @assert pixel 25,25 == 0,255,0,255;
-    @assert pixel 75,25 == 0,255,0,255;
+    @assert pixel 50,25 == 0,255,0,255;
     """ % (op),
                 'expected': 'green'
         } )
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
index 302660959a2..f6cfa90955c 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
@@ -79,26 +79,16 @@
             expected = calc_output(src, dest, FA_code, FB_code)
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
-                'images': [ 'yellow75.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    var promise = new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", '/images/yellow75.png');
-        xhr.responseType = 'blob';
-        xhr.send();
-        xhr.onload = function() {
-            resolve(xhr.response);
-        };
-    });
-    promise.then(function(response) {
-        return createImageBitmap(response).then(bitmap => {
-            ctx.drawImage(bitmap, 0, 0);
-            @assert pixel 50,25 ==~ %s +/- 5;
-        });
-    }).then(t_pass, t_fail);
+    const response = await fetch('/images/yellow75.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.drawImage(bitmap, 0, 0);
+    @assert pixel 50,25 ==~ %s +/- 5;
     """ % (dest, op, to_test(expected)),
             } )
 
@@ -107,29 +97,19 @@
             expected = calc_output(src, dest, FA_code, FB_code)
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
-                'images': [ 'yellow75.png' ],
+                'test_type': 'promise',
                 'code': """
-    var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
-    var ctx2 = offscreenCanvas2.getContext('2d');
-    var promise = new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", '/images/yellow75.png');
-        xhr.responseType = 'blob';
-        xhr.send();
-        xhr.onload = function() {
-            resolve(xhr.response);
-        };
-    });
-    promise.then(function(response) {
-        return createImageBitmap(response).then(bitmap => {
-            ctx2.drawImage(bitmap, 0, 0);
-            ctx.fillStyle = 'rgba%s';
-            ctx.fillRect(0, 0, 100, 50);
-            ctx.globalCompositeOperation = '%s';
-            ctx.drawImage(offscreenCanvas2, 0, 0);
-            @assert pixel 50,25 ==~ %s +/- 5;
-        });
-    }).then(t_pass, t_fail);
+    const offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height);
+    const ctx2 = offscreenCanvas2.getContext('2d');
+    const response = await fetch('/images/yellow75.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx2.drawImage(bitmap, 0, 0);
+    ctx.fillStyle = 'rgba%s';
+    ctx.fillRect(0, 0, 100, 50);
+    ctx.globalCompositeOperation = '%s';
+    ctx.drawImage(offscreenCanvas2, 0, 0);
+    @assert pixel 50,25 ==~ %s +/- 5;
     """ % (dest, op, to_test(expected)),
             } )
 
@@ -162,28 +142,17 @@
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
                 'desc': 'drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.',
-                'images': [ 'yellow.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    var promise = new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", '/images/yellow.png');
-        xhr.responseType = 'blob';
-        xhr.send();
-        xhr.onload = function() {
-            resolve(xhr.response);
-        };
-    });
-    promise.then(function(response) {
-        return createImageBitmap(response).then(bitmap => {
-            ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
-            @assert pixel 15,15 ==~ %s +/- 5;
-            @assert pixel 50,25 ==~ %s +/- 5;
-        });
-    }).then(t_pass, t_fail);
-    """ % (dest, op, to_test(expected0), to_test(expected0)),
+    const response = await fetch('/images/yellow.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10);
+    @assert pixel 50,25 ==~ %s +/- 5;
+    """ % (dest, op, to_test(expected0)),
             } )
 
     for (name, src, dest) in [ ('uncovered.nocontext', (255, 255, 0, 1.0), (0, 255, 255, 0.5)) ]:
@@ -211,27 +180,17 @@
             tests.append( {
                 'name': '2d.composite.%s.%s' % (name, op),
                 'desc': 'Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.',
-                'images': [ 'yellow.png' ],
+                'test_type': 'promise',
                 'code': """
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     ctx.globalCompositeOperation = '%s';
-    var promise = new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", '/images/yellow.png');
-        xhr.responseType = 'blob';
-        xhr.send();
-        xhr.onload = function() {
-            resolve(xhr.response);
-        };
-    });
-    promise.then(function(response) {
-        return createImageBitmap(response).then(bitmap => {
-            ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
-            ctx.fillRect(0, 50, 100, 50);
-            @assert pixel 50,25 ==~ %s +/- 5;
-        });
-    }).then(t_pass, t_fail);
+    const response = await fetch('/images/yellow.png')
+    const blob = await response.blob();
+    const bitmap = await createImageBitmap(blob);
+    ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat');
+    ctx.fillRect(0, 50, 100, 50);
+    @assert pixel 50,25 ==~ %s +/- 5;
     """ % (dest, op, to_test(expected0)),
             } )
 
@@ -247,8 +206,7 @@
     ctx.clip();
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 50, 50);
-    @assert pixel 25,25 == 0,255,0,255;
-    @assert pixel 75,25 == 0,255,0,255;
+    @assert pixel 50,25 == 0,255,0,255;
     t.done();
     """ % (op),
         } )
diff --git a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html b/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
index 0530956080b..6be3c35ad7a 100644
--- a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
+++ b/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
@@ -63,12 +63,31 @@ async function fetchInFrame(t, frameUrl, url, expected_count) {
   return await future_reports;
 }
 
-async function fetchInWorker(workerOrPort, url) {
+async function fetchInWorker(workerOrPort, url, expected_count) {
+  const reports = [];
   const script =
     `fetch('${url}', {mode: 'no-cors', cache: 'no-store'}).catch(() => {});`;
   const mc = new MessageChannel();
+
+  const receivedEveryReports = new Promise(resolve => {
+    if (expected_count == 0)
+      resolve();
+
+    mc.port1.onmessage = (event) => {
+      reports.push(event.data);
+      if (expected_count <= reports.length)
+        resolve();
+    };
+  });
+
+  // Have the worker execute the script.
   workerOrPort.postMessage({script, port: mc.port2}, [mc.port2]);
-  return (await new Promise(r => mc.port1.onmessage = r)).data;
+
+  await receivedEveryReports;
+  // Wait 500ms more to catch additionnal unexpected reports.
+  await new Promise(r => step_timeout(r, 500));
+
+  return reports;
 }
 
 // We want to test several URLs in various environments (document,
@@ -98,6 +117,37 @@ const ENVIRONMENTS = [{
   run: async (test, url, expected_count) => {
     return await fetchInFrame(test, FRAME_URL, url, expected_count);
   },
+}, {
+  tag: 'dedicated worker',
+  contextUrl: WORKER_URL,
+  run: async (test, url, expected_count) => {
+    const worker = new Worker(WORKER_URL);
+    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
+    test.add_cleanup(() => worker.terminate());
+    return await fetchInWorker(worker, url, expected_count);
+  },
+}, {
+  tag: 'shared worker',
+  contextUrl: WORKER_URL,
+  run: async (test, url, expected_count) => {
+    const worker = new SharedWorker(WORKER_URL);
+    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
+    return await fetchInWorker(worker.port, url, expected_count);
+  },
+}, {
+  tag: 'between service worker and page',
+  contextUrl: REPORTING_FRAME_URL,
+  run: async (test, url, expected_count) => {
+    // Here we use a Service Worker without COEP.
+    const WORKER_URL = `${ORIGIN}${BASE}/sw.js`;
+    const reg = await service_worker_unregister_and_register(
+      test, WORKER_URL, REPORTING_FRAME_URL);
+    test.add_cleanup(() => reg.unregister());
+    const worker = reg.installing || reg.waiting || reg.active;
+    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
+    return await fetchInFrame(
+      test, REPORTING_FRAME_URL, url, expected_count);
+  },
 }];
 
 const CASES = [{
diff --git a/tests/wpt/tests/html/document-isolation-policy/resources/reporting-worker.js b/tests/wpt/tests/html/document-isolation-policy/resources/reporting-worker.js
new file mode 100644
index 00000000000..ff40749cfa6
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/resources/reporting-worker.js
@@ -0,0 +1,19 @@
+function run({script, port}) {
+  const observer = new ReportingObserver((rs) => {
+      for (const r of rs) {
+        port.postMessage(r.toJSON());
+      }
+  });
+  observer.observe();
+
+  // This eval call may generate some reports.
+  eval(script);
+}
+
+// For DedicatedWorker and ServiceWorker
+self.addEventListener('message', (e) => run(e.data));
+
+// For SharedWorker
+self.addEventListener('connect', (e) => {
+  e.ports[0].onmessage = (ev) => run(ev.data);
+});
diff --git a/tests/wpt/tests/html/document-isolation-policy/resources/sw.js b/tests/wpt/tests/html/document-isolation-policy/resources/sw.js
new file mode 100644
index 00000000000..57f0b41ba5b
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/resources/sw.js
@@ -0,0 +1,12 @@
+self.addEventListener('activate', (e) => {
+  e.waitUntil(clients.claim());
+});
+
+self.addEventListener('fetch', (e) => {
+  const url = new URL(e.request.url);
+  if (url.searchParams.has('passthrough')) {
+    return;
+  }
+
+  e.respondWith(fetch(e.request));
+});
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js b/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js
index 26dd584869f..bb58548754c 100644
--- a/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js
@@ -383,7 +383,7 @@ test(() => {
   `);
   let inp = tree.querySelector("input");
   assert_equals(html_direction(inp), "rtl");
-  inp.type = "month";
+  inp.type = "number";
   assert_equals(html_direction(inp), "ltr");
   tree.remove();
 }, 'input direction changes if it stops being auto-directionality form-associated');
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html
index 393170baad8..cbf060d4d0c 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html
@@ -20,6 +20,11 @@ async_test(t => {
     const canvas = frames[0].document.querySelector("canvas");
     canvas.toBlob(new frames[1].Function(`throw new parent.frames[2].Error("PASS");`));
 
+    // Wait until at least one `onerror` fires.
+    t.step_wait_func(() => onerrorCalls.length != 0);
+
+    // Wait for 25ms more in case one other `onerror` fires.  This is inherently
+    // flaky...
     t.step_timeout(() => {
       assert_array_equals(onerrorCalls, ["frame1"]);
       t.done();
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-picker-hover-active-pseudo.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-picker-hover-active-pseudo.tentative.html
new file mode 100644
index 00000000000..4f3570b065f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-picker-hover-active-pseudo.tentative.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/11185">
+<link rel=author href="mailto:jarhar@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<select id=defaultbutton>
+  <option>option</option>
+</select>
+
+<select id=custombutton>
+  <button>button</button>
+  <option>option</option>
+</select>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<script>
+
+['defaultbutton', 'custombutton'].forEach(id => {
+  const select = document.getElementById(id);
+  const option = select.querySelector('option');
+  function assertSupport() {
+    const style = getComputedStyle(document.querySelector('select'));
+    assert_equals(style.appearance, 'base-select',
+      'appearance:base-select must be supported in order to run this test.');
+  }
+
+  promise_test(async () => {
+    assertSupport();
+    await (new test_driver.Actions()
+      .pointerMove(1, 1, {origin: select}))
+      .send();
+    await new Promise(requestAnimationFrame);
+    assert_true(select.matches(':hover'),
+      'select should match :hover.');
+    assert_true(document.body.matches(':hover'),
+      'document.body should match :hover.');
+
+    // sending a test_driver.Actions() which only has a pointerDown() will
+    // automatically add a pointerUp(), so we have to perform an entire click
+    // and check :active inside the mousedown listener instead.
+    let selectMatchedActive = false;
+    let bodyMatchedActive = false;
+    select.addEventListener('mousedown', () => {
+      selectMatchedActive = select.matches(':active');
+      bodyMatchedActive = document.body.matches(':active');
+    });
+    await test_driver.click(select);
+    assert_true(selectMatchedActive,
+      'select should match :active.');
+    assert_true(bodyMatchedActive,
+      'document.body should match :active.');
+
+    await test_driver.click(select);
+    assert_false(select.matches(':open'),
+      'select should be closed at the end of the test.');
+  }, `${id}: select should match :hover and :active when interacting with button.`);
+
+  promise_test(async () => {
+    assertSupport();
+    assert_false(select.matches(':open'),
+      'select should be closed at the start of the test.');
+    await test_driver.click(select);
+    await new Promise(requestAnimationFrame);
+    assert_true(select.matches(':open'),
+      'select should be open after clicking it.');
+
+    await (new test_driver.Actions()
+      .pointerMove(1, 1, {origin: option}))
+      .send();
+    await new Promise(requestAnimationFrame);
+    assert_true(option.matches(':hover'),
+      'option should match :hover.');
+    assert_false(select.matches(':hover'),
+      'select should not match :hover.');
+    assert_false(document.body.matches(':hover'),
+      'document.body should not match :hover.');
+
+    // sending a test_driver.Actions() which only has a pointerDown() will
+    // automatically add a pointerUp(), so we have to perform an entire click
+    // and check :active inside the mousedown listener instead.
+    let optionMatchedActive = false;
+    let selectMatchedActive = false;
+    let bodyMatchedActive = false;
+    option.addEventListener('mousedown', () => {
+      optionMatchedActive = option.matches(':active');
+      selectMatchedActive = select.matches(':active');
+      bodyMatchedActive = document.body.matches(':active');
+    });
+    await (new test_driver.Actions()
+      .pointerMove(1, 1, {origin: option})
+      .pointerDown()
+      .pointerUp())
+      .send();
+    assert_true(optionMatchedActive,
+      'option should match :active.');
+    assert_false(selectMatchedActive,
+      'select should not match :active.');
+    assert_false(bodyMatchedActive,
+      'document.body should not match :active.');
+    assert_false(select.matches(':open'),
+      'select should be closed at the end of the test.');
+  }, `${id}: select should not match :hover or :active when interacting with elements in the picker.`);
+});
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html
new file mode 100644
index 00000000000..46581691ffc
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<div></div>
+
+<style>
+* {
+  padding:0;
+  margin:0;
+}
+div {
+  width: 300px;
+  height: 300px;
+  background: green;
+}
+</style>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay.html
new file mode 100644
index 00000000000..7fa820e76ff
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-overlay.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/388538944">
+<link rel=match href="dialog-popover-overlay-ref.html">
+
+<dialog open popover></dialog>
+<div class=blocker></div>
+
+<style>
+* {
+  margin: 0;
+  padding: 0;
+}
+dialog,div {
+  left: 0;
+  top: 0;
+  border: 0;
+  width: 300px;
+  height: 300px;
+  background: green;
+}
+.blocker {
+  contain: layout;
+  background: red;
+}
+</style>
+
+<script>
+  const dialog = document.querySelector('dialog');
+  dialog.showPopover();
+  dialog.blur();
+</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
index 552c8d8206b..5fc8e7adf98 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
@@ -173,3 +173,35 @@ promise_test(async t => {
   assert_equals(document.activeElement,otherElement,'focus does not move because it was not inside the popover');
 }, "Popover focus only returns to invoker when focus is within the popover");
 </script>
+
+<div id=no-focus-candidate>
+  <button popovertarget=no-focus-candidate-p tabindex="0">Toggle popover</button>
+  <div popover id=no-focus-candidate-p>
+    Popover with <button tabindex="0" popovertarget=no-focus-candidate-p2>focusable element</button>
+    <div popover id=no-focus-candidate-p2>Nested popover with <button tabindex="0">focusable element</button></div>
+  </div>
+</div>
+<script>
+promise_test(async t => {
+  const invoker = document.querySelector('#no-focus-candidate>button');
+  const popover = document.querySelector('#no-focus-candidate>[popover]');
+  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
+  invoker.focus(); // Make sure button is focused.
+  assert_equals(document.activeElement,invoker);
+  invoker.click(); // Activate the invoker
+  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
+  assert_equals(document.activeElement,invoker, 'invoker should still be focused');
+  await sendTab();
+  assert_equals(document.activeElement,popover.querySelector('button'),'next up is the popover');
+  await sendEnter(); // Show nested popover
+  assert_true(nestedPopover.matches(':popover-open'), 'nested popover should be invoked by invoker');
+  await sendTab();
+  assert_equals(document.activeElement, nestedPopover.querySelector('button'), 'focus on the nested popover button');
+  popover.querySelector('button').disabled = true; // Make the invoker no longer a focus candidate.
+  await sendShiftTab();
+  assert_equals(document.activeElement, invoker, 'initial invoker should be focused, nested popover invoker is skipped since it is disabled');
+  nestedPopover.querySelector('button').focus();
+  await sendTab();
+  assert_equals(document.activeElement, document.body, 'no more focusable elements after the button');
+}, "Cases where the next focus candidate isn't in the direct parent scope");
+</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-hover-hang.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hang.tentative.html
deleted file mode 100644
index 7868fa71a55..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-hover-hang.tentative.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>Crash/hang test for popover hover behavior</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover-hint.research.explainer/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<div id=menu popover=manual>
-  Popover
-  <button popovertarget="submenu"><span id=button>Button</span>
-    <div id=submenu popover=manual>Button-contained popover</div>
-  </button>
-</div>
-<button id=unrelated>Unrelated</button>
-
-<script>
-  promise_test(async (t) => {
-    menu.showPopover();
-    assert_true(menu.matches(':popover-open'));
-    await mouseHover(button,100);
-    button.click();
-    assert_true(menu.matches(':popover-open'));
-    assert_true(submenu.matches(':popover-open'));
-    await mouseHover(submenu,100);
-    await mouseHover(unrelated,100);
-    assert_true(submenu.matches(':popover-open'));
-    // This test passes if nothing crashes/hangs.
-  },'This is a crash test - it has some asserts, but mostly is just checking for crashes');
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html
deleted file mode 100644
index 57ca5723de5..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>The popover-hide-delay CSS property</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<body>
-<script src="resources/popover-hover-hide-common.js"></script>
-<script>
-
-// See popover-hover-hide-common.js for documentation.
-runHoverHideTestsForInvokerAction('hide');
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html
deleted file mode 100644
index d0036c0fe7b..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>The popover-hide-delay CSS property</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<body>
-<script src="resources/popover-hover-hide-common.js"></script>
-<script>
-
-// See popover-hover-hide-common.js for documentation.
-runHoverHideTestsForInvokerAction('hover');
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html
deleted file mode 100644
index 7b3fa2b3023..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>The popover-hide-delay CSS property</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<body>
-<script src="resources/popover-hover-hide-common.js"></script>
-<script>
-
-// See popover-hover-hide-common.js for documentation.
-runHoverHideTestsForInvokerAction('show');
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html
deleted file mode 100644
index d6d4079e7e0..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>The popover-hide-delay CSS property</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<body>
-<script src="resources/popover-hover-hide-common.js"></script>
-<script>
-
-// See popover-hover-hide-common.js for documentation.
-runHoverHideTestsForInvokerAction('toggle');
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html
deleted file mode 100644
index b03ec78ebf1..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>The popovertargetaction=hover behavior</title>
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<body>
-<style>
-.unrelated {top:0;}
-.invoker {top:100px; width:fit-content; height:fit-content;}
-[popover] {top: 200px;}
-.offset-child {top:300px; left:300px;}
-</style>
-
-<script>
-const popoverShowDelay = 100; // The CSS delay setting.
-const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
-async function makePopoverAndInvoker(test, popoverType, invokerType, delayMs) {
-  delayMs = delayMs || popoverShowDelay;
-  const popover = Object.assign(document.createElement('div'),{popover: popoverType});
-  document.body.appendChild(popover);
-  popover.textContent = 'Popover';
-  // Set popover-show-delay on the popover to 0 - it should be ignored.
-  popover.setAttribute('style',`popover-show-delay: 0; popover-hide-delay: 1000s;`);
-  let invoker = document.createElement('button');
-  invoker.setAttribute('class','invoker');
-  invoker.popoverTargetElement = popover;
-  invoker.popoverTargetAction = "hover";
-  // Set popover-hide-delay on the invoker to 0 - it should be ignored.
-  invoker.setAttribute('style',`popover-show-delay: ${delayMs}ms; popover-hide-delay: 0;`);
-  document.body.appendChild(invoker);
-  const actualHoverDelay = Number(getComputedStyle(invoker)['popoverShowDelay'].slice(0,-1))*1000;
-  assert_equals(actualHoverDelay,delayMs,'popover-show-delay is incorrect');
-  const originalInvoker = invoker;
-  const reassignPopoverFn = (p) => {originalInvoker.popoverTargetElement = p};
-  switch (invokerType) {
-    case 'plain':
-      // Invoker is just a button.
-      invoker.textContent = 'Invoker';
-      break;
-    case 'nested':
-      // Invoker is just a button containing a div.
-      const child1 = invoker.appendChild(document.createElement('div'));
-      child1.textContent = 'Invoker';
-      break;
-    case 'nested-offset':
-      // Invoker is a child of the invoking button, and is not contained within
-      // the bounds of the popovertarget element.
-      invoker.textContent = 'Invoker';
-      // Reassign invoker to the child:
-      invoker = invoker.appendChild(document.createElement('div'));
-      invoker.textContent = 'Invoker child';
-      invoker.setAttribute('class','offset-child');
-      break;
-    case 'none':
-      // No invoker.
-      invoker.remove();
-      break;
-    default:
-      assert_unreached(`Invalid invokerType ${invokerType}`);
-  }
-  const unrelated = document.createElement('div');
-  document.body.appendChild(unrelated);
-  unrelated.textContent = 'Unrelated';
-  unrelated.setAttribute('class','unrelated');
-  test.add_cleanup(async () => {
-    popover.remove();
-    invoker.remove();
-    originalInvoker.remove();
-    unrelated.remove();
-    await waitForRender();
-  });
-  await mouseOver(unrelated); // Start by mousing over the unrelated element
-  await waitForRender();
-  return {popover,invoker,reassignPopoverFn};
-}
-
-// NOTE about testing methodology:
-// This test checks whether popovers are triggered *after* the appropriate hover
-// delay. The delay used for testing is kept low, to avoid this test taking too
-// long, but that means that sometimes on a slow bot/client, the hover delay can
-// elapse before we are able to check the popover status. And that can make this
-// test flaky. To avoid that, the msSinceMouseOver() function is used to check
-// that not-too-much time has passed, and if it has, the test is simply skipped.
-
-["auto","hint","manual"].forEach(type => {
-  ["plain","nested","nested-offset"].forEach(invokerType => {
-    promise_test(async (t) => {
-      const {popover,invoker} = await makePopoverAndInvoker(t,type,invokerType);
-      assert_false(popover.matches(':popover-open'));
-      await mouseOver(invoker);
-      let showing = popover.matches(':popover-open');
-      // See NOTE above.
-      if (msSinceMouseOver() < popoverShowDelay)
-        assert_false(showing,'popover should not show immediately');
-      await waitForHoverTime(hoverWaitTime);
-      assert_true(msSinceMouseOver() >= hoverWaitTime,'waitForHoverTime should wait the specified time');
-      assert_true(popover.matches(':popover-open'),'popover should show after delay');
-      assert_true(hoverWaitTime > popoverShowDelay,'popoverShowDelay is the CSS setting, hoverWaitTime should be longer than that');
-      popover.hidePopover(); // Cleanup
-    },`popovertargetaction=hover shows a popover with popover=${type}, invokerType=${invokerType}`);
-
-    promise_test(async (t) => {
-      const {popover,invoker} = await makePopoverAndInvoker(t,type,invokerType);
-      assert_false(popover.matches(':popover-open'));
-      invoker.click(); // Click the invoker
-      assert_true(popover.matches(':popover-open'),'Clicking the invoker should show the popover, even when popovertargetaction=hover');
-      popover.hidePopover(); // Cleanup
-    },`popovertargetaction=hover should also allow click activation, for popover=${type}, invokerType=${invokerType}`);
-
-    promise_test(async (t) => {
-      const longerHoverDelay = hoverWaitTime*2;
-      const {popover,invoker} = await makePopoverAndInvoker(t,type,invokerType,longerHoverDelay);
-      await mouseOver(invoker);
-      let showing = popover.matches(':popover-open');
-      // See NOTE above.
-      if (msSinceMouseOver() >= longerHoverDelay)
-        return; // The WPT runner was too slow.
-      assert_false(showing,'popover should not show immediately');
-      await waitForHoverTime(hoverWaitTime);
-      showing = popover.matches(':popover-open');
-      if (msSinceMouseOver() >= longerHoverDelay)
-        return; // The WPT runner was too slow.
-      assert_false(showing,'popover should not show after not long enough of a delay');
-    },`popovertargetaction=hover popover-show-delay is respected (popover=${type}, invokerType=${invokerType})`);
-
-    promise_test(async (t) => {
-      const {popover,invoker} = await makePopoverAndInvoker(t,type,invokerType);
-      popover.showPopover();
-      assert_true(popover.matches(':popover-open'));
-      await mouseOver(invoker);
-      assert_true(popover.matches(':popover-open'),'popover should stay showing on mouseover');
-      await waitForHoverTime(hoverWaitTime);
-      assert_true(popover.matches(':popover-open'),'popover should stay showing after delay');
-      popover.hidePopover(); // Cleanup
-    },`popovertargetaction=hover does nothing when popover is already showing (popover=${type}, invokerType=${invokerType})`);
-
-    promise_test(async (t) => {
-      const {popover,invoker} = await makePopoverAndInvoker(t,type,invokerType);
-      await mouseOver(invoker);
-      let showing = popover.matches(':popover-open');
-      popover.remove();
-      // See NOTE above.
-      if (msSinceMouseOver() >= popoverShowDelay)
-        return; // The WPT runner was too slow.
-      assert_false(showing,'popover should not show immediately');
-      await waitForHoverTime(hoverWaitTime);
-      assert_false(popover.matches(':popover-open'),'popover should not show even after a delay');
-      // Now put it back in the document and make sure it doesn't trigger.
-      document.body.appendChild(popover);
-      await waitForHoverTime(hoverWaitTime);
-      assert_false(popover.matches(':popover-open'),'popover should not show even when returned to the document');
-    },`popovertargetaction=hover does nothing when popover is moved out of the document (popover=${type}, invokerType=${invokerType})`);
-
-    promise_test(async (t) => {
-      const {popover,invoker,reassignPopoverFn} = await makePopoverAndInvoker(t,type,invokerType);
-      const popover2 = Object.assign(document.createElement('div'),{popover: type});
-      document.body.appendChild(popover2);
-      t.add_cleanup(() => popover2.remove());
-      await mouseOver(invoker);
-      let eitherShowing = popover.matches(':popover-open') || popover2.matches(':popover-open');
-      reassignPopoverFn(popover2);
-      // See NOTE above.
-      if (msSinceMouseOver() >= popoverShowDelay)
-        return; // The WPT runner was too slow.
-      assert_false(eitherShowing,'popover should not show immediately');
-      await waitForHoverTime(hoverWaitTime);
-      assert_false(popover.matches(':popover-open'),'popover #1 should not show since popovertarget was reassigned');
-      assert_false(popover2.matches(':popover-open'),'popover #2 should not show since popovertarget was reassigned');
-    },`popovertargetaction=hover does nothing when target changes (popover=${type}, invokerType=${invokerType})`);
-  });
-});
-</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js b/tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js
deleted file mode 100644
index 9f407ef157d..00000000000
--- a/tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// NOTE about testing methodology:
-// This test checks whether popovers are hidden *after* the appropriate de-hover
-// delay. The delay used for testing is kept low, to avoid this test taking too
-// long, but that means that sometimes on a slow bot/client, the delay can
-// elapse before we are able to check the popover status. And that can make this
-// test flaky. To avoid that, the msSinceMouseOver() function is used to check
-// that not-too-much time has passed, and if it has, the test is simply skipped.
-
-const hoverDelays = 100; // This needs to match the style block below.
-const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
-
-async function initialPopoverShow(invoker) {
-  const popover = invoker.popoverTargetElement;
-  assert_false(popover.matches(':popover-open'));
-  await mouseOver(invoker); // Always start with the mouse over the invoker
-  popover.showPopover();
-  assert_true(popover.matches(':popover-open'));
-}
-
-function runHoverHideTest(popoverType, invokerType, invokerAction) {
-  const descr = `popover=${popoverType}, invoker=${invokerType}, popovertargetaction=${invokerAction}`;
-  promise_test(async (t) => {
-    const {popover,invoker} = makeTestParts(t, popoverType, invokerType, invokerAction);
-    await initialPopoverShow(invoker);
-    await mouseOver(unrelated);
-    let showing = popover.matches(':popover-open');
-    if (msSinceMouseOver() >= hoverDelays)
-      return; // The WPT runner was too slow.
-    assert_true(showing,'popover shouldn\'t immediately hide');
-    await mouseHover(unrelated,hoverWaitTime);
-    assert_false(popover.matches(':popover-open'),'popover should hide after delay');
-  },`The popover-hide-delay causes a popover to be hidden after a delay, ${descr}`);
-
-  promise_test(async (t) => {
-    const {popover,invoker} = makeTestParts(t, popoverType, invokerType, invokerAction);
-    await initialPopoverShow(invoker);
-    await mouseHover(popover,hoverWaitTime);
-    assert_true(popover.matches(':popover-open'),'hovering the popover should keep it showing');
-    await mouseOver(unrelated);
-    let showing = popover.matches(':popover-open');
-    if (msSinceMouseOver() >= hoverDelays)
-      return; // The WPT runner was too slow.
-    assert_true(showing,'subsequently hovering unrelated element shouldn\'t immediately hide the popover');
-    await mouseHover(unrelated,hoverWaitTime);
-    assert_false(popover.matches(':popover-open'),'hovering unrelated element should hide popover after delay');
-  },`hovering the popover keeps it from being hidden, ${descr}`);
-
-  promise_test(async (t) => {
-    const {popover,invoker,mouseOverInvoker} = makeTestParts(t, popoverType, invokerType, invokerAction);
-    await initialPopoverShow(invoker);
-    assert_true(popover.matches(':popover-open'));
-    await mouseHover(popover,hoverWaitTime);
-    await mouseHover(mouseOverInvoker,hoverWaitTime);
-    assert_true(popover.matches(':popover-open'),'Moving hover between invoker and popover should keep popover from being hidden');
-    await mouseHover(unrelated,hoverWaitTime);
-    assert_false(popover.matches(':popover-open'),'Moving hover to unrelated should finally hide the popover');
-  },`hovering an invoking element keeps the popover from being hidden, ${descr}`);
-}
-
-function runHoverHideTestsForInvokerAction(invokerAction) {
-  promise_test(async (t) => {
-    const {popover,invoker} = makeTestParts(t, 'auto', 'button', 'show');
-    assert_false(popover.matches(':popover-open'));
-    assert_true(invoker.matches('[popovertarget]'),'invoker needs to match [popovertarget]');
-    assert_equals(invoker.popoverTargetElement,popover,'invoker should point to popover');
-    await mouseHover(invoker,hoverWaitTime);
-    assert_true(msSinceMouseOver() >= hoverWaitTime,'waitForHoverTime should wait the specified time');
-    assert_true(hoverWaitTime > hoverDelays,'hoverDelays is the value from CSS, hoverWaitTime should be longer than that');
-    assert_equals(getComputedStyleTimeMs(invoker,'popoverShowDelay'),hoverDelays,'popover-show-delay is incorrect');
-    assert_equals(getComputedStyleTimeMs(popover,'popoverHideDelay'),hoverDelays,'popover-hide-delay is incorrect');
-  },'Test the harness');
-
-  // Run for all invoker and popover types.
-  ["button","input"].forEach(invokerType => {
-    ["auto","hint","manual"].forEach(popoverType => {
-      runHoverHideTest(popoverType, invokerType, invokerAction);
-    });
-  });
-}
-
-// Setup stuff
-const unrelated = document.createElement('div');
-unrelated.id = 'unrelated';
-unrelated.textContent = 'Unrelated element';
-const style = document.createElement('style');
-document.body.append(unrelated,style);
-style.textContent = `
-  div, button, input {
-    /* Fixed position everything to ensure nothing overlaps */
-    position: fixed;
-    max-height: 100px;
-  }
-  #unrelated {top: 100px;}
-  [popovertarget] {
-    top:200px;
-    popover-show-delay: 100ms;
-  }
-  [popover] {
-    width: 200px;
-    height: 100px;
-    top:300px;
-    popover-hide-delay: 100ms;
-  }
-`;
-
-function makeTestParts(t,popoverType,invokerType,invokerAction) {
-  const popover = document.createElement('div');
-  popover.id = `popover-${popoverType}-${invokerType}-${invokerAction}`;
-  document.body.appendChild(popover);
-  popover.popover = popoverType;
-  assert_equals(popover.popover, popoverType, `Type ${popoverType} not supported`);
-  const invoker = document.createElement(invokerType);
-  document.body.appendChild(invoker);
-  invoker.popoverTargetElement = popover;
-  invoker.popoverTargetAction = invokerAction;
-  assert_equals(invoker.popoverTargetAction, invokerAction, `Invoker action ${invokerAction} not supported`);
-  let mouseOverInvoker;
-  switch (invokerType) {
-    case 'button':
-      invoker.innerHTML = '<span><span data-note=nested_element>Click me</span></span>';
-      mouseOverInvoker = invoker.firstElementChild.firstElementChild;
-      assert_true(!!mouseOverInvoker);
-      break;
-    case 'input':
-      invoker.type = 'button';
-      mouseOverInvoker = invoker;
-      break;
-    default:
-      assert_unreached('Invalid invokerType ' + invokerType);
-      break;
-  }
-  t.add_cleanup(() => {popover.remove(); invoker.remove();});
-  return {popover, invoker, mouseOverInvoker};
-}
-
-function getComputedStyleTimeMs(element,property) {
-  // Times are in seconds, so just strip off the 's'.
-  return Number(getComputedStyle(element)[property].slice(0,-1))*1000;
-}
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/idlharness.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/idlharness.tentative.html
new file mode 100644
index 00000000000..72859ca6ca8
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/idlharness.tentative.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org" />
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+
+<script>
+  idl_test(["interest-invokers.tentative"],
+  ["html","dom","SVG"], (idl_array) => {
+    idl_array.add_objects({
+      HTMLAnchorElement: ['document.createElement("a")'],
+      HTMLAreaElement: ['document.createElement("area")'],
+      HTMLButtonElement: ['document.createElement("button")'],
+      SVGAElement: ['document.createElementNS("http://www.w3.org/2000/svg", "a")'],
+      InterestEvent: ['new InterestEvent("interest")']
+    });
+  });
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestelement-interface.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestelement-interface.tentative.html
index bc68dc54577..41616d97bd0 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestelement-interface.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestelement-interface.tentative.html
@@ -1,34 +1,29 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
 <link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <button id="buttonInvoker" interesttarget="interestee"></button>
 <a id="aInvoker" interesttarget="interestee"></a>
-<input type="button" id="inputInvoker" interesttarget="interestee" />
 <div id="interestee"></div>
 
 <script>
   test(function () {
     assert_equals(buttonInvoker.interestTargetElement, interestee);
     assert_equals(aInvoker.interestTargetElement, interestee);
-    assert_equals(inputInvoker.interestTargetElement, interestee);
   }, "interestTargetElement reflects interestee HTML element");
 
   test(function () {
     const div = document.body.appendChild(document.createElement("div"));
     buttonInvoker.interestTargetElement = div;
     aInvoker.interestTargetElement = div;
-    inputInvoker.interestTargetElement = div;
     assert_equals(buttonInvoker.interestTargetElement, div);
     assert_equals(buttonInvoker.getAttribute("interesttarget"), "");
     assert_equals(aInvoker.interestTargetElement, div);
     assert_equals(aInvoker.getAttribute("interesttarget"), "");
-    assert_equals(inputInvoker.interestTargetElement, div);
-    assert_equals(inputInvoker.getAttribute("interesttarget"), "");
   }, "interestTargetElement reflects set value");
 
   test(function () {
@@ -56,9 +51,6 @@
     aInvoker.setAttribute('interesttarget', 'invalid');
     assert_equals(aInvoker.interestTargetElement, null);
     assert_equals(aInvoker.getAttribute("interesttarget"), "invalid");
-    inputInvoker.setAttribute('interesttarget', 'invalid');
-    assert_equals(inputInvoker.interestTargetElement, null);
-    assert_equals(inputInvoker.getAttribute("interesttarget"), "invalid");
   }, "interestTargetElement does not reflect invalid value");
 
   test(function () {
@@ -76,12 +68,5 @@
       },
       "interestTargetElement attribute value must be an instance of Element",
     );
-    assert_throws_js(
-      TypeError,
-      function () {
-        inputInvoker.interestTargetElement = {};
-      },
-      "interestTargetElement attribute value must be an instance of Element",
-    );
   }, "interestTargetElement throws error on assignment of non Element");
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-dispatch-shadow.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-dispatch-shadow.tentative.html
index 9911357e94d..146f7fb5ec4 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-dispatch-shadow.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-dispatch-shadow.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
 <link
   rel="help"
   href="https://open-ui.org/components/interest-invokers.explainer/"
@@ -13,12 +13,12 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/invoker-utils.js"></script>
 
-<div id="div"></div>
-<button id="button"></button>
-
-<script>
-  test(function () {
+<body>
+  <script>
+  test((t) => {
     const host = document.createElement("div");
+    t.add_cleanup(() => host.remove());
+    document.body.append(host);
     const shadow = host.attachShadow({ mode: "closed" });
     const slot = shadow.appendChild(document.createElement("slot"));
     let childEvent = null;
@@ -53,12 +53,13 @@
 
   promise_test(async (t) => {
     const host = document.createElement("div");
-    document.body.append(host);
     t.add_cleanup(() => host.remove());
+    document.body.append(host);
     const shadow = host.attachShadow({ mode: "open" });
     const button = shadow.appendChild(document.createElement("button"));
     const interestee = host.appendChild(document.createElement("div"));
     button.interestTargetElement = interestee;
+    button.style = "interest-target-show-delay: 0s; interest-target-hide-delay: 0s;";
     let event = null;
     let eventTarget = null;
     let eventSource = null;
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-interface.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-interface.tentative.html
index 9ed95a6a028..b5b4193f1da 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-interface.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interestevent-interface.tentative.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
 <link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-anchor-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-anchor-event-dispatch.tentative.html
index 88a54c21f83..931ea1cfdef 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-anchor-event-dispatch.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-anchor-event-dispatch.tentative.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
-<link rel="help" href="https://open-ui.org/components/invokers.explainer/" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -13,10 +14,15 @@
 <div id="interestee"></div>
 <a href="/" id="interestanchor" interesttarget="interestee">Anchor</a>
 <button id="otherbutton">Other Button</button>
+<style>
+  [interesttarget] {
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 0s;
+  }
+</style>
 
 <script>
   promise_test(async function (t) {
-    t.add_cleanup(() => otherbutton.focus());
     let event = null;
     interestee.addEventListener("interest", (e) => (event = e), { once: true });
     await hoverOver(interestanchor);
@@ -30,3 +36,26 @@
     assert_equals(event.source, interestanchor, "source");
   }, "InterestEvent dispatches on anchor hover");
 </script>
+
+<br>
+<a href="/" id="parentanchor" interesttarget="childdiv"><span>Anchor</span>
+  <div id="childdiv">Child div</div>
+</a>
+
+<script>
+  promise_test(async function (t) {
+    let events = [];
+    childdiv.addEventListener("interest", (e) => (events.push('interest')));
+    childdiv.addEventListener("loseinterest", (e) => (events.push('loseinterest')));
+    const justAnchor = parentanchor.firstChild;
+    assert_true(justAnchor instanceof HTMLSpanElement);
+    await hoverOver(justAnchor);
+    assert_array_equals(events,['interest'],'Hovering anchor should show interest');
+    await hoverOver(childdiv);
+    assert_array_equals(events,['interest'],'Hovering the target shouldn\'t fire any new events');
+    await hoverOver(justAnchor);
+    assert_array_equals(events,['interest'],'Hovering back on the anchor shouldn\'t fire new events');
+    await hoverOver(otherbutton);
+    assert_array_equals(events,['interest','loseinterest'],'De-hovering both should fire loseinterest');
+  }, "Nested invoker and invokee");
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-area-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-area-event-dispatch.tentative.html
index 55732350826..eadc8fb1759 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-area-event-dispatch.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-area-event-dispatch.tentative.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
-<link rel="help" href="https://open-ui.org/components/invokers.explainer/" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -16,6 +17,12 @@
 </map>
 <img src="/images/blue.png" usemap="#map">
 <button id="otherbutton">Other Button</button>
+<style>
+  [interesttarget] {
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 0s;
+  }
+</style>
 
 <script>
   promise_test(async function (t) {
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-basic-delays.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-basic-delays.tentative.html
new file mode 100644
index 00000000000..eb5d9b6a855
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-basic-delays.tentative.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+
+<body>
+<script>
+// NOTE. This is just a single, basic test of the delays for `interesttarget`.
+// The `interesttarget-hide-delay` and `interesttarget-show-delay` tests take a
+// much more in-depth look at *how* the features work, but due to some nuances
+// (please read the "NOTE" sections in those tests), they could end up passing
+// on browsers that don't actually support this feature. So this test takes
+// considerably longer, but should only pass on browsers that implement the
+// `interesttarget` attribute.
+
+const invokerDelays = 2000; // The CSS delay setting. Should be long enough to ensure it works, even on slow bots.
+const hoverWaitTime = 4000; // How long to wait to cover the delay for sure.
+
+promise_test(async (t) => {
+  assert_true(hoverWaitTime >= 2*invokerDelays,'invokerDelays is the value from CSS, hoverWaitTime should be longer than that');
+  let {popover:div, invoker, unrelated} = createPopoverAndInvokerForHoverTests(t, invokerDelays, invokerDelays);
+  div.removeAttribute('popover'); // No longer a popover
+  let events = [];
+  div.addEventListener('interest',() => events.push('interest'));
+  div.addEventListener('loseinterest',() => events.push('loseinterest'));
+  // Quickly do the entire test.
+  await mouseOverAndRecord(invoker);
+  const checkpoint1 = [...events];
+  await waitForHoverTime(hoverWaitTime);
+  const checkpoint2 = [...events];
+  await mouseOverAndRecord(unrelated);
+  const checkpoint3 = [...events];
+  await waitForHoverTime(hoverWaitTime);
+  const checkpoint4 = [...events];
+  // Now test for expectations.
+  assert_array_equals(checkpoint1,[],'After initial hover, no events fired yet');
+  assert_array_equals(checkpoint2,['interest'],'After wait time, interest gets fired');
+  assert_array_equals(checkpoint3,['interest'],'After initial de-hover, no events fired yet');
+  assert_array_equals(checkpoint4,['interest','loseinterest'],'After wait time, loseinterest gets fired');
+},'Basic hover interest and loseinterest behavior');
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-button-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-button-event-dispatch.tentative.html
index a9d68bb03fd..6057f4ca60f 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-button-event-dispatch.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-button-event-dispatch.tentative.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
-<link rel="help" href="https://open-ui.org/components/invokers.explainer/" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -13,6 +14,12 @@
 <div id="interestee"></div>
 <button id="interestbutton" interesttarget="interestee">Button</button>
 <button id="otherbutton">Other Button</button>
+<style>
+  [interesttarget] {
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 0s;
+  }
+</style>
 
 <script>
   promise_test(async function (t) {
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-css-properties.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
similarity index 92%
rename from tests/wpt/tests/html/semantics/popovers/popover-css-properties.tentative.html
rename to tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
index 93d388b02b5..b91614b163c 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-css-properties.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
@@ -28,7 +28,7 @@ function testprop(prop) {
   test_valid_value(prop, 'inherit');
 
   // Invalid values:
-  test_invalid_value(prop, '0');
+  test_invalid_value(prop, '0', '0s');
   test_invalid_value(prop, 'foo');
   test_invalid_value(prop, '-1s');
   test_invalid_value(prop, 'none');
@@ -49,6 +49,6 @@ function testprop(prop) {
   ]);
 }
 
-testprop('popover-show-delay');
-testprop('popover-hide-delay');
+testprop('interest-target-show-delay');
+testprop('interest-target-hide-delay');
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
new file mode 100644
index 00000000000..a1499b83752
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+
+<body>
+<script>
+// NOTE about testing methodology:
+// This test uses popovers as an invoker target, and checks whether they are
+// hidden *after* the appropriate de-hover delay. The delay used for testing is
+// kept low, to avoid this test taking too long, but that means that sometimes
+// on a slow bot/client, the hover delay can elapse before we are able to check
+// the popover status. And that can make this test flaky. To avoid that, the
+// msSinceMouseOver() function is used to check that not-too-much time has
+// passed, and if it has, the test is simply skipped. Because of this
+// methodology, many/most of these tests will pass on browsers that do not
+// implement `interesttarget`. See the `interesttarget-basic-delays` test.
+const invokerHideDelay = 100; // The CSS delay setting.
+const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
+
+async function makeTestParts(t) {
+  // This ensures the tests in this file don't succeed sometimes, due to the above NOTE.
+  assert_true(HTMLAnchorElement.prototype.hasOwnProperty('interestTargetElement'),'interesttarget is not supported');
+  let {popover, invoker, unrelated} = createPopoverAndInvokerForHoverTests(t, 0, invokerHideDelay);
+  let mouseOverInvoker;
+  invoker.innerHTML = '<span><span>Click me</span></span>';
+  mouseOverInvoker = invoker.firstElementChild.firstElementChild;
+  assert_true(!!mouseOverInvoker);
+  assert_false(popover.matches(':popover-open'));
+  await mouseOverAndRecord(invoker); // Always start with the mouse over the invoker, which will invoke the popover immediately
+  assert_true(popover.matches(':popover-open'));
+  return {popover, invoker, unrelated, mouseOverInvoker};
+}
+
+promise_test(async (t) => {
+  const {popover,invoker} = await makeTestParts(t);
+  await mouseOverAndRecord(invoker);
+  await waitForHoverTime(hoverWaitTime);
+  assert_true(msSinceMouseOver() >= hoverWaitTime,'waitForHoverTime should wait the specified time');
+  assert_true(hoverWaitTime > invokerHideDelay,'invokerHideDelay is the value from CSS, hoverWaitTime should be longer than that');
+},'Test the harness');
+
+promise_test(async (t) => {
+  const {popover,invoker,unrelated} = await makeTestParts(t);
+  await mouseOverAndRecord(unrelated);
+  let showing = popover.matches(':popover-open');
+  if (msSinceMouseOver() < invokerHideDelay) {
+    // Only check if the WPT runner wasn't too slow.
+    assert_true(showing,'interest shouldn\'t be immediately lost');
+  }
+  await mouseOverAndRecord(unrelated);
+  await waitForHoverTime(hoverWaitTime);
+  assert_false(popover.matches(':popover-open'),'interest should be lost after delay');
+},`The interest-target-hide-delay causes interest to be lost after a delay`);
+
+promise_test(async (t) => {
+  const {popover,invoker,unrelated} = await makeTestParts(t);
+  await mouseOverAndRecord(popover);
+  await waitForHoverTime(hoverWaitTime);
+  assert_true(popover.matches(':popover-open'),'hovering the interest target element should keep it showing');
+  await mouseOverAndRecord(unrelated);
+  let showing = popover.matches(':popover-open');
+  if (msSinceMouseOver() >= invokerHideDelay)
+    return; // The WPT runner was too slow.
+  assert_true(showing,'subsequently hovering unrelated element shouldn\'t immediately cause interest lost');
+  await mouseOverAndRecord(unrelated);
+  await waitForHoverTime(hoverWaitTime);
+  assert_false(popover.matches(':popover-open'),'hovering unrelated element should cause interest lost after delay');
+},`hovering the interest target element keeps the invoker from losing interest`);
+
+promise_test(async (t) => {
+  const {popover,invoker,unrelated,mouseOverInvoker} = await makeTestParts(t);
+  await mouseOverAndRecord(popover);
+  await waitForHoverTime(hoverWaitTime);
+  await mouseOverAndRecord(mouseOverInvoker);
+  await waitForHoverTime(hoverWaitTime);
+  assert_true(popover.matches(':popover-open'),'Moving hover between invoker and target should not cause interest lost');
+  await mouseOverAndRecord(unrelated);
+  await waitForHoverTime(hoverWaitTime);
+  assert_false(popover.matches(':popover-open'),'Moving hover to unrelated should cause interest lost');
+},`moving hover between the invoker and the target prevents interest lost`);
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-on-popover-behavior.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-on-popover-behavior.tentative.html
index cbb5e4014ee..40027f0cccc 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-on-popover-behavior.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-on-popover-behavior.tentative.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
 <link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -15,6 +15,12 @@
 </div>
 <button id="interestbutton" interesttarget="interestee">Interest Invoker</button>
 <button id="otherbutton">Other button</button>
+<style>
+  [interesttarget] {
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 0s;
+  }
+</style>
 
 <script>
   async function reset() {
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
new file mode 100644
index 00000000000..599d61f91a8
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+
+<body>
+<script>
+// NOTE about testing methodology:
+// This test uses popovers as an invoker target, and checks whether they are
+// triggered *after* the appropriate hover delay. The delay used for testing is
+// kept low, to avoid this test taking too long, but that means that sometimes
+// on a slow bot/client, the hover delay can elapse before we are able to check
+// the popover status. And that can make this test flaky. To avoid that, the
+// msSinceMouseOver() function is used to check that not-too-much time has
+// passed, and if it has, the test is simply skipped. Because of this
+// methodology, many/most of these tests will pass on browsers that do not
+// implement `interesttarget`. See the `interesttarget-basic-delays` test.
+
+const invokerShowDelay = 100; // The CSS delay setting.
+const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
+
+async function makePopoverAndInvoker(test, invokerLayout, delayMs) {
+  // This ensures the tests in this file don't succeed sometimes, due to the above NOTE.
+  assert_true(HTMLAnchorElement.prototype.hasOwnProperty('interestTargetElement'),'interesttarget is not supported');
+  if (delayMs === undefined) {
+    delayMs = invokerShowDelay;
+  }
+  let {popover, invoker, unrelated} = createPopoverAndInvokerForHoverTests(test, delayMs, 1000000);
+  invoker.setAttribute('class','invoker');
+  const originalInvoker = invoker;
+  const reassignInvokerTargetFn = (p) => {originalInvoker.interestTargetElement = p};
+  switch (invokerLayout) {
+    case 'plain':
+      // Invoker is just a button.
+      invoker.textContent = 'Invoker';
+      break;
+    case 'nested':
+      // Invoker is just a button containing a div.
+      const child1 = invoker.appendChild(document.createElement('div'));
+      child1.textContent = 'Invoker';
+      break;
+    case 'nested-offset':
+      // Invoker is a child of the invoking button, and is not contained within
+      // the bounds of the interesttarget element.
+      invoker.textContent = 'Invoker';
+      // Reassign invoker to the child:
+      invoker = invoker.appendChild(document.createElement('div'));
+      invoker.textContent = 'Invoker child';
+      invoker.setAttribute('style','position:relative; top:300px; left:300px;');
+      break;
+    default:
+      assert_unreached(`Invalid invokerLayout ${invokerLayout}`);
+  }
+  test.add_cleanup(async () => {
+    originalInvoker.remove();
+    await waitForRender();
+  });
+  await mouseOverAndRecord(unrelated); // Start by mousing over the unrelated element
+  await waitForRender();
+  assert_false(popover.matches(':popover-open'));
+  return {popover,invoker,reassignInvokerTargetFn};
+}
+
+["plain","nested","nested-offset"].forEach(invokerLayout => {
+  promise_test(async (t) => {
+    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+    await mouseOverAndRecord(invoker);
+    let showing = popover.matches(':popover-open');
+    // See NOTE above.
+    if (msSinceMouseOver() < invokerShowDelay)
+      assert_false(showing,'interest should not be shown immediately');
+    await waitForHoverTime(hoverWaitTime);
+    assert_true(msSinceMouseOver() >= hoverWaitTime,'waitForHoverTime should wait the specified time');
+    assert_true(popover.matches(':popover-open'),'interest should be shown after the delay');
+    assert_true(hoverWaitTime > invokerShowDelay,'invokerShowDelay is the CSS setting, hoverWaitTime should be longer than that');
+  },`interesttarget fires after a delay, invokerLayout=${invokerLayout}`);
+
+  promise_test(async (t) => {
+    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+    assert_false(popover.matches(':popover-open'));
+    invoker.click(); // Click the invoker
+    assert_false(popover.matches(':popover-open'),'Clicking the invoker should not "show interest"');
+  },`interesttarget should not trigger via mouse click, invokerLayout=${invokerLayout}`);
+
+  promise_test(async (t) => {
+    const longerHoverDelay = hoverWaitTime*2;
+    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout,longerHoverDelay);
+    await mouseOverAndRecord(invoker);
+    await waitForHoverTime(hoverWaitTime);
+    showing = popover.matches(':popover-open');
+    if (msSinceMouseOver() >= longerHoverDelay)
+      return; // The WPT runner was too slow.
+    assert_false(showing,'interesttarget should respect CSS setting');
+  },`interesttarget interest-target-show-delay is respected, invokerLayout=${invokerLayout}`);
+
+  promise_test(async (t) => {
+    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+    popover.showPopover();
+    assert_true(popover.matches(':popover-open'));
+    let gotInterest = false;
+    popover.addEventListener('interest',() => (gotInterest=true),{once:true});
+    await mouseOverAndRecord(invoker);
+    const stillOpen = popover.matches(':popover-open');
+    await waitForHoverTime(hoverWaitTime);
+    assert_true(popover.matches(':popover-open'),'popover should stay showing after delay');
+    assert_true(stillOpen,'popover should have been open before the delay also');
+    assert_true(gotInterest,'interest event should still be fired');
+  },`interesttarget does not close an already-open popover, invokerLayout=${invokerLayout}`);
+
+  promise_test(async (t) => {
+    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+    popover.remove(); // Remove from the document
+    let gotInterest = false;
+    popover.addEventListener('interest',() => (gotInterest=true),{once:true});
+    await mouseOverAndRecord(invoker);
+    await waitForHoverTime(hoverWaitTime);
+    assert_false(gotInterest,'interest should not be shown if the target is removed');
+    // Now put it back in the document and make sure it doesn't trigger.
+    document.body.appendChild(popover);
+    await waitForHoverTime(hoverWaitTime);
+    assert_false(gotInterest,'interest should not be shown even when returned to the document');
+  },`interesttarget does nothing when the target is moved out of the document, invokerLayout=${invokerLayout}`);
+
+  promise_test(async (t) => {
+    const {popover,invoker,reassignInvokerTargetFn} = await makePopoverAndInvoker(t,invokerLayout);
+    const popover2 = document.createElement('div');
+    popover2.popover = 'auto';
+    document.body.appendChild(popover2);
+    t.add_cleanup(() => popover2.remove());
+    await mouseOverAndRecord(invoker);
+    let eitherShowing = popover.matches(':popover-open') || popover2.matches(':popover-open');
+    reassignInvokerTargetFn(popover2);
+    // See NOTE above.
+    if (msSinceMouseOver() >= invokerShowDelay)
+      return; // The WPT runner was too slow.
+    assert_false(eitherShowing,'interest should should not be shown immediately');
+    await waitForHoverTime(hoverWaitTime);
+    assert_false(popover.matches(':popover-open'),'old target should not receive interest, since interesttarget was reassigned');
+    assert_false(popover2.matches(':popover-open'),'new target should not receive interest, since interesttarget was reassigned');
+  },`interesttarget does nothing when the target changes, invokerLayout=${invokerLayout}`);
+});
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-svg-a-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-svg-a-event-dispatch.tentative.html
index 8208c8d56af..31a59f5c281 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-svg-a-event-dispatch.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-svg-a-event-dispatch.tentative.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <meta charset="utf-8" />
-<meta name="author" title="Keith Cirkel" href="mailto:keithamus@github.com" />
-<meta name="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" />
-<link rel="help" href="https://open-ui.org/components/invokers.explainer/" />
+<link rel="author" title="Keith Cirkel" href="mailto:keithamus@github.com" >
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com" >
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -17,6 +18,12 @@
   </a>
 </svg>
 <button id="otherbutton">Other Button</button>
+<style>
+  [interesttarget] {
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 0s;
+  }
+</style>
 
 <script>
   promise_test(async function (t) {
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js b/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
index 4261f9c0d32..cedc823a5ba 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
@@ -25,3 +25,64 @@ async function hoverOver(element) {
       .send();
   await waitForRender();
 }
+let mousemoveInfo;
+function mouseOverAndRecord(element) {
+  mousemoveInfo?.controller.abort();
+  const controller = new AbortController();
+  mousemoveInfo = {element, controller, moved: false, started: performance.now()};
+  document.addEventListener("mousemove", (e) => {mousemoveInfo.moved = true;}, {signal: controller.signal});
+  return (new test_driver.Actions())
+    .pointerMove(0, 0, {origin: element})
+    .send();
+}
+// Note that this may err on the side of being too large (reporting a number
+// that is larger than the actual time since the mouseover happened), due to how
+// `mousemoveInfo.started` is initialized, on first mouse move. However, this
+// function is intended to be used as a detector for the test harness taking too
+// long for some tests, so it's ok to be conservative.
+function msSinceMouseOver() {
+  return performance.now() - mousemoveInfo.started;
+}
+function assertMouseStillOver(element) {
+  assert_equals(mousemoveInfo.element, element, 'Broken test harness');
+  assert_false(mousemoveInfo.moved,'Broken test harness');
+}
+async function waitForHoverTime(hoverWaitTimeMs) {
+  await new Promise(resolve => step_timeout(resolve,hoverWaitTimeMs));
+  await waitForRender();
+};
+
+function createPopoverAndInvokerForHoverTests(test, showdelayMs, hideDelayMs) {
+  const popover = document.createElement('div');
+  popover.popover = 'auto';
+  popover.setAttribute('style','top: 200px;');
+  popover.textContent = 'Popover';
+  document.body.appendChild(popover);
+  let invoker = document.createElement('button');
+  invoker.interestTargetElement = popover;
+  invoker.setAttribute('style',`
+    interest-target-show-delay: ${showdelayMs}ms;
+    interest-target-hide-delay: ${hideDelayMs}ms;
+    position:relative;
+    top:100px;
+    width:fit-content;
+    height:fit-content;
+    `);
+  invoker.innerText = 'Invoker';
+  document.body.appendChild(invoker);
+  const actualShowDelay = Number(getComputedStyle(invoker).interestTargetShowDelay.slice(0,-1))*1000;
+  assert_equals(actualShowDelay,showdelayMs,'interest-target-show-delay is incorrect');
+  const actualHideDelay = Number(getComputedStyle(invoker).interestTargetHideDelay.slice(0,-1))*1000;
+  assert_equals(actualHideDelay,hideDelayMs,'interest-target-hide-delay is incorrect');
+  const unrelated = document.createElement('div');
+  document.body.appendChild(unrelated);
+  unrelated.textContent = 'Unrelated';
+  unrelated.setAttribute('style','position:relative; top:0;');
+  test.add_cleanup(async () => {
+    popover.remove();
+    invoker.remove();
+    unrelated.remove();
+    await waitForRender();
+  });
+  return {popover, invoker, unrelated};
+}
diff --git a/tests/wpt/tests/interfaces/html.idl b/tests/wpt/tests/interfaces/html.idl
index 3832a6f9b71..25b9b457da6 100644
--- a/tests/wpt/tests/interfaces/html.idl
+++ b/tests/wpt/tests/interfaces/html.idl
@@ -1320,9 +1320,8 @@ enum ImageSmoothingQuality { "low", "medium", "high" };
 interface CanvasRenderingContext2D {
   // back-reference to the canvas
   readonly attribute HTMLCanvasElement canvas;
-
-  CanvasRenderingContext2DSettings getContextAttributes();
 };
+CanvasRenderingContext2D includes CanvasSettings;
 CanvasRenderingContext2D includes CanvasState;
 CanvasRenderingContext2D includes CanvasTransform;
 CanvasRenderingContext2D includes CanvasCompositing;
@@ -1340,6 +1339,11 @@ CanvasRenderingContext2D includes CanvasPathDrawingStyles;
 CanvasRenderingContext2D includes CanvasTextDrawingStyles;
 CanvasRenderingContext2D includes CanvasPath;
 
+interface mixin CanvasSettings {
+  // settings
+  CanvasRenderingContext2DSettings getContextAttributes();
+};
+
 interface mixin CanvasState {
   // state
   undefined save(); // push state on state stack
@@ -1594,6 +1598,7 @@ interface OffscreenCanvasRenderingContext2D {
   readonly attribute OffscreenCanvas canvas;
 };
 
+OffscreenCanvasRenderingContext2D includes CanvasSettings;
 OffscreenCanvasRenderingContext2D includes CanvasState;
 OffscreenCanvasRenderingContext2D includes CanvasTransform;
 OffscreenCanvasRenderingContext2D includes CanvasCompositing;
@@ -2119,10 +2124,10 @@ interface NotRestoredReasonDetails {
 
 [Exposed=Window]
 interface NotRestoredReasons {
-  readonly attribute DOMString? src;
+  readonly attribute USVString? src;
   readonly attribute DOMString? id;
   readonly attribute DOMString? name;
-  readonly attribute DOMString? url;
+  readonly attribute USVString? url;
   readonly attribute FrozenArray<NotRestoredReasonDetails>? reasons;
   readonly attribute FrozenArray<NotRestoredReasons>? children;
   [Default] object toJSON();
diff --git a/tests/wpt/tests/interfaces/interest-invokers.tentative.idl b/tests/wpt/tests/interfaces/interest-invokers.tentative.idl
index f89af4d7341..fe164e23575 100644
--- a/tests/wpt/tests/interfaces/interest-invokers.tentative.idl
+++ b/tests/wpt/tests/interfaces/interest-invokers.tentative.idl
@@ -2,6 +2,17 @@ interface mixin InterestInvokerElement {
   [CEReactions,Reflect=interesttarget] attribute Element? interestTargetElement;
 };
 
-HTMLInputElement includes InterestInvokerElement;
+HTMLAnchorElement includes InterestInvokerElement;
+HTMLAreaElement includes InterestInvokerElement;
 HTMLButtonElement includes InterestInvokerElement;
-HTMLAnchorElement includes InterestInvokerElement;
\ No newline at end of file
+SVGAElement includes InterestInvokerElement;
+
+[Exposed=Window]
+interface InterestEvent : Event {
+    constructor(DOMString type, optional InterestEventInit eventInitDict = {});
+    readonly attribute Element? source;
+};
+
+dictionary InterestEventInit : EventInit {
+    Element? source = null;
+};
diff --git a/tests/wpt/tests/interfaces/speech-api.idl b/tests/wpt/tests/interfaces/speech-api.idl
index f3967b873ff..e4ca6df5c43 100644
--- a/tests/wpt/tests/interfaces/speech-api.idl
+++ b/tests/wpt/tests/interfaces/speech-api.idl
@@ -13,11 +13,15 @@ interface SpeechRecognition : EventTarget {
     attribute boolean continuous;
     attribute boolean interimResults;
     attribute unsigned long maxAlternatives;
+    attribute SpeechRecognitionMode mode;
 
     // methods to drive the speech interaction
     undefined start();
+    undefined start(MediaStreamTrack audioTrack);
     undefined stop();
     undefined abort();
+    boolean onDeviceWebSpeechAvailable(DOMString lang);
+    boolean installOnDeviceSpeechRecognition(DOMString lang);
 
     // event methods
     attribute EventHandler onaudiostart;
@@ -44,6 +48,12 @@ enum SpeechRecognitionErrorCode {
     "language-not-supported"
 };
 
+enum SpeechRecognitionMode {
+    "ondevice-preferred", // On-device speech recognition if available, otherwise use Cloud speech recognition as a fallback.
+    "ondevice-only", // On-device speech recognition only. Returns an error if on-device speech recognition is not available.
+    "cloud-only", // Cloud speech recognition only.
+};
+
 [Exposed=Window]
 interface SpeechRecognitionErrorEvent : Event {
     constructor(DOMString type, SpeechRecognitionErrorEventInit eventInitDict);
diff --git a/tests/wpt/tests/interfaces/webgpu.idl b/tests/wpt/tests/interfaces/webgpu.idl
index 401d2ec69b5..d91a6a710b1 100644
--- a/tests/wpt/tests/interfaces/webgpu.idl
+++ b/tests/wpt/tests/interfaces/webgpu.idl
@@ -62,6 +62,8 @@ interface GPUAdapterInfo {
     readonly attribute DOMString architecture;
     readonly attribute DOMString device;
     readonly attribute DOMString description;
+    readonly attribute unsigned long subgroupMinSize;
+    readonly attribute unsigned long subgroupMaxSize;
 };
 
 interface mixin NavigatorGPU {
@@ -123,6 +125,7 @@ enum GPUFeatureName {
     "float32-blendable",
     "clip-distances",
     "dual-source-blending",
+    "subgroups",
 };
 
 [Exposed=(Window, Worker), SecureContext]
diff --git a/tests/wpt/tests/media-source/waiting-for-audio.html b/tests/wpt/tests/media-source/waiting-for-audio.html
new file mode 100644
index 00000000000..e76c6e97b90
--- /dev/null
+++ b/tests/wpt/tests/media-source/waiting-for-audio.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Test playback after waiting for audio</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="mediasource-util.js"></script>
+</head>
+<body>
+</body>
+<script>
+// This test was designed to reproduce a bug in Gecko that occurred when a
+// queue of decoded buffered video data was drained quickly and buffered audio
+// was considered insufficient after playback was resumed.  The frame
+// durations are set very short to support this.
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1915045
+'use strict';
+
+// Overwrite the timescales of a single segment resource to adjust frame
+// durations.
+function adjust_resource_for_timescale(resource) {
+  MediaSourceUtil.WriteBigEndianInteger32ToUint8Array(
+    resource.timescale,
+    resource.data.subarray(resource.media_timescale_start));
+  MediaSourceUtil.WriteBigEndianInteger32ToUint8Array(
+    resource.timescale,
+    resource.data.subarray(resource.segment_index_timescale_start));
+}
+
+async function append_resource_to_source_buffer(resource) {
+  const source_buffer = resource.buffer;
+  // Adjust so that the first video frame aligns with the end of the previous
+  // append, or with zero if there has been no previous append.
+  source_buffer.timestampOffset -= resource.initial_offset;
+
+  source_buffer.appendBuffer(resource.data);
+  await source_buffer.watcher.wait_for('updateend');
+  assert_approx_equals(
+    source_buffer.buffered.end(0),
+    source_buffer.timestampOffset + resource.initial_offset + resource.duration,
+    2e-6,
+    `${resource.type} source_buffer.buffered.end()`);
+  source_buffer.timestampOffset = source_buffer.buffered.end(0);
+}
+
+promise_test(async t => {
+  const frames_per_keyframe = 8;
+  const video = await new Promise(
+    r => MediaSourceUtil.fetchManifestAndData(
+      t,
+      `mp4/test-v-128k-320x240-24fps-${frames_per_keyframe}kfr-manifest.json`,
+      (type, data) => r({type, data})));
+  {
+    // Truncate at the end of the first segment, which is also the end of 8
+    // frames.  At least 11 frames need to be available for decoding to
+    // reproduce the Gecko bug.
+    const first_segment_end = 0x1b1a;
+    video.data = video.data.subarray(0, first_segment_end);
+    // Video frame duration is 100 microseconds, short so that buffered frames
+    // are drained quickly.  The audio and video timescales are easily
+    // representable with unsigned 32-bit integers.
+    const video_fps = 10e3;
+    const default_sample_duration = 512;
+    video.timescale = default_sample_duration * video_fps;
+    video.duration = frames_per_keyframe / video_fps;
+    const earliest_presentation_time = 1024;
+    video.initial_offset =
+      earliest_presentation_time / video.timescale;
+    // Overwrite timescale to adjust frame durations.
+    video.media_timescale_start = 0x182;
+    video.segment_index_timescale_start = 0x353;
+    adjust_resource_for_timescale(video);
+  }
+  const audio = await new Promise(
+    r => MediaSourceUtil.fetchManifestAndData(
+      t,
+      `mp4/test-a-128k-44100Hz-1ch-manifest.json`,
+      (type, data) => r({type, data})));
+  {
+    // Truncate at end of first segment, which is also the end of 10240 samples.
+    const first_segment_end = 0x0830;
+    audio.data = audio.data.subarray(0, first_segment_end);
+
+    // The audio sample rate is increased so that Gecko considers a single
+    // audio segment to be not enough, which is necessary to trigger the bug.
+    audio.duration = video.duration;
+    const subsegment_duration = 10240;
+    audio.timescale = subsegment_duration / audio.duration;
+    assert_equals(audio.timescale, Math.round(audio.timescale),
+                  'integer timescale');
+    audio.initial_offset = 0;
+    // Overwrite timescale to adjust segment duration.
+    audio.media_timescale_start = 0x17e;
+    audio.segment_index_timescale_start = 0x30b;
+    adjust_resource_for_timescale(audio);
+  }
+
+  const v = document.createElement('video');
+  // Muting the audio output allows Gecko's playback position to advance a
+  // little beyond the decoded audio, making the bug more likely to reproduce.
+  v.volume = 0;
+  v.watcher = new EventWatcher(t, v, ['waiting', 'error', 'ended']);
+  document.body.appendChild(v);
+  const media_source = new MediaSource();
+  media_source.watcher = new EventWatcher(t, media_source, ['sourceopen']);
+  v.src = URL.createObjectURL(media_source);
+  await media_source.watcher.wait_for('sourceopen');
+
+  function add_source_buffer(resource) {
+    assert_implements_optional(MediaSource.isTypeSupported(resource.type),
+                             `${resource.type} supported`);
+
+    resource.buffer = media_source.addSourceBuffer(resource.type);
+    assert_equals(resource.buffer.mode, 'segments',
+                  `${resource.type} buffer.mode`);
+    resource.buffer.watcher =
+      new EventWatcher(t, resource.buffer, ['updateend']);
+  }
+  add_source_buffer(video);
+  add_source_buffer(audio);
+
+  async function append_until_canplay() {
+    // Ensure 2 video segments to make available at least the 11 frames to
+    // reproduce the Gecko bug.
+    while (video.buffer.buffered.length == 0 ||
+           video.buffer.buffered.end(0) <
+           v.currentTime + 2 * video.duration) {
+      await append_resource_to_source_buffer(video);
+    }
+
+    while (true) {
+      if (audio.buffer.buffered.length == 0 ||
+          audio.buffer.buffered.end(0) <
+          video.buffer.buffered.end(0)) {
+        await append_resource_to_source_buffer(audio);
+      } else {
+        await append_resource_to_source_buffer(video);
+      }
+
+      if (v.readyState >= v.HAVE_FUTURE_DATA) {
+        return;
+      }
+      // A single append might not be sufficient because either
+      // 1. the playback position had already advanced beyond the end of the
+      //    newly appended data, or
+      // 2. Chrome (as of version 131.0.6778.24) does not transition to
+      //    >= HAVE_FUTURE_DATA / canplay on the first frame beyond
+      //    currentTime, but on some additional number of extra frames.
+      //
+      // Or the v.readyState change might still be pending while the browser
+      // is processing the newly appended data.  Instead of waiting an
+      // arbitrary length of time to find out, append more data and try again.
+    }
+  }
+
+  // Three iterations checks that playback resumes after the Gecko bug would
+  // have occurred.
+  for (const i of Array(3).keys()) {
+    await append_until_canplay();
+
+    audio.buffer.remove(0, Number.POSITIVE_INFINITY);
+    await audio.buffer.watcher.wait_for('updateend');
+    audio.buffer.timestampOffset = 0;
+
+    v.play().catch(e => {});
+    await v.watcher.wait_for('waiting');
+    assert_less_than(v.readyState, v.HAVE_FUTURE_DATA,
+                     `waiting ${i} at ${v.currentTime}`);
+
+    v.pause();
+  }
+}, 'playback after waiting for audio');
+</script>
+</html>
diff --git a/tests/wpt/tests/resize-observer/resize-loop-cancel-error-notification-console-manual.tentative.html b/tests/wpt/tests/resize-observer/resize-loop-cancel-error-notification-console-manual.tentative.html
deleted file mode 100644
index 2c0fe2c0f28..00000000000
--- a/tests/wpt/tests/resize-observer/resize-loop-cancel-error-notification-console-manual.tentative.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<title>ResizeObserver - Console Logging Manual Test</title>
-<meta name="assert" content="Canceled resize loop error notifications should not appear in the console.">
-<link rel="help" href="https://www.w3.org/TR/resize-observer/#deliver-resize-loop-error-notification">
-
-<p>Open the console inside the developer tools. It should contain no entries about ResizeObserver.</p>
-
-<div id="resizer" style="width: 100px; height: 100px;"></div>
-<script>
-  // Cancel all window error events.
-  window.onerror = () => true;
-
-  const observer = new ResizeObserver(entries => {
-    resizer.style.width = '200px';
-  });
-  observer.observe(resizer);
-</script>
diff --git a/tests/wpt/tests/resize-observer/resize-loop-error-notification-console-manual.tentative.html b/tests/wpt/tests/resize-observer/resize-loop-error-notification-console-manual.tentative.html
deleted file mode 100644
index ef7dba83866..00000000000
--- a/tests/wpt/tests/resize-observer/resize-loop-error-notification-console-manual.tentative.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<title>ResizeObserver - Console Logging Manual Test</title>
-<meta name="assert" content="The resize loop error notification should appear in the console.">
-<link rel="help" href="https://www.w3.org/TR/resize-observer/#deliver-resize-loop-error-notification">
-
-<p>Open the console inside the developer tools. It should contain one entry with contents:</p>
-<p><code>ResizeObserver loop completed with undelivered notifications.</code></p>
-
-<div id="resizer" style="width: 100px; height: 100px;"></div>
-<script>
-  const observer = new ResizeObserver(entries => {
-    resizer.style.width = '200px';
-  });
-  observer.observe(resizer);
-</script>
diff --git a/tests/wpt/tests/resources/chromium/webxr-test.js b/tests/wpt/tests/resources/chromium/webxr-test.js
index 49938dc3ec1..21bbc002dc4 100644
--- a/tests/wpt/tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/tests/resources/chromium/webxr-test.js
@@ -5,14 +5,14 @@ import {GamepadHand, GamepadMapping} from '/gen/device/gamepad/public/mojom/game
 // This polyfill library implements the WebXR Test API as specified here:
 // https://github.com/immersive-web/webxr-test-api
 
-const defaultMojoFromFloor = {
+const defaultMojoFromStage = {
   matrix: [1, 0,     0, 0,
            0, 1,     0, 0,
            0, 0,     1, 0,
            0, -1.65, 0, 1]
 };
 const default_stage_parameters = {
-  mojoFromFloor: defaultMojoFromFloor,
+  mojoFromStage: defaultMojoFromStage,
   bounds: null
 };
 
@@ -512,8 +512,8 @@ class MockRuntime {
       this.stageParameters_.bounds = this.bounds_;
     }
 
-    // floorOrigin is passed in as mojoFromFloor.
-    this.stageParameters_.mojoFromFloor =
+    // floorOrigin is passed in as mojoFromStage.
+    this.stageParameters_.mojoFromStage =
         {matrix: getMatrixFromTransform(floorOrigin)};
 
     this._onStageParametersUpdated();
@@ -1640,11 +1640,11 @@ class MockRuntime {
         case vrMojom.XRReferenceSpaceType.kLocal:
           return XRMathHelper.identity();
         case vrMojom.XRReferenceSpaceType.kLocalFloor:
-          if (this.stageParameters_ == null || this.stageParameters_.mojoFromFloor == null) {
+          if (this.stageParameters_ == null || this.stageParameters_.mojoFromStage == null) {
             console.warn("Standing transform not available.");
             return null;
           }
-          return this.stageParameters_.mojoFromFloor.matrix;
+          return this.stageParameters_.mojoFromStage.matrix;
         case vrMojom.XRReferenceSpaceType.kViewer:
           return mojo_from_viewer;
         case vrMojom.XRReferenceSpaceType.kBoundedFloor:
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-safety.dat b/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
similarity index 70%
rename from tests/wpt/tests/sanitizer-api/sethtml-safety.dat
rename to tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
index ce14d5653c6..4ec50f3ea06 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-safety.dat
+++ b/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
@@ -34,17 +34,16 @@ script
 |   "xxx"
 
 #data
-<img src="https://example.com/test-image" onclick="2+2" one="two">
+<img src="https://{{host}}/test-image" onclick="2+2" one="two">
 #document
 | <img>
-|   src="https://example.com/test-image"
+|   src="https://{{host}}/test-image"
 
 #data
-<img src="https://example.com/test-image" onclick="2+2" one="two">
+<img src="https://{{host}}/test-image" onclick="2+2" one="two">
 #config
 { "attributes": ["src", "onclick", "one"]}
 #document
 | <img>
 |   one="two"
-|   src="https://example.com/test-image"
-
+|   src="https://{{host}}/test-image"
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-safety.tentative.html b/tests/wpt/tests/sanitizer-api/sethtml-safety.tentative.html
index d7a10c0477b..8a7f3ac64d9 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-safety.tentative.html
+++ b/tests/wpt/tests/sanitizer-api/sethtml-safety.tentative.html
@@ -6,10 +6,10 @@
 <script src="support/html5lib-testcase-support.js"></script>
 <script>
 promise_test(async _ => {
-  const safety = await fetch("sethtml-safety.dat").
+  const safety = await fetch("sethtml-safety.sub.dat").
           then(response => response.text()).
           then(parse_html5lib_testcases);
-  const unsafety = await fetch("sethtml-unsafety.dat").
+  const unsafety = await fetch("sethtml-unsafety.sub.dat").
           then(response => response.text()).
           then(parse_html5lib_testcases);
 
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.dat b/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat
similarity index 100%
rename from tests/wpt/tests/sanitizer-api/sethtml-tree-construction.dat
rename to tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.tentative.html b/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.tentative.html
index bae406ef703..5c693dbf3c9 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.tentative.html
+++ b/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.tentative.html
@@ -9,7 +9,7 @@
 // Testcases from the old(er) support/testcases.sub.js file, ported over to
 // the HTML5Lib testcase format.
 promise_test(_ => {
-  return html5lib_testcases_from_response(fetch("sethtml-tree-construction.dat")).
+  return html5lib_testcases_from_response(fetch("sethtml-tree-construction.sub.dat")).
       then(testcases => {
         testcases.forEach((testcase, index) => {
           test(_ => {
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-unsafety.dat b/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
similarity index 75%
rename from tests/wpt/tests/sanitizer-api/sethtml-unsafety.dat
rename to tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
index cdf17df3b59..8f3c2dea889 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-unsafety.dat
+++ b/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
@@ -42,20 +42,19 @@ script
 |   "xxx"
 
 #data
-<img src="https://example.com/test-image" onclick="2+2" one="two">
+<img src="https://{{host}}/test-image" onclick="2+2" one="two">
 #document
 | <img>
 |   onclick="2+2"
 |   one="two"
-|   src="https://example.com/test-image"
+|   src="https://{{host}}/test-image"
 
 #data
-<img src="https://example.com/test-image" onclick="2+2" one="two">
+<img src="https://{{host}}/test-image" onclick="2+2" one="two">
 #config
 { "attributes": ["src", "onclick", "one"]}
 #document
 | <img>
 |   onclick="2+2"
 |   one="two"
-|   src="https://example.com/test-image"
-
+|   src="https://{{host}}/test-image"
diff --git a/tests/wpt/tests/scroll-animations/crashtests/clip-path-with-view-timeline.html b/tests/wpt/tests/scroll-animations/crashtests/clip-path-with-view-timeline.html
new file mode 100644
index 00000000000..06c12e9bb4a
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/crashtests/clip-path-with-view-timeline.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="help" href="https://crbug.com/391632970">
+  <title>clip path animation with a view timeline doesn't crash</title>
+</head>
+<style type="text/css">
+  .spacer {
+    height: 200vh;
+  }
+  @keyframes clip {
+    0% { clip-path: circle(50% at 50% 50%); }
+    50% { clip-path: circle(5% at 50% 50%); }
+    100% { clip-path: circle(50% at 50% 50%); }
+  }
+  #target {
+    height: 100px;
+    width: 100px;
+    clip-path: circle(50% at 50% 50%);
+    background-color: blue;
+    animation: clip auto linear;
+    animation-timeline: --t1;
+    view-timeline: --t1;
+    animation-range-start: cover 20%;
+    animation-range-end: cover 80%;
+  }
+</style>
+<body>
+  <div class="spacer"></div>
+  <div id="target"></div>
+  <div class="spacer"></div>
+</body>
+<script>
+  function raf() {
+    return new Promise(resolve => {
+      requestAnimationFrame(resolve);
+    });
+  }
+  window.onload = async () => {
+    await raf();
+    await raf();
+    const scroller = document.scrollingElement;
+    const spacer = document.querySelector('.spacer');
+    scroller.scrollTop = spacer.clientHeight;
+    const anim = document.getAnimations()[0];
+    anim.ready.then(async () => {
+      await raf();
+      await raf();
+      // Remove test-wait to indicate that the test is complete.
+      document.documentElement.className = "";
+    });
+  };
+</script>
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/setting-effect.html b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-effect.html
new file mode 100644
index 00000000000..2644ec02a97
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-effect.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Setting the effect of a scroll-driven animation</title>
+<link rel="help"
+      href="https://drafts.csswg.org/web-animations-1/#setting-the-associated-effect">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script src="testcommon.js"></script>
+<style>
+  #scroller {
+    overflow-y: scroll;
+    height: 100px;
+    width: 100px;
+  }
+
+  #target {
+    width: 100%;
+    height: 1000%;
+    background-color: green;
+  }
+</style>
+<body>
+
+<div id="scroller">
+    <div id="target"></div>
+</div>
+
+<script>
+'use strict';
+
+test(() => {
+  const scroller = document.getElementById("scroller");
+  const target = document.getElementById("target");
+
+  const timeline = new ScrollTimeline({ source: scroller });
+  const animation = target.animate(null, { timeline });
+  assert_percents_equal(animation.effect.getComputedTiming().endTime, 100);
+
+  animation.effect = new KeyframeEffect(target, { opacity: [0, 1] });
+  assert_percents_equal(animation.effect.getComputedTiming().endTime, 100);
+}, 'Setting the effect of scroll-driven animation computes percentage timing values.');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html b/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
new file mode 100644
index 00000000000..15f07305b0d
--- /dev/null
+++ b/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html>
+<body>
+<meta name="assert" content="Selection's getComposedRanges should be updated when its associated live range changes">
+<link rel="help" href="https://w3c.github.io/selection-api/#dom-selection-getcomposedranges">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="light">Start outside shadow DOM</div>
+<div id="outerHost">outerHost
+<template shadowrootmode="open">
+  <slot></slot>
+  <div id="innerHost">innerHost
+   <template shadowrootmode="open">
+     <slot></slot>
+   </template>
+  </div>
+</template>
+</div>
+
+<script>
+
+const selection = getSelection();
+const outerHost = document.getElementById('outerHost')
+const outerRoot = outerHost.shadowRoot;
+const innerHost = outerRoot.getElementById('innerHost');
+const innerRoot = innerHost.shadowRoot;
+
+test(() => {
+  // Step 1: Setting a composed live range that crosses boundaries
+  selection.setBaseAndExtent(light.firstChild, 10, innerHost.firstChild, 5);
+  const liveRange = selection.getRangeAt(0);
+  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+  assert_equals(liveRange.endContainer, innerHost.firstChild);
+  assert_equals(liveRange.endOffset, 5);
+
+  assert_equals(selection.anchorNode, innerHost.firstChild);
+  assert_equals(selection.anchorOffset, 5);
+  assert_equals(selection.focusNode, innerHost.firstChild);
+  assert_equals(selection.focusOffset, 5);
+
+  assert_equals(composedRange.startContainer, light.firstChild);
+  assert_equals(composedRange.startOffset, 10);
+  assert_equals(composedRange.endContainer, innerHost.firstChild);
+  assert_equals(composedRange.endOffset, 5);
+
+  // Step 2: Update the live range only using setEnd
+  liveRange.setEnd(innerHost.firstChild, 6);
+  const composedRange2 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+  assert_equals(liveRange.endContainer, innerHost.firstChild);
+  assert_equals(liveRange.endOffset, 6);
+
+  assert_equals(selection.anchorNode, innerHost.firstChild);
+  assert_equals(selection.anchorOffset, 5);
+  assert_equals(selection.focusNode, innerHost.firstChild);
+  assert_equals(selection.focusOffset, 6);
+
+  assert_equals(composedRange2.startContainer, light.firstChild);
+  assert_equals(composedRange2.startOffset, 10);
+  assert_equals(composedRange2.endContainer, innerHost.firstChild);
+  assert_equals(composedRange2.endOffset, 6);
+
+  // Step 3: selectNode() calls both setStart/setEnd
+  liveRange.selectNode(innerHost);
+  const composedRange3 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, outerRoot);
+  assert_equals(liveRange.startOffset, 3);
+  assert_equals(liveRange.endContainer, outerRoot);
+  assert_equals(liveRange.endOffset, 4);
+
+  assert_equals(selection.anchorNode, outerRoot);
+  assert_equals(selection.anchorOffset, 3);
+  assert_equals(selection.focusNode, outerRoot);
+  assert_equals(selection.focusOffset, 4);
+
+  assert_equals(composedRange3.startContainer, outerRoot);
+  assert_equals(composedRange3.startOffset, 3);
+  assert_equals(composedRange3.endContainer, outerRoot);
+  assert_equals(composedRange3.endOffset, 4);
+
+  // Step 4: collapse(false) calls setEnd only
+  liveRange.collapse();
+  const composedRange4 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, outerRoot);
+  assert_equals(liveRange.startOffset, 4);
+  assert_equals(liveRange.endContainer, outerRoot);
+  assert_equals(liveRange.endOffset, 4);
+
+  assert_equals(selection.anchorNode, outerRoot);
+  assert_equals(selection.anchorOffset, 4);
+  assert_equals(selection.focusNode, outerRoot);
+  assert_equals(selection.focusOffset, 4);
+
+  assert_equals(composedRange4.startContainer, outerRoot);
+  assert_equals(composedRange4.startOffset, 4);
+  assert_equals(composedRange4.endContainer, outerRoot);
+  assert_equals(composedRange4.endOffset, 4);
+}, 'modify getRangeAt() range.');
+
+test(() => {
+  // Step 1: Creating a live range and only setting its end/anchor
+  selection.removeAllRanges();
+  const liveRange = document.createRange();
+  liveRange.setEnd(innerHost.firstChild, 5);
+  const composedRanges = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] });
+
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+  assert_equals(liveRange.endContainer, innerHost.firstChild);
+  assert_equals(liveRange.endOffset, 5);
+
+  assert_equals(selection.anchorNode, null);
+  assert_equals(selection.anchorOffset, 0);
+  assert_equals(selection.focusNode, null);
+  assert_equals(selection.focusOffset, 0);
+
+  assert_equals(composedRanges.length, 0);
+
+  // Step 2: Add range to selection so range API updates will change selection
+  selection.addRange(liveRange);
+  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+  assert_equals(liveRange.endContainer, innerHost.firstChild);
+  assert_equals(liveRange.endOffset, 5);
+
+  assert_equals(selection.anchorNode, innerHost.firstChild);
+  assert_equals(selection.anchorOffset, 5);
+  assert_equals(selection.focusNode, innerHost.firstChild);
+  assert_equals(selection.focusOffset, 5);
+
+  assert_equals(composedRange.startContainer, innerHost.firstChild);
+  assert_equals(composedRange.startOffset, 5);
+  assert_equals(composedRange.endContainer, innerHost.firstChild);
+  assert_equals(composedRange.endOffset, 5);
+}, 'modify createRange() range added to selection after setEnd call.');
+
+test(() => {
+  // Step 1: Creating a live range and only setting its end/anchor
+  selection.removeAllRanges();
+  const liveRange = document.createRange();
+  // Add range to selection so range API updates will change selection
+  selection.addRange(liveRange);
+  liveRange.setEnd(innerHost.firstChild, 5);
+  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+  assert_equals(liveRange.endContainer, innerHost.firstChild);
+  assert_equals(liveRange.endOffset, 5);
+
+  assert_equals(selection.anchorNode, innerHost.firstChild);
+  assert_equals(selection.anchorOffset, 5);
+  assert_equals(selection.focusNode, innerHost.firstChild);
+  assert_equals(selection.focusOffset, 5);
+
+  assert_equals(composedRange.startContainer, document);
+  assert_equals(composedRange.startOffset, 0);
+  assert_equals(composedRange.endContainer, innerHost.firstChild);
+  assert_equals(composedRange.endOffset, 5);
+
+  // Step 2: Update the live range by setting its start/focus
+  liveRange.setStart(light.firstChild, 10);
+  const composedRangeAfter = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, light.firstChild);
+  assert_equals(liveRange.startOffset, 10);
+  assert_equals(liveRange.endContainer, light.firstChild);
+  assert_equals(liveRange.endOffset, 10);
+
+  assert_equals(selection.anchorNode, light.firstChild);
+  assert_equals(selection.anchorOffset, 10);
+  assert_equals(selection.focusNode, light.firstChild);
+  assert_equals(selection.focusOffset, 10);
+
+  assert_equals(composedRangeAfter.startContainer, light.firstChild);
+  assert_equals(composedRangeAfter.startOffset, 10);
+  assert_equals(composedRangeAfter.endContainer, innerHost.firstChild);
+  assert_equals(composedRangeAfter.endOffset, 5);
+}, 'modify createRange() range added to selection before setStart/setEnd calls.');
+</script>
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/inline.html b/tests/wpt/tests/subresource-integrity/signatures/tentative/inline.html
new file mode 100644
index 00000000000..f40a8f127c7
--- /dev/null
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/inline.html
@@ -0,0 +1,162 @@
+<!doctype html>
+<head>
+  <meta charset=utf-8>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <!--
+       The following tests all use the test Ed25519 key from RFC9421:
+       https://www.rfc-editor.org/rfc/rfc9421.html#name-example-ed25519-test-key
+
+       JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=
+
+       alongside a randomly generated key (the same one used in `helper.js`):
+
+       xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=
+
+       Note that whitespace matters in all the following tests, so when
+       generating a signature, it's important to match any formatting in the
+       <script> elements below.,]
+  -->
+  <script>
+    // We kinda have to assume this executes, since its failure would mean that
+    // the entire test is impossible to run. We'll set up all the following
+    // tests here as `async_test` calls, and verify execution or lack thereof
+    // in script blocks below.
+    let tests = {
+      // When no `signature` attribute is present, execution will not be blocked on verification.
+      "no signature, no integrity": async_test("No `signature`, no `integrity` => executes"),
+      "no signature, invalid integrity": async_test("No `signature`, invalid `integrity` => executes"),
+      "no signature, valid integrity": async_test("No `signature`, valid `integrity` => executes"),
+      "no signature, multiple integrity": async_test("No `signature`, multiple `integrity` => executes"),
+
+      // When an invalid `signature` attribute is present, execution will not be blocked on verification.
+      "invalid signature, no integrity": async_test("invalid `signature`, no `integrity` => executes"),
+      "invalid signature, invalid integrity": async_test("invalid `signature`, invalid `integrity` => executes"),
+      "invalid signature, valid integrity": async_test("invalid `signature`, valid `integrity` => executes"),
+      "invalid signature, multiple integrity": async_test("invalid `signature`, multiple `integrity` => executes"),
+
+      // When a valid `signature` attribute is present, execution depends upon verification via `integrity`.
+      "valid signature, no integrity": async_test("valid `signature`, no `integrity` => blocked"),
+      "valid signature, invalid integrity": async_test("valid `signature`, invalid `integrity` => blocked"),
+      "valid signature, valid integrity": async_test("valid `signature`, valid `integrity` => executes"),
+      "valid signature, multiple integrity": async_test("valid `signature`, multiple `integrity` => executes"),
+
+      // When multiple signatures are present in a `signature` attribute, execution depends upon verification via `integrity`.
+      "multiple signature, no integrity": async_test("multiple `signature`, no `integrity` => blocked"),
+      "multiple signature, invalid integrity": async_test("multiple `signature`, invalid `integrity` => blocked"),
+      "multiple signature, valid integrity": async_test("multiple `signature`, valid `integrity` => executes"),
+      "multiple signature, multiple integrity": async_test("multiple `signature`, multiple `integrity` => executes"),
+
+      // Non-ASCII characters.
+      "valid signature, valid integrity, non-ASCII": async_test("valid `signature`, valid `integrity`, non-ASCII => executes"),
+    };
+  </script>
+
+  <!--
+    No signature tests
+  -->
+  <script>
+    tests["no signature, no integrity"].done();
+  </script>
+
+  <script integrity="invalid-integrity">
+    tests["no signature, invalid integrity"].done();
+  </script>
+
+  <script integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=">
+    tests["no signature, valid integrity"].done();
+  </script>
+
+  <script integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=
+                     ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=">
+    tests["no signature, multiple integrity"].done();
+  </script>
+
+  <!--
+    Invalid signature tests
+  -->
+  <script signature="invalid-signature">
+    tests["invalid signature, no integrity"].done();
+  </script>
+
+  <script signature="invalid-signature"
+          integrity="invalid-integrity">
+    tests["invalid signature, invalid integrity"].done();
+  </script>
+
+  <script signature="invalid-signature"
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=">
+    tests["invalid signature, valid integrity"].done();
+  </script>
+
+  <script signature="invalid-signature"
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=
+                     ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=">
+    tests["invalid signature, multiple integrity"].done();
+  </script>
+
+  <!--
+    Valid signature tests
+  -->
+  <script signature="ed25519-4OPrZjK+XVtbLqLcus3k15FOxZIbgASmUGSuNjZcD7YPxI44o/MlZlE34sh1aSSGfpe8/TxYrePEUj0cQ0vaBg==">
+    tests["valid signature, no integrity"].step(_ => assert_unreached("Should be blocked."));
+  </script>
+  <script>tests["valid signature, no integrity"].done();</script>
+
+  <script signature="ed25519-nmVggq+GghoIYMaheQBzJirQsDy4/MP0siWjNiduMzPLSOP3PEV0aScOV5bq1WUkZP9dXyNXhfSIxCod6B47CQ=="
+          integrity="invalid-integrity">
+    tests["valid signature, invalid integrity"].step(_ => assert_unreached("Should be blocked."));
+  </script>
+  <script>tests["valid signature, invalid integrity"].done();</script>
+
+  <script signature="ed25519-O5fHCyO+T2JZZ91UUFFkkAtKW9mAOQRN2PpSUTXksBBNdX7uYE5d+bupx96arn+6SVRGm2PD8kSsbd6FNHG3AQ=="
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=">
+    tests["valid signature, valid integrity"].done();
+  </script>
+
+  <script signature="ed25519-TUwOF1z8hTiVakVccimlm4hI8xi0Vdv7ab66IVztcKUiugwuNAihDlKSQkv9S08l0tg43UmZnhB5GbRem7Z7Cg=="
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=
+                     ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=">
+    tests["valid signature, multiple integrity"].done();
+  </script>
+
+  <!--
+    Multiple signature tests
+  -->
+  <script signature="ed25519-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+                     ed25519-ESUfd6rSpUdMtmGMXvozDWzZ2d+Tfhvo+X7ObA+lnV8qfvE3qn64P+mfuQlixBUktyx3ssdMQox+qPXR2hW8DQ==">
+    tests["multiple signature, no integrity"].step(_ => assert_unreached("Should be blocked."));
+  </script>
+  <script>tests["multiple signature, no integrity"].done();</script>
+
+  <script signature="ed25519-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+                     ed25519-qsuezXxAmnpeJr985iQTAVO3Q5TI8rF5HeKkiBDJRrQbtCHykx0QPy3ELSocWKDM40Ww/Zd/hKt1FdLEg2uDAA=="
+          integrity="invalid-integrity">
+    tests["multiple signature, invalid integrity"].step(_ => assert_unreached("Should be blocked."));
+  </script>
+  <script>tests["multiple signature, invalid integrity"].done();</script>
+
+  <script signature="ed25519-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+                     ed25519-7ceXA5rReNZdDzlsH8DDIy2SxLIS1Tp48TFJZrayi0uGBXHffUjj8liPnmV10fasoGTPuNnsvNHa5W1fghQZBw=="
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=">
+    tests["multiple signature, valid integrity"].done();
+  </script>
+
+  <script signature="ed25519-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+                     ed25519-Njz1TpdFvYPsf4FCqGcDwVIjnhTkKOM2b0SdgaeE/guycjywsWAWV6U88NO3y0rLyptKj0WNwfQKvhJWhIxjAA=="
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=
+                     ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=">
+    tests["multiple signature, multiple integrity"].done();
+  </script>
+
+  <!--
+    Non-ASCII
+  -->
+  <script signature="ed25519-pUMhbd94Dbv8gQ8nlwdi5QZ6QFmVamoceflIbhVCV/odcP7UvJyTmPYt5y+oEOOp1d0cbagnlWYo1Q9FAQ7ECA=="
+          integrity="ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=">
+    // Det er fullt av ål i luftputebåten min
+    tests["valid signature, valid integrity, non-ASCII"].done();
+  </script>
+</body>
diff --git a/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.html
index badaf989eb7..a75b50f8f00 100644
--- a/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.html
+++ b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.html
@@ -2,44 +2,26 @@
 <script src="/resources/testharness.js" ></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/helper.sub.js"></script>
+<script src="./support/csp-violations.js"></script>
 <meta http-equiv="Content-Security-Policy" content="trusted-types 'none'">
+<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
 <body>
 <script>
-  function promise_violation(t, filter_arg) {
-    return _ => new Promise((resolve) => {
-      function handler(e) {
-        let matches = e.originalPolicy.includes(filter_arg);
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-
-      document.addEventListener("securitypolicyviolation", handler);
-      t.add_cleanup(() => {
-          document.removeEventListener("securitypolicyviolation", handler);
-      });
-    });
-  }
-
-  promise_test(t => {
-    let p = Promise.resolve()
-      .then(promise_violation(t, "trusted-types 'none'"));
-
-    assert_throws_js(TypeError, _ => {
-      window.trustedTypes.createPolicy('SomeName', { createHTML: s => s } );
-    });
-    return p;
+  promise_test(async t => {
+    const policyName = 'SomeName';
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      window.trustedTypes.createPolicy(policyName, { createHTML: s => s } )
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types 'none'"));
+    assert_equals(violation.sample, clipSampleIfNeeded(policyName));
   }, "Cannot create policy with name 'SomeName' - policy creation throws");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-      .then(promise_violation(t, "trusted-types 'none'"));
-
-    assert_throws_js(TypeError, _ => {
-      window.trustedTypes.createPolicy('default', { createHTML: s => s } );
-    });
-    return p;
+  promise_test(async t => {
+    const policyName = 'default';
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      window.trustedTypes.createPolicy(policyName, { createHTML: s => s } )
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types 'none'"));
+    assert_equals(violation.sample, clipSampleIfNeeded(policyName));
   }, "Cannot create policy with name 'default' - policy creation throws");
 </script>
diff --git a/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.html
index 979de1e8145..f84634a1408 100644
--- a/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.html
+++ b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.html
@@ -2,8 +2,10 @@
 <script src="/resources/testharness.js" ></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/helper.sub.js"></script>
+<script src="./support/csp-violations.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="trusted-types SomeName JustOneMoreName AnotherName">
+<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
 <body>
 <script>
   // Allowed name test
@@ -20,46 +22,26 @@
     assert_equals(policy.name, 'JustOneMoreName');
   }, "Another allowed-name policy creation works.");
 
-  function promise_violation(t, filter_arg) {
-    return _ => new Promise((resolve) => {
-      function handler(e) {
-        let matches = e.originalPolicy.includes(filter_arg);
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-
-      document.addEventListener("securitypolicyviolation", handler);
-      t.add_cleanup(() => {
-        document.removeEventListener("securitypolicyviolation", handler);
-      });
-    });
-  }
-
   // Non-allowed names test
-  promise_test(t => {
-    let p = Promise.resolve()
-      .then(promise_violation(t, "trusted-types SomeName JustOneMoreName AnotherName"));
-
-    assert_throws_js(TypeError, _ => {
-     window.trustedTypes.createPolicy('SomeOtherName', { createHTML: s => s } );
-    });
-    return p;
+  promise_test(async t => {
+    const policyName = 'SomeOtherName';
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+     window.trustedTypes.createPolicy(policyName, { createHTML: s => s } )
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types SomeName JustOneMoreName AnotherName"));
+    assert_equals(violation.sample, clipSampleIfNeeded(policyName));
   }, "Non-allowed name policy creation throws.");
 
   // Duplicate names test
-  promise_test(t => {
-    let p = Promise.resolve()
-      .then(promise_violation(t, "trusted-types SomeName JustOneMoreName AnotherName"));
+  promise_test(async t => {
+    const policyName = 'AnotherName';
+    let policy = window.trustedTypes.createPolicy(policyName, { createHTML: s => s } );
+    assert_equals(policy.name, policyName);
 
-    let policy = window.trustedTypes.createPolicy('AnotherName', { createHTML: s => s } );
-    assert_equals(policy.name, 'AnotherName');
-
-    assert_throws_js(TypeError, _ => {
-      window.trustedTypes.createPolicy('AnotherName', { createHTML: s => s } );
-    });
-    return p;
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      window.trustedTypes.createPolicy(policyName, { createHTML: s => s } )
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types SomeName JustOneMoreName AnotherName"));
+    assert_equals(violation.sample, clipSampleIfNeeded(policyName));
   }, "Duplicate name policy creation throws.");
 </script>
diff --git a/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html
index 25b4440ef41..0b1d141fb3a 100644
--- a/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html
+++ b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html
@@ -2,55 +2,35 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="./support/csp-violations.js"></script>
 </head>
 <body>
 <script>
-
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
-
+  promise_test(async t => {
     d = document.createElement("div");
-    d.innerHTML = "a";
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      d.innerHTML = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_equals("a", d.innerHTML);
-    return p;
   }, "Require trusted types for 'script' block create HTML.");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
-
+  promise_test(async t => {
     d = document.createElement("script");
-    d.innerText = "a";
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      d.innerText = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_equals("a", d.innerText);
-    return p;
   }, "Require trusted types for 'script' block create script.");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
-
+  promise_test(async t => {
     s = document.createElement("script");
-    s.src = "a";
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      s.src = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_true(s.src.includes("/trusted-types/a"));
-    return p;
   }, "Require trusted types for 'script' block create script URL.");
 
   promise_test(t => {
@@ -68,4 +48,4 @@
       resolve();
     });
   }, "Set require trusted types for 'script' without CSP for trusted types don't block policy creation and using.");
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html.headers b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html.headers
index c6412f8d472..8344761bddd 100644
--- a/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html.headers
+++ b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.html.headers
@@ -1 +1,2 @@
-Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
\ No newline at end of file
+Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
+Content-Security-Policy: object-src 'none'
diff --git a/tests/wpt/tests/trusted-types/require-trusted-types-for.html b/tests/wpt/tests/trusted-types/require-trusted-types-for.html
index b0dcd9cc930..c6dfbcbfb48 100644
--- a/tests/wpt/tests/trusted-types/require-trusted-types-for.html
+++ b/tests/wpt/tests/trusted-types/require-trusted-types-for.html
@@ -2,62 +2,37 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="./support/csp-violations.js"></script>
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+  <meta http-equiv="Content-Security-Policy" content="object-src 'none'">
 </head>
 <body>
 <script>
-
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
+  promise_test(async t => {
     d = document.createElement("div");
-    assert_throws_js(TypeError,
-        _ => {
-          d.innerHTML = "a";
-        });
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      d.innerHTML = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_equals("", d.innerHTML);
-    return p;
   }, "Require trusted types for 'script' block create HTML.");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
+  promise_test(async t => {
     d = document.createElement("script");
-    assert_throws_js(TypeError,
-        _ => {
-          d.innerText = "a";
-        });
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      d.innerText = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_equals("", d.innerText);
-    return p;
   }, "Require trusted types for 'script' block create script.");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"));
+  promise_test(async t => {
     s = document.createElement("script");
-    assert_throws_js(TypeError,
-        _ => {
-          s.src = "a";
-        });
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      s.src = "a"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
     assert_equals("", s.src);
-    return p;
   }, "Require trusted types for 'script' block create script URL.");
 
   promise_test(t => {
diff --git a/tests/wpt/tests/trusted-types/support/csp-violations.js b/tests/wpt/tests/trusted-types/support/csp-violations.js
new file mode 100644
index 00000000000..61b763911f7
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/csp-violations.js
@@ -0,0 +1,81 @@
+const cspDirectives = [
+  // https://w3c.github.io/trusted-types/dist/spec/#require-trusted-types-for-csp-directive
+  "require-trusted-types-for",
+  // https://w3c.github.io/trusted-types/dist/spec/#trusted-types-csp-directive
+  "trusted-types",
+  // https://w3c.github.io/webappsec-csp/#script-src
+  "script-src",
+];
+
+// A generic helper that runs function fn and return a promise resolving with
+// an array of reported violations for trusted type directives and a possible
+// exception thrown.
+function trusted_type_violations_and_exception_for(fn) {
+  return new Promise((resolve, reject) => {
+    // Listen for security policy violations.
+    let result = { violations: [], exception: null };
+    let handler = e => {
+      if (cspDirectives.includes(e.effectiveDirective)) {
+        result.violations.push(e);
+      } else if (e.effectiveDirective === "object-src") {
+        document.removeEventListener("securitypolicyviolation", handler);
+        e.stopPropagation();
+        resolve(result);
+      } else {
+        reject(`Unexpected violation for directive ${e.effectiveDirective}`);
+      }
+    }
+    document.addEventListener("securitypolicyviolation", handler);
+
+    // Run the specified function and record any exception.
+    try {
+      fn();
+    } catch(e) {
+      result.exception = e;
+    }
+
+    // Force an "object-src" violation, to make sure all the previous violations
+    // have been delivered. This assumes the test file's associated .headers
+    // file contains Content-Security-Policy: object-src 'none'.
+    var o = document.createElement('object');
+    o.type = "video/mp4";
+    o.data = "dummy.webm";
+    document.body.appendChild(o);
+  });
+}
+
+// Helper function when we expect one violation and exception.
+async function trusted_type_violation_for(expectedException, fn) {
+  let {violations, exception} =
+      await trusted_type_violations_and_exception_for(fn);
+  assert_equals(violations.length, 1, "a single violation reported");
+  assert_true(exception instanceof expectedException, `${expectedException.prototype} exception reported`);
+  return violations[0];
+}
+
+// Helper function when we expect no violation or exception.
+async function no_trusted_type_violation_for(fn) {
+  let {violations, exception} =
+      await trusted_type_violations_and_exception_for(fn);
+  assert_equals(violations.length, 0, "no violation reported");
+  assert_equals(exception, null, "no exception thrown");
+}
+
+async function trusted_type_violation_without_exception_for(fn) {
+  let {violations, exception} =
+      await trusted_type_violations_and_exception_for(fn);
+  assert_equals(violations.length, 1, "a single violation reported");
+  assert_equals(exception, null, "no exception thrown");
+  return violations[0];
+}
+
+function clipSampleIfNeeded(sample) {
+  const clippedSampleLength = 40;
+
+  // Clipping is a bit ambiguous when the sample contains surrogate pairs, so
+  // avoid that in our tests for now.
+  // https://github.com/w3c/trusted-types/issues/577
+  assert_equals(sample.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/), null);
+
+  return sample.substring(0, clippedSampleLength);
+}
diff --git a/tests/wpt/tests/trusted-types/support/resolve-spv.js b/tests/wpt/tests/trusted-types/support/resolve-spv.js
deleted file mode 100644
index 89e58b2a8b7..00000000000
--- a/tests/wpt/tests/trusted-types/support/resolve-spv.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Returns a promise that resolves with a Security Policy Violation (spv)
-    // even when it is received.
-function promise_spv() {
-  return new Promise((resolve, reject) => {
-    window.addEventListener("securitypolicyviolation", e => {
-      resolve(e);
-    }, { once: true });
-  });
-}
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
index 92604c96718..5e2087a1c6b 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
@@ -2,7 +2,7 @@
 <head>
   <script nonce="123" src="/resources/testharness.js"></script>
   <script nonce="123"src="/resources/testharnessreport.js"></script>
-  <script nonce="123"src="/content-security-policy/support/testharness-helper.js"></script>
+  <script src="./support/csp-violations.js"></script>
 </head>
 <body>
   <script nonce="123">
@@ -21,34 +21,6 @@
   // processed we can we sure that an earlier event - if it indeed occurred -
   // must have already been processed.
 
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  // how_many - how many violation events are expected.
-  // filter_arg - iff function, call it with the event object.
-  //              Else, string-ify and compare against event.originalPolicy.
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // Like assert_throws_*, but we don't care about the exact error. We just want
-  // to run the code and continue.
-  function expect_throws(fn) {
-    try { fn(); } catch (err) { return; /* ignore */ }
-    assert_unreached();
-  }
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const a_policy = {
@@ -59,56 +31,41 @@
 
   const scriptyPolicy = trustedTypes.createPolicy('allowEval', a_policy);
 
-  // Provoke/wait for a CSP violation, in order to be sure that all previous
-  // CSP violations have been delivered.
-  function promise_flush() {
-    return promise_violation("object-src 'none'");
-  }
-  function flush() {
-   expect_throws(_ => {
-      var o = document.createElement('object');
-      o.type = "application/x-shockwave-flash";
-      document.body.appendChild(o);
-    });
-  }
-
   window.script_run_beacon = 'never_overwritten';
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(promise_flush());
-    expect_throws(_ => eval('script_run_beacon="should not run"'));
+  promise_test(async t => {
+    const input = 'script_run_beacon="should not run"';
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      eval(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
     assert_equals(script_run_beacon, 'never_overwritten');
-    flush();
-    return p;
   }, "Trusted Type violation report: evaluating a string violates both script-src and trusted-types.");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("script-src"))
-        .then(promise_flush());
-    expect_throws(_ => eval(scriptyPolicy.createScript('script_run_beacon="i ran"')));
-    flush();
+  promise_test(async t => {
+    const input = 'script_run_beacon="i ran"';
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      eval(scriptyPolicy.createScript(input))
+    );
+    assert_equals(violation.effectiveDirective, "script-src");
+    assert_equals(violation.sample, clipSampleIfNeeded(input));
     assert_not_equals(script_run_beacon, 'i ran'); // Code did not run.
     assert_equals(script_run_beacon, 'never_overwritten');
-    return p;
   }, "Trusted Type violation report: evaluating a Trusted Script violates script-src.");
 
-  promise_test(t => {
+  promise_test(async t => {
+    const input = 'script_run_beacon="should not run"';
     trustedTypes.createPolicy('default', {
       createScript: s => s,
     }, true);
-    let p = Promise.resolve()
-        .then(promise_violation((e) =>
-           e.effectiveDirective.includes('script-src') &&
-           e.sample.includes("should not run")))
-        .then(promise_flush());
-    expect_throws(_ => eval('script_run_beacon="should not run"')); // script-src will block.
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      eval(input) // script-src will block.
+    );
+    assert_equals(violation.effectiveDirective, "script-src");
+    assert_equals(violation.sample, clipSampleIfNeeded(input));
     assert_not_equals(script_run_beacon, 'should not run'); // Code did not run.
     assert_equals(script_run_beacon, 'never_overwritten');
-    flush();
-    return p;
   }, "Trusted Type violation report: script-src restrictions apply after the default policy runs.");
 
   </script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
index a81f5a45789..226db176bd8 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <head>
   <script nonce="123" src="/resources/testharness.js"></script>
-  <script nonce="123"src="/resources/testharnessreport.js"></script>
-  <script nonce="123"src="/content-security-policy/support/testharness-helper.js"></script>
+  <script nonce="123" src="/resources/testharnessreport.js"></script>
+  <script nonce="123" src="./support/csp-violations.js"></script>
 </head>
 <body>
   <script nonce="123">
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // CSP insists the "trusted-types: ..." directives are delivered as headers
   // (rather than as "<meta http-equiv" tags). This test assumes the following
   // headers are set in the .headers file:
   //
@@ -21,34 +21,6 @@
   // processed we can we sure that an earlier event - if it indeed occurred -
   // must have already been processed.
 
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  //
-  // filter_arg - iff function, call it with the event object.
-  //              Else, string-ify and compare against event.originalPolicy.
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // Like assert_throws_*, but we don't care about the exact error. We just want
-  // to run the code and continue.
-  function expect_throws(fn) {
-    try { fn(); } catch (err) { return; /* ignore */ }
-    assert_unreached();
-  }
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const a_policy = {
@@ -59,48 +31,33 @@
 
   const scriptyPolicy = trustedTypes.createPolicy('allowEval', a_policy);
 
-  // Provoke/wait for a CSP violation, in order to be sure that all previous
-  // CSP violations have been delivered.
-  function promise_flush() {
-    return promise_violation("object-src 'none'");
-  }
-  function flush() {
-   expect_throws(_ => {
-      var o = document.createElement('object');
-      o.type = "application/x-shockwave-flash";
-      document.body.appendChild(o);
-    });
-  }
-
   window.script_run_beacon = 'vanilla';
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(promise_flush());
-    eval('script_run_beacon="report-only-does-not-stop"');
+  promise_test(async t => {
+    const input = 'script_run_beacon="report-only-does-not-stop"';
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      eval(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
     assert_equals(script_run_beacon, 'report-only-does-not-stop');
-    flush();
-    return p;
   }, "Trusted Type violation report: evaluating a string.");
 
-  promise_test(t => {
-    let p = promise_flush()();
-    eval(scriptyPolicy.createScript('script_run_beacon="trusted-script-ok"'));
-    flush();
+  promise_test(async t => {
+    await no_trusted_type_violation_for(_ =>
+      eval(scriptyPolicy.createScript('script_run_beacon="trusted-script-ok"'))
+    );
     assert_equals(script_run_beacon, 'trusted-script-ok');
-    return p;
   }, "Trusted Type violation report: evaluating a Trusted Script.");
 
-  promise_test(t => {
+  promise_test(async t => {
     trustedTypes.createPolicy('default', {
       createScript: s => s,
     }, true);
-    let p = promise_flush()();
-    eval('script_run_beacon="payload"');
+    await no_trusted_type_violation_for(_ =>
+      eval('script_run_beacon="payload"')
+    );
     assert_equals(script_run_beacon, 'payload');
-    flush();
-    return p;
   }, "Trusted Type violation report: default policy runs in report-only mode.");
 
   </script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html
index e7c7245f9e4..2fc889549ec 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html
@@ -2,10 +2,11 @@
 <head>
   <script nonce="123" src="/resources/testharness.js"></script>
   <script nonce="123" src="/resources/testharnessreport.js"></script>
+  <script nonce="123" src="./support/csp-violations.js"></script>
 </head>
 <body>
   <script nonce="123">
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // CSP insists the "trusted-types: ..." directives are delivered as headers
   // (rather than as "<meta http-equiv" tags). This test assumes the following
   // headers are set in the .headers file:
   //
@@ -20,29 +21,6 @@
   // processed we can we sure that an earlier event - if it indeed occurred -
   // must have already been processed.
 
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = e.originalPolicy.includes(filter_arg);
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // Like assert_throws_*, but we don't care about the exact error. We just want
-  // to run the code and continue.
-  function expect_throws(fn) {
-    try { fn(); } catch (err) { return; /* ignore */ }
-    assert_unreached();
-  }
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const a_policy = {
@@ -52,38 +30,23 @@
   };
   const scriptyPolicy = trustedTypes.createPolicy('allowEval', a_policy);
 
-  // Provoke/wait for a CSP violation, in order to be sure that all previous
-  // CSP violations have been delivered.
-  function promise_flush() {
-    return promise_violation("object-src 'none'");
-  }
-  function flush() {
-   expect_throws(_ => {
-      var o = document.createElement('object');
-      o.type = "application/x-shockwave-flash";
-      document.body.appendChild(o);
-    });
-  }
-
-  promise_test(t => {
+  promise_test(async t => {
+    const input = 'beacon="should not run"';
     let beacon = 'never_overwritten';
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(promise_flush());
-    assert_throws_js(EvalError,
-                     _ => eval('beacon="should not run"'));
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      eval(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
     assert_equals(beacon, 'never_overwritten');
-    flush();
-    return p;
   }, "Trusted Type violation report: evaluating a string.");
 
-  promise_test(t => {
+  promise_test(async t => {
     let beacon = 'never_overwritten2';
-    let p = promise_flush()();
-    eval(scriptyPolicy.createScript('beacon="i ran"'));
+    await no_trusted_type_violation_for(_ =>
+      eval(scriptyPolicy.createScript('beacon="i ran"'))
+    );
     assert_equals(beacon, 'i ran');
-    flush();
-    return p;
   }, "Trusted Type violation report: evaluating a Trusted Script.");
 
   </script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-report-only.html b/tests/wpt/tests/trusted-types/trusted-types-report-only.html
index fcb77841163..f4386f832f4 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-report-only.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-report-only.html
@@ -3,6 +3,7 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/content-security-policy/support/testharness-helper.js"></script>
+<script src="./support/csp-violations.js"></script>
 </head>
 <body>
 
@@ -13,27 +14,12 @@
   <script id="script2"></script>
 
   <script>
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // CSP insists the "trusted-types: ..." directives are delivered as headers
   // (rather than as "meta http-equiv" tags). This test assumes the following
   // headers are set in the .headers file:
   //
   //   Content-Security-Policy-Report-Only: trusted-types ...; report-uri ...
 
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  function expect_violation(filter) {
-    return new Promise((resolve, reject) => {
-      function handler(e) {
-        if (e.originalPolicy.includes(filter)) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const policy = trustedTypes.createPolicy("two", {
@@ -41,46 +27,48 @@
     createScriptURL: id,
     createScript: id,
   });
-/*
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script").src = "#abc";
-    assert_true(document.getElementById("script").src.endsWith("#abc"));
-    return p;
-  }, "Trusted Type violation report-only: assign string to script url");
-*/
 
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("div").innerHTML = "abc";
+  promise_test(async t => {
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      document.getElementById("script").src = "// #abc"
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types two"));
+    assert_true(document.getElementById("script").src.endsWith("// #abc"));
+  }, "Trusted Type violation report-only: assign string to script url");
+
+  promise_test(async t => {
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      document.getElementById("div").innerHTML = "abc"
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types two"));
     assert_equals(document.getElementById("div").textContent, "abc");
-    return p;
   }, "Trusted Type violation report-only: assign string to html");
 
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script-src").src = "#";
+  promise_test(async t => {
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      document.getElementById("script-src").src = "#"
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types two"));
     assert_true(document.getElementById("script-src").src.endsWith("#"));
-    return p;
   }, "Trusted Type violation report-only: assign string to script.src");
 
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script").innerHTML = "con" + "sole.log('Hello');";
+  promise_test(async t => {
+    let violation = await trusted_type_violation_without_exception_for(_ =>
+      document.getElementById("script").innerHTML = "con" + "sole.log('Hello');"
+    );
+    assert_true(violation.originalPolicy.includes("trusted-types two"));
     assert_true(document.getElementById("script").textContent.startsWith("consol"));
-    return p;
   }, "Trusted Type violation report-only: assign string to script content");
 
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script").src = "#def";
-    return p.then(report => {
-      assert_equals(report.documentURI, "" + window.location);
-      assert_equals(report.disposition, "report");
-      assert_equals(report.effectiveDirective, "require-trusted-types-for");
-      assert_equals(report.violatedDirective, "require-trusted-types-for");
-      assert_true(report.originalPolicy.startsWith("trusted-types two;"));
-    });
+  promise_test(async t => {
+    let report = await trusted_type_violation_without_exception_for(_ =>
+      document.getElementById("script").src = "#def"
+    );
+    assert_equals(report.documentURI, "" + window.location);
+    assert_equals(report.disposition, "report");
+    assert_equals(report.effectiveDirective, "require-trusted-types-for");
+    assert_equals(report.violatedDirective, "require-trusted-types-for");
+    assert_true(report.originalPolicy.startsWith("trusted-types two;"));
   }, "Trusted Type violation report: check report contents");
   </script>
 </body>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers b/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
index 857a8b31e86..383f05138fe 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
+++ b/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
@@ -1 +1,2 @@
 Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php; require-trusted-types-for 'script';
+Content-Security-Policy: object-src 'none'
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting.html b/tests/wpt/tests/trusted-types/trusted-types-reporting.html
index 96c9dd72813..2ea5855e054 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-reporting.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting.html
@@ -3,7 +3,7 @@
   <meta name="timeout" content="long">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="/content-security-policy/support/testharness-helper.js"></script>
+  <script src="./support/csp-violations.js"></script>
 </head>
 <body>
   <!-- Some elements for the tests to act on. -->
@@ -33,52 +33,6 @@
 
   const url = "" + document.location;
 
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  //
-  // filter_arg - iff function, call it with the event object.
-  //              Else, string-ify and compare against event.originalPolicy.
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // Like assert_throws_*, but we don't care about the exact error. We just want
-  // to run the code and continue.
-  function expect_throws(fn) {
-    try { fn(); } catch (err) { return; /* ignore */ }
-    assert_unreached();
-  }
-
-  // Test the "sample" field of the event.
-  // TODO(vogelheim): The current set of tests allows for more variance in the
-  //     sample reports than the current spec draft does. Once the spec has
-  //     been finalized, we should clamp this down to check byte-for-byte
-  //     against the values mandated by the spec.
-
-  function expect_sample(s) { return e => {
-    assert_true(e.sample.includes(s),
-                `expected "${e.sample}" to include "${s}".`);
-    return e;
-  } }
-
-  function expect_blocked_uri(s) { return e => {
-    assert_equals(e.blockedURI, s,
-                `expected "${e.blockedURI}" to be "${s}".`);
-    return e;
-  } }
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const a_policy = {
@@ -87,172 +41,173 @@
     createScript: id,
   };
 
-  // Provoke/wait for a CSP violation, in order to be sure that all previous
-  // CSP violations have been delivered.
-  function promise_flush() {
-    return promise_violation("object-src 'none'");
-  }
-  function flush() {
-   expect_throws(_ => {
-      var o = document.createElement('object');
-      o.type = "video/mp4";
-      o.data = "dummy.webm";
-      document.body.appendChild(o);
-    });
-  }
-
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("trusted-types one"))
-        .then(promise_violation("trusted-types two"))
-        .then(expect_sample("three"))
-        .then(expect_blocked_uri("trusted-types-policy"))
-        .then(promise_flush());
-    expect_throws(_ => trustedTypes.createPolicy("three", a_policy));
-    flush();
-    return p;
+  promise_test(async t => {
+    const policyName = "three";
+    let {violations, exception} =
+        await trusted_type_violations_and_exception_for(_ =>
+          trustedTypes.createPolicy("three", a_policy)
+        );
+    assert_equals(violations.length, 2);
+    assert_true(violations[0].originalPolicy.includes("trusted-types one"));
+    assert_equals(violations[0].sample, clipSampleIfNeeded(policyName));
+    assert_equals(violations[0].blockedURI, "trusted-types-policy");
+    assert_true(violations[1].originalPolicy.includes("trusted-types two"));
+    assert_equals(violations[1].sample, clipSampleIfNeeded(policyName));
+    assert_equals(violations[1].blockedURI, "trusted-types-policy");
+    assert_true(exception instanceof TypeError);
   }, "Trusted Type violation report: creating a forbidden policy.");
 
-  promise_test(t => {
-    let p = promise_flush()();
-    expect_throws(_ => trustedTypes.createPolicy("two", a_policy));
-    flush();
-    return p;
+  promise_test(async t => {
+    const policyName = "two";
+    let {violations, exception} =
+        await trusted_type_violations_and_exception_for(_ =>
+          trustedTypes.createPolicy(policyName, a_policy)
+        );
+    assert_equals(violations.length, 1);
+    assert_true(violations[0].originalPolicy.includes("trusted-types one"));
+    assert_equals(violations[0].sample, clipSampleIfNeeded(policyName));
+    assert_equals(violations[0].blockedURI, "trusted-types-policy");
+    assert_true(exception instanceof TypeError);
   }, "Trusted Type violation report: creating a report-only-forbidden policy.");
 
   // policy_one is set below, and used in several tests further down.
   let policy_one = null;
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("trusted-types two"))
-        .then(promise_flush());
-    policy_one = trustedTypes.createPolicy("one", a_policy);
-    flush();
-    return p;
+  promise_test(async t => {
+    const policyName = "one";
+    let violation =
+        await trusted_type_violation_without_exception_for(_ =>
+          policy_one = trustedTypes.createPolicy(policyName, a_policy)
+        );
+    assert_true(violation.originalPolicy.includes("trusted-types two"));
+    assert_equals(violation.sample, clipSampleIfNeeded(policyName));
+    assert_equals(violation.blockedURI, "trusted-types-policy");
   }, "Trusted Type violation report: creating a forbidden-but-not-reported policy.");
 
-  promise_test(t => {
-    let p = promise_violation("require-trusted-types-for 'script")()
-         .then(expect_blocked_uri("trusted-types-sink"))
-         .then(expect_sample("Element insertAdjacentHTML|x"));
-    expect_throws(() => {
-      document.getElementById("div").insertAdjacentHTML("beforebegin", "x");
-    });
-    return p;
+  promise_test(async t => {
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("div").insertAdjacentHTML("beforebegin", "x")
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
   }, "Trusted Type violation report: blocked URI and sample for insertAdjacentHTML");
 
-  promise_test(t => {
-    let p = promise_violation("require-trusted-types-for 'script'")();
-    expect_throws(_ => document.getElementById("script").src = url);
-    return p;
+  promise_test(async t => {
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("script").src = url
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
   }, "Trusted Type violation report: assign string to script url");
 
-  promise_test(t => {
-    let p = promise_violation("require-trusted-types-for 'script'")();
-    expect_throws(_ => document.getElementById("div").innerHTML = "abc");
-    return p;
+  promise_test(async t => {
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("div").innerHTML = "abc"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
   }, "Trusted Type violation report: assign string to html");
 
-  promise_test(t => {
-    let p = promise_flush()();
-    document.getElementById("script").text = policy_one.createScript("2+2;");
-    flush();
-    return p;
+  promise_test(async t => {
+    await no_trusted_type_violation_for(_ =>
+      document.getElementById("script").text = policy_one.createScript("2+2;")
+    );
   }, "Trusted Type violation report: assign trusted script to script; no report");
 
-  promise_test(t => {
-    let p = promise_flush()();
-    document.getElementById("div").innerHTML = policy_one.createHTML("abc");
-    flush();
-    return p;
+  promise_test(async t => {
+    await no_trusted_type_violation_for(_ =>
+      document.getElementById("div").innerHTML = policy_one.createHTML("abc")
+    );
   }, "Trusted Type violation report: assign trusted HTML to html; no report");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("Element innerHTML|abc"));
-    expect_throws(_ => { document.getElementById("div").innerHTML = "abc" });
-    return p;
+  promise_test(async t => {
+    const input = "abc";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("div").innerHTML = input
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `Element innerHTML|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for innerHTML assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("HTMLScriptElement text|abc"));
-    expect_throws(_ => { document.getElementById("script").text = "abc" });
-    return p;
+  promise_test(async t => {
+    const input = "1+2;";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("script").text = input
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `HTMLScriptElement text|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for text assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("HTMLScriptElement src"));
-      expect_throws(_ => { document.getElementById("script").src = "" });
-    return p;
+  promise_test(async t => {
+    const input = "about:blank";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("script").src = input
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `HTMLScriptElement src|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for script.src assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("HTMLScriptElement innerText|2+2;"));
-    expect_throws(_ => document.getElementById("script").innerText = "2+2;");
-    return p;
+  promise_test(async t => {
+    const input = "2+2;";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("script").innerText = "2+2;"
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `HTMLScriptElement innerText|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for script innerText assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("SVGScriptElement href"));
-      expect_throws(_ => { document.getElementById("svgscript").href.baseVal = "" });
-    return p;
+  promise_test(async t => {
+    const input = "about:blank";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("svgscript").href.baseVal = input
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `SVGScriptElement href|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for SVGScriptElement href assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("SVGScriptElement href"));
-      expect_throws(_ => { document.getElementById("svgscript").setAttribute('href', "test"); });
-    return p;
+  promise_test(async t => {
+    const input = "about:blank";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("svgscript").setAttribute('href', input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `SVGScriptElement href|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for SVGScriptElement href assignment by setAttribute");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("SVGScriptElement text"));
-      expect_throws(_ => { document.getElementById("svgscript").insertBefore(document.createTextNode("Hello"), null) });
-    return p;
+  promise_test(async t => {
+    const input = "2+3";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("svgscript").insertBefore(document.createTextNode(input), null)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `SVGScriptElement text|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for SVGScriptElement text assignment");
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("eval|2+2"))
-        .then(promise_flush());
-    expect_throws(_ => eval("2+2"));
-    flush();
-    return p;
+  promise_test(async t => {
+    const input = "2+2";
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      eval(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: sample for eval");
 
-  promise_test(t => {
+  promise_test(async t => {
     // We expect the sample string to always contain the name, and at least the
     // start of the value, but it should not be excessively long.
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("HTMLScriptElement innerText|abbb"))
-        .then(e => assert_less_than(e.sample.length, 150));
     const value = "a" + "b".repeat(50000);
-    expect_throws(_ => document.getElementById("script").innerText = value);
-    return p;
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      document.getElementById("script").innerText = value
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `HTMLScriptElement innerText|${clipSampleIfNeeded(value)}`);
   }, "Trusted Type violation report: large values should be handled sanely.");
 
   // Test reporting for Custom Elements (where supported). The report should
@@ -262,25 +217,25 @@
     class CustomScript extends HTMLScriptElement {};
     customElements.define("custom-script", CustomScript, { extends: "script" });
 
-    promise_test(t => {
-      let p = Promise.resolve()
-          .then(promise_violation("require-trusted-types-for 'script'"))
-          .then(expect_blocked_uri("trusted-types-sink"))
-          .then(expect_sample("HTMLScriptElement src|abc"));
-      expect_throws(_ => document.getElementById("customscript").src = "abc");
-      return p;
+    promise_test(async t => {
+      const input = "about:blank";
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        document.getElementById("customscript").src = input
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.blockedURI, "trusted-types-sink");
+      assert_equals(violation.sample, `HTMLScriptElement src|${clipSampleIfNeeded(input)}`);
     }, "Trusted Type violation report: sample for custom element assignment");
   }
 
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("require-trusted-types-for 'script'"))
-        .then(expect_blocked_uri("trusted-types-sink"))
-        .then(expect_sample("Worker constructor|"))
-        .then(promise_flush());
-    expect_throws(_ => new Worker("blabla"));
-    flush();
-    return p;
+  promise_test(async t => {
+    const input = "about:blank";
+    let violation = await trusted_type_violation_for(TypeError, _ =>
+      new Worker(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `Worker constructor|${clipSampleIfNeeded(input)}`);
   }, "Trusted Type violation report: Worker constructor");
 
   </script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-source-file-path.html b/tests/wpt/tests/trusted-types/trusted-types-source-file-path.html
index 6e87c25a7f0..edb1d5d68e9 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-source-file-path.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-source-file-path.html
@@ -6,8 +6,10 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/common/get-host-info.sub.js"></script>
+  <script src="./support/csp-violations.js"></script>
   <meta http-equiv="Content-Security-Policy"
         content="require-trusted-types-for 'script'; trusted-types id">
+  <meta http-equiv="Content-Security-Policy" content="object-src 'none'">
   </head>
 <body>
 
@@ -21,12 +23,6 @@ let id_policy = trustedTypes.createPolicy("id", {
   createScript: x => x,
 });
 
-function futureViolation() {
-  return new Promise(r => addEventListener("securitypolicyviolation", r), {
-    once: true
-  });
-}
-
 function futureScript(url) {
   return new Promise(r => {
     let script = document.createElement("script");
@@ -37,34 +33,38 @@ function futureScript(url) {
 }
 
 promise_test(async t => {
-  let future_violation = futureViolation();
-  assert_throws_js(TypeError, _ => {
-    document.getElementById("to-be-modified").innerHTML = "'test'";
-  });
-  let violation = await future_violation;
-  assert_equals(violation.sourceFile, location.href)
+  const input = "'test'";
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    document.getElementById("to-be-modified").innerHTML = input
+  );
+  assert_equals(violation.sourceFile, location.href);
+  assert_equals(violation.sample, `Element innerHTML|${clipSampleIfNeeded(input)}`);
 }, "same-document script")
 
 promise_test(async t => {
+  const input = "'test'";
   let script_origin = get_host_info().HTTP_ORIGIN;
   let script_src = script_origin +
     "/trusted-types/support/set-inner-html.js";
   let script = await futureScript(script_src);
-  let future_violation = futureViolation();
-  assert_throws_js(TypeError, () => setInnerHtml(toBeModified, "'test'"));
-  let violation = await future_violation;
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    setInnerHtml(toBeModified, input)
+  );
   assert_equals(violation.sourceFile, script_src);
+  assert_equals(violation.sample, `Element innerHTML|${clipSampleIfNeeded(input)}`);
 }, "same-origin script")
 
 promise_test(async t => {
+  const input = "'test'";
   let script_origin = get_host_info().HTTP_REMOTE_ORIGIN;
   let script_src = script_origin +
     "/trusted-types/support/set-inner-html.js";
   let script = await futureScript(script_src);
-  let future_violation = futureViolation();
-  assert_throws_js(TypeError, () => setInnerHtml(toBeModified, "'test'"));
-  let violation = await future_violation;
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    setInnerHtml(toBeModified, input)
+  );
   assert_equals(violation.sourceFile, script_src);
+  assert_equals(violation.sample, `Element innerHTML|${clipSampleIfNeeded(input)}`);
 }, "cross-origin script")
 
 // TODO(arthursonzogni): Check what happens with redirects. Do we report the
diff --git a/tests/wpt/tests/trusted-types/trusted-types-svg-script-set-href.html b/tests/wpt/tests/trusted-types/trusted-types-svg-script-set-href.html
index e437df360db..f339ba119a1 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-svg-script-set-href.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-svg-script-set-href.html
@@ -2,10 +2,11 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/resolve-spv.js"></script>
+  <script src="./support/csp-violations.js"></script>
   <script src="./support/namespaces.js"></script>
   <meta http-equiv="Content-Security-Policy"
         content="require-trusted-types-for 'script'">
+  <meta http-equiv="Content-Security-Policy" content="object-src 'none'">
 </head>
 <body>
   <div id="log"></div>
@@ -14,13 +15,15 @@
     const policy = trustedTypes.createPolicy("policy", {
       createScriptURL: script_url => script_url });
 
-    promise_test(t => {
+    promise_test(async t => {
+      const input = "about:blank";
       const elem = document.createElementNS(NSURI_SVG, "script");
-      assert_throws_js(TypeError, _ => {
-        elem.href.baseVal = "about:blank";
-      });
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        elem.href.baseVal = input
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement href|${clipSampleIfNeeded(input)}`);
       document.getElementById("svg").appendChild(elem);
-      return promise_spv();
     }, "Assign string to SVGScriptElement.href.baseVal.");
 
     promise_test(t => {
@@ -32,13 +35,15 @@
       return Promise.resolve();
     }, "Assign TrustedScriptURL to SVGScriptElement.href.baseVal.");
 
-    promise_test(t => {
+    promise_test(async t => {
+      const input = "about:blank";
       const elem = document.createElementNS(NSURI_SVG, "script");
-      assert_throws_js(TypeError, _ => {
-        elem.setAttribute("href", "about:blank");
-      });
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        elem.setAttribute("href", input)
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement href|${clipSampleIfNeeded(input)}`);
       document.getElementById("svg").appendChild(elem);
-      return promise_spv();
     }, "Assign string to non-attached SVGScriptElement.href via setAttribute.");
 
     promise_test(t => {
@@ -50,13 +55,15 @@
       return Promise.resolve();
     }, "Assign TrustedScriptURL to non-attached SVGScriptElement.href via setAttribute.");
 
-    promise_test(t => {
+    promise_test(async t => {
+      const input = "about:blank";
       const elem = document.createElementNS(NSURI_SVG, "script");
       document.getElementById("svg").appendChild(elem);
-      assert_throws_js(TypeError, _ => {
-        elem.setAttribute("href", "about:blank");
-      });
-      return promise_spv();
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        elem.setAttribute("href", input)
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement href|${clipSampleIfNeeded(input)}`);
     }, "Assign string to attached SVGScriptElement.href via setAttribute.");
 
     promise_test(t => {
diff --git a/tests/wpt/tests/trusted-types/trusted-types-svg-script.html b/tests/wpt/tests/trusted-types/trusted-types-svg-script.html
index 2fca03906ab..4fc3b710eb6 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-svg-script.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-svg-script.html
@@ -2,9 +2,10 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/resolve-spv.js"></script>
+  <script src="./support/csp-violations.js"></script>
   <meta http-equiv="Content-Security-Policy"
         content="require-trusted-types-for 'script'">
+  <meta http-equiv="Content-Security-Policy" content="object-src 'none'">
 </head>
 <body>
   <div id="log"></div>
@@ -13,32 +14,46 @@
     const policy = trustedTypes.createPolicy("policy", {
         createScript: x => x, createHTML: x => x, createScriptURL: x => x });
 
-    promise_test(t => {
-      assert_throws_js(TypeError, _ => {
-        document.getElementById("script").innerHTML = "'modified via innerHTML';";
-      });
-      return promise_spv();
+    promise_test(async t => {
+      const input = "'modified via innerHTML';"
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        document.getElementById("script").innerHTML = input
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement innerHTML|${clipSampleIfNeeded(input)}`);
     }, "Assign String to SVGScriptElement.innerHTML.");
 
-    promise_test(t => {
-      document.getElementById("script").innerHTML = policy.createHTML("'modified via innerHTML';");
-      return Promise.resolve();
+    promise_test(async t => {
+      const input = "'modified via innerHTML';"
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        document.getElementById("script").innerHTML = policy.createHTML(input)
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement innerHTML|${clipSampleIfNeeded(input)}`);
     }, "Assign TrustedHTML to SVGScriptElement.innerHTML.");
 
-    promise_test(t => {
+    promise_test(async t => {
+      const input = "'modified via innerHTML';"
       const elem = document.createElementNS(
           "http://www.w3.org/2000/svg", "script");
-      elem.innerHTML = policy.createHTML("'modified via innerHTML';");
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        elem.innerHTML = policy.createHTML(input)
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement innerHTML|${clipSampleIfNeeded(input)}`);
       document.getElementById("svg").appendChild(elem);
-      return promise_spv();
     }, "Assign TrustedHTML to SVGScriptElement.innerHTML and execute it.");
 
-    promise_test(t => {
+    promise_test(async t => {
+      const input = "modified via DOM";
       const elem = document.createElementNS(
           "http://www.w3.org/2000/svg", "script");
-      elem.insertBefore(document.createTextNode("modified via DOM"), null);
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        elem.insertBefore(document.createTextNode(input), null)
+      );
+      assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+      assert_equals(violation.sample, `SVGScriptElement text|${clipSampleIfNeeded(input)}`);
       document.getElementById("svg").appendChild(elem);
-      return promise_spv();
     }, "Modify SVGScriptElement via DOM manipulation.");
 
     promise_test(t => {
diff --git a/tests/wpt/tests/url/resources/urltestdata.json b/tests/wpt/tests/url/resources/urltestdata.json
index 0ebaf4cd4c4..7669217c470 100644
--- a/tests/wpt/tests/url/resources/urltestdata.json
+++ b/tests/wpt/tests/url/resources/urltestdata.json
@@ -3137,6 +3137,21 @@
     "search": "",
     "hash": ""
   },
+  {
+    "input": "https://example.com/aaa/bbb/%2e%2e?query",
+    "base": null,
+    "href": "https://example.com/aaa/?query",
+    "origin": "https://example.com",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/aaa/",
+    "search": "?query",
+    "hash": ""
+  },
   "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/segments-userinfo-vs-host.html",
   {
     "input": "http:@www.example.com",
diff --git a/tests/wpt/tests/web-animations/crashtests/get-keyframe-fontsize-crash.html b/tests/wpt/tests/web-animations/crashtests/get-keyframe-fontsize-crash.html
new file mode 100644
index 00000000000..d9f2869d564
--- /dev/null
+++ b/tests/wpt/tests/web-animations/crashtests/get-keyframe-fontsize-crash.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/387447929">
+<html id="root">
+    <style>
+        #root {
+            transition: all 5s ease;
+        }
+
+        #root.override {
+            font-size: 5rem;
+        }
+    </style>
+  <p>This test succeeds if the transition keyframes can be retrieved without a crash</p>
+  <script>
+      // Transition will not run if document is not loaded
+      window.onload = () => {
+        document.getElementById("root").className = "override";
+        document.getAnimations()[0].effect.getKeyframes();
+      };
+  </script>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/webcodecs/image-decoder.https.any.js b/tests/wpt/tests/webcodecs/image-decoder.https.any.js
index 78eea763aaa..1b3fabbfc4a 100644
--- a/tests/wpt/tests/webcodecs/image-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/image-decoder.https.any.js
@@ -199,6 +199,7 @@ promise_test(t => {
           return response.arrayBuffer();
         })
         .then(buffer => {
+          // IDAT chunk starts at byte 83 (0x53).
           decoder =
               new ImageDecoder({data: buffer.slice(0, 100), type: 'image/png'});
           return decoder.tracks.ready;
@@ -207,14 +208,28 @@ promise_test(t => {
           // Queue two decodes to ensure index verification and decoding are
           // properly ordered.
           p1 = decoder.decode({frameIndex: 0});
-          return promise_rejects_js(
-              t, RangeError, decoder.decode({frameIndex: 1}));
+          return promise_rejects_dom(
+              // Requesting to decode frame #1 would normally be expected to
+              // return RangeError (see 'Test out of range index returns
+              // RangeError' above).  Here the decoder fails earlier because
+              // `p1` is requesting to decode frame #0 and the PNG has been
+              // truncated to the first 100 bytes.  This is why here we expect
+              // EncodingError instead.
+              //
+              // Also note that in this test the data source is an ArrayBuffer.
+              // Therefore the decoder can see that there is no more data coming
+              // - this means that the decoder can declare a fatal error, rather
+              // than assuming an incomplete input stream.
+              t, 'EncodingError', decoder.decode({frameIndex: 1}));
         })
         .then(_ => {
-          return promise_rejects_js(t, RangeError, p1);
+          // Requesting to decode frame #0 (the `p1` Promise) throws
+          // EncodingError, because the PNG has been truncated to the first 100
+          // bytes.
+          return promise_rejects_dom(t, 'EncodingError', p1);
         })
   });
-}, 'Test partial decoding without a frame results in an error');
+}, 'Test decoding a partial ArrayBuffer results in EncodingError');
 
 promise_test(t => {
   var decoder;
diff --git a/tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js b/tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js
index c4c49d81e55..3669edc630b 100644
--- a/tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js
+++ b/tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js
@@ -11,7 +11,7 @@ function get_config() {
     '?vp9_p0': {codec: 'vp09.00.10.08'},
     '?vp9_p2': {codec: 'vp09.02.10.10'},
     '?h264': {codec: 'avc1.42001E', avc: {format: 'annexb'}},
-    '?h265': {codec: 'hev1.1.6.L93.90', hev: {format: 'annexb'}}
+    '?h265': {codec: 'hev1.1.6.L93.90', hevc: {format: 'annexb'}}
   }[location.search];
   config.width = 320;
   config.height = 200;
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
index 17f7acf2f9b..ac964b67687 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
@@ -45,7 +45,7 @@ async def test_new_context(bidi_session, wait_for_event, wait_for_future_safe, s
     assert_browsing_context(
         context_info,
         new_context["context"],
-        children=None,
+        children=0,
         url="about:blank",
         parent=None,
         user_context="default"
@@ -105,31 +105,29 @@ async def test_navigate_iframe(
     assert_browsing_context(
         context_info,
         frame["context"],
-        children=None,
+        children=0,
         url=frame_url,
         parent=new_tab["context"],
     )
 
 
 async def test_delete_iframe(
-    bidi_session, wait_for_event, wait_for_future_safe, subscribe_events, new_tab, inline
+    bidi_session, wait_for_event, wait_for_future_safe, subscribe_events, new_tab, inline, test_page_multiple_frames
 ):
     await subscribe_events([CONTEXT_DESTROYED_EVENT])
 
     on_entry = wait_for_event(CONTEXT_DESTROYED_EVENT)
 
-    frame_url = inline("<div>foo</div>")
-    url = inline(f"<iframe src='{frame_url}'></iframe>")
     await bidi_session.browsing_context.navigate(
-        url=url, context=new_tab["context"], wait="complete"
+        url=test_page_multiple_frames, context=new_tab["context"], wait="complete"
     )
 
     contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
     iframe = contexts[0]["children"][0]
 
-    # Delete the iframe
+    # Delete the first iframe
     await bidi_session.script.evaluate(
-        expression="""document.querySelector('iframe').remove()""",
+        expression="""document.querySelector('iframe:nth-of-type(1)').remove()""",
         target=ContextTarget(new_tab["context"]),
         await_promise=False,
     )
@@ -139,13 +137,13 @@ async def test_delete_iframe(
     assert_browsing_context(
         context_info,
         iframe["context"],
-        children=None,
-        url=frame_url,
+        children=0,
+        url=iframe["url"],
         parent=new_tab["context"],
     )
 
 
-async def test_delete_nested_iframes(
+async def test_nested_iframes_delete_top_iframe(
     bidi_session,
     subscribe_events,
     new_tab,
@@ -179,7 +177,7 @@ async def test_delete_nested_iframes(
     assert_browsing_context(
         events[0],
         top_iframe["context"],
-        children=None,
+        children=1,
         url=test_page_same_origin_frame,
         parent=new_tab["context"],
     )
@@ -187,6 +185,50 @@ async def test_delete_nested_iframes(
     remove_listener()
 
 
+async def test_nested_iframes_delete_deepest_iframe(
+    bidi_session,
+    subscribe_events,
+    new_tab,
+    test_page_nested_frames,
+    test_page_same_origin_frame,
+):
+    await subscribe_events([CONTEXT_DESTROYED_EVENT])
+    # Track all received browsingContext.contextDestroyed events in the events array
+    events = []
+
+    async def on_event(_, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(CONTEXT_DESTROYED_EVENT, on_event)
+
+    await bidi_session.browsing_context.navigate(
+        url=test_page_nested_frames, context=new_tab["context"], wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+
+    top_iframe = contexts[0]["children"][0]
+    deepest_iframe = contexts[0]["children"][0]["children"][0]
+
+    # Delete deepest iframe
+    await bidi_session.script.evaluate(
+        expression="""document.querySelector('iframe').remove()""",
+        target=ContextTarget(top_iframe["context"]),
+        await_promise=False,
+    )
+
+    assert len(events) == 1
+    assert_browsing_context(
+        events[0],
+        deepest_iframe["context"],
+        children=0,
+        url=deepest_iframe["url"],
+        parent=top_iframe["context"],
+    )
+
+    remove_listener()
+
+
 async def test_iframe_destroy_parent(
     bidi_session, subscribe_events, new_tab, test_page_nested_frames
 ):
@@ -210,7 +252,7 @@ async def test_iframe_destroy_parent(
     assert_browsing_context(
         events[0],
         new_tab["context"],
-        children=None,
+        children=1,
         url=test_page_nested_frames,
         parent=None,
     )
@@ -283,7 +325,7 @@ async def test_new_user_context(
     assert_browsing_context(
         context_info,
         context["context"],
-        children=None,
+        children=0,
         url="about:blank",
         parent=None,
         user_context=user_context,
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/set_files/files.py b/tests/wpt/tests/webdriver/tests/bidi/input/set_files/files.py
index df91861752c..8ebc8eafeba 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/set_files/files.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/set_files/files.py
@@ -266,16 +266,18 @@ async def test_set_files_twice_same(
 
     element = await get_element("#input")
 
+    files = create_files(["path/to/noop.txt"])
+
     await bidi_session.input.set_files(
         context=top_context["context"],
         element=element,
-        files=create_files(["path/to/noop.txt"]),
+        files=files,
     )
 
     await bidi_session.input.set_files(
         context=top_context["context"],
         element=element,
-        files=create_files(["path/to/noop.txt"]),
+        files=files,
     )
 
     events = await get_events(bidi_session, top_context["context"])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/integration/navigation.py b/tests/wpt/tests/webdriver/tests/bidi/integration/navigation.py
index bced811a66e..a16e2c52a61 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/integration/navigation.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/integration/navigation.py
@@ -8,7 +8,7 @@ from webdriver.bidi.modules.script import ContextTarget
 pytestmark = pytest.mark.asyncio
 
 NAVIGATION_STARTED_EVENT = "browsingContext.navigationStarted"
-FRAGMENT_NAVIGATED_EVENT = "browsingContext.fragmentNavigated"
+HISTORY_UPDATED_EVENT = "browsingContext.historyUpdated"
 BEFORE_REQUEST_SENT_EVENT = "network.beforeRequestSent"
 
 async def test_navigate_history_replacestate_beforeunload(
@@ -38,32 +38,32 @@ async def test_navigate_history_replacestate_beforeunload(
         NAVIGATION_STARTED_EVENT, on_event
     )
 
-    remove_fragment_navigated_listener = bidi_session.add_event_listener(
-        FRAGMENT_NAVIGATED_EVENT, on_event
+    remove_history_updated_listener = bidi_session.add_event_listener(
+        HISTORY_UPDATED_EVENT, on_event
     )
 
     remove_before_request_sent_listener = bidi_session.add_event_listener(
         BEFORE_REQUEST_SENT_EVENT, on_event
     )
 
-    await subscribe_events([NAVIGATION_STARTED_EVENT, FRAGMENT_NAVIGATED_EVENT, BEFORE_REQUEST_SENT_EVENT])
+    await subscribe_events([NAVIGATION_STARTED_EVENT, HISTORY_UPDATED_EVENT, BEFORE_REQUEST_SENT_EVENT])
 
     result = await bidi_session.browsing_context.navigate(
         context=new_tab["context"], url=url, wait="interactive"
     )
 
-    # Navigation caused by browsing_context.navigate call should happen first:
-    # https://html.spec.whatwg.org/#beginning-navigation
+    # navigationStarted caused by browsing_context.navigate call should happen
+    # first: https://html.spec.whatwg.org/#beginning-navigation
     # network.beforeRequestSent should arrive before the page becomes
     # interactive.
     assert events == [
         NAVIGATION_STARTED_EVENT,
-        FRAGMENT_NAVIGATED_EVENT,
+        HISTORY_UPDATED_EVENT,
         BEFORE_REQUEST_SENT_EVENT
     ]
 
     remove_navigation_started_listener()
-    remove_fragment_navigated_listener()
+    remove_history_updated_listener()
     remove_before_request_sent_listener()
 
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py
index f9aab697bd8..cd7c8434e77 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py
@@ -5,20 +5,20 @@ from . import assert_console_entry, assert_javascript_entry
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "log_method, expect_stack",
+    "log_method",
     [
-        ("assert", True),
-        ("debug", False),
-        ("error", True),
-        ("info", False),
-        ("log", False),
-        ("table", False),
-        ("trace", True),
-        ("warn", True),
+      "assert",
+      "debug",
+      "error",
+      "info",
+      "log",
+      "table",
+      "trace",
+      "warn",
     ],
 )
 async def test_console_entry_sync_callstack(
-    bidi_session, subscribe_events, inline, top_context, wait_for_event, wait_for_future_safe, log_method, expect_stack
+    bidi_session, subscribe_events, inline, top_context, wait_for_event, wait_for_future_safe, log_method
 ):
     if log_method == "assert":
         # assert has to be called with a first falsy argument to trigger a log.
@@ -46,14 +46,11 @@ async def test_console_entry_sync_callstack(
 
     on_entry_added = wait_for_event("log.entryAdded")
 
-    if expect_stack:
-        expected_stack = [
-            {"columnNumber": 41, "functionName": "foo", "lineNumber": 4, "url": url},
-            {"columnNumber": 33, "functionName": "bar", "lineNumber": 5, "url": url},
-            {"columnNumber": 16, "functionName": "", "lineNumber": 6, "url": url},
-        ]
-    else:
-        expected_stack = None
+    expected_stack = [
+        {"columnNumber": 41, "functionName": "foo", "lineNumber": 4, "url": url},
+        {"columnNumber": 33, "functionName": "bar", "lineNumber": 5, "url": url},
+        {"columnNumber": 16, "functionName": "", "lineNumber": 6, "url": url},
+    ]
 
     await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=url, wait="complete"
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
index dd0eae49ac1..840b8086d13 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
@@ -19,11 +19,11 @@ from .. import (
     any_string_or_null,
     assert_cookies,
     int_interval,
+    number_interval,
     recursive_compare,
 )
 
 
-
 def assert_bytes_value(bytes_value):
     assert bytes_value["type"] in ["string", "base64"]
     any_string(bytes_value["value"])
@@ -334,6 +334,22 @@ def get_cached_url(content_type, response):
     return f"/webdriver/tests/support/http_handlers/cached.py?{query_string}"
 
 
+def get_network_event_timerange(start, end, bidi_session):
+    """
+    Compute a number_interval to be used for timing comparisons in BiDi network
+    events.
+
+    NOTE: This would ideally be just `number_interval(start - 1, end + 1)`,
+    however on Firefox Windows CI builds, there have been relatively frequent
+    intermittent failures where the values are a few ms off the expected time.
+    See https://bugzilla.mozilla.org/show_bug.cgi?id=1921712
+    """
+    if bidi_session.capabilities.get("browserName") == "firefox":
+        return number_interval(start - 100, end + 1)
+
+    return number_interval(start - 1, end + 1)
+
+
 # Array of status and status text expected to be available in network events
 HTTP_STATUS_AND_STATUS_TEXT = [
     (101, "Switching Protocols"),
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py b/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
index 89fbb09fd54..96cecdf6b2a 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/auth_required/auth_required.py
@@ -5,9 +5,9 @@ from webdriver.error import TimeoutException
 
 from tests.support.sync import AsyncPoll
 
-from ... import number_interval
 from .. import (
     assert_response_event,
+    get_network_event_timerange,
     AUTH_REQUIRED_EVENT,
     PAGE_EMPTY_HTML,
 )
@@ -116,7 +116,7 @@ async def test_request_timing_info(
     await wait_for_future_safe(on_auth_required)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
     expected_request = {"method": "GET", "url": auth_url}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
index ebc3bf8fa86..1449ec00bb1 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py
@@ -6,9 +6,9 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
-from ... import number_interval
 from .. import (
     assert_before_request_sent_event,
+    get_network_event_timerange,
     PAGE_DATA_URL_HTML,
     PAGE_DATA_URL_IMAGE,
     PAGE_EMPTY_HTML,
@@ -283,6 +283,7 @@ async def test_request_cookies(
 
 @pytest.mark.asyncio
 async def test_request_timing_info(
+    bidi_session,
     url,
     wait_for_event,
     wait_for_future_safe,
@@ -301,7 +302,7 @@ async def test_request_timing_info(
     await wait_for_future_safe(on_before_request_sent)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -474,7 +475,7 @@ async def test_serviceworker_request(
     await wait_for_future_safe(on_before_request_sent)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -491,7 +492,13 @@ async def test_serviceworker_request(
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
+    bidi_session,
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    current_time,
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -507,7 +514,7 @@ async def test_url_with_fragment(
     await wait_for_future_safe(on_before_request_sent)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -552,7 +559,7 @@ async def test_navigate_data_url(
     await wait_for_future_safe(on_before_request_sent)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -576,6 +583,7 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
+    bidi_session,
     wait_for_event,
     wait_for_future_safe,
     fetch,
@@ -595,7 +603,7 @@ async def test_fetch_data_url(
     await wait_for_future_safe(on_before_request_sent)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py b/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
index 6beb33f7d69..bdb66722ce9 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/fetch_error/fetch_error.py
@@ -6,10 +6,10 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
-from ... import number_interval
 from .. import (
     assert_fetch_error_event,
     assert_response_event,
+    get_network_event_timerange,
     FETCH_ERROR_EVENT,
     PAGE_EMPTY_HTML,
     RESPONSE_COMPLETED_EVENT,
@@ -245,7 +245,7 @@ async def test_request_timing_info(
     await wait_for_future_safe(on_fetch_error)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
     expected_request = {"method": "GET", "url": PAGE_INVALID_URL}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
index 812df763bd6..127416d8de4 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
@@ -7,9 +7,9 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
-from ... import number_interval
 from .. import (
     assert_response_event,
+    get_network_event_timerange,
     HTTP_STATUS_AND_STATUS_TEXT,
     PAGE_DATA_URL_HTML,
     PAGE_DATA_URL_IMAGE,
@@ -166,7 +166,12 @@ async def test_load_page_twice(
 
 @pytest.mark.asyncio
 async def test_request_timing_info(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test,
+    bidi_session,
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
     current_time,
 ):
     network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
@@ -180,7 +185,7 @@ async def test_request_timing_info(
     await wait_for_future_safe(on_response_completed)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -449,7 +454,7 @@ async def test_serviceworker_request(
     await wait_for_future_safe(on_response_completed)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -470,7 +475,13 @@ async def test_serviceworker_request(
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
+    bidi_session,
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    current_time,
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -486,7 +497,7 @@ async def test_url_with_fragment(
     await wait_for_future_safe(on_response_completed)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -534,7 +545,7 @@ async def test_navigate_data_url(
     await wait_for_future_safe(on_response_completed)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -568,6 +579,7 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
+    bidi_session,
     wait_for_event,
     wait_for_future_safe,
     fetch,
@@ -587,7 +599,7 @@ async def test_fetch_data_url(
     await wait_for_future_safe(on_response_completed)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
index 25f1179f07a..6ab3e1c3cac 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
@@ -6,9 +6,9 @@ from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.sync import AsyncPoll
 
-from ... import number_interval
 from .. import (
     assert_response_event,
+    get_network_event_timerange,
     HTTP_STATUS_AND_STATUS_TEXT,
     PAGE_DATA_URL_HTML,
     PAGE_DATA_URL_IMAGE,
@@ -170,6 +170,7 @@ async def test_request_bodysize(
 
 @pytest.mark.asyncio
 async def test_request_timing_info(
+    bidi_session,
     url,
     wait_for_event,
     wait_for_future_safe,
@@ -188,7 +189,7 @@ async def test_request_timing_info(
     await wait_for_future_safe(on_response_started)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -422,7 +423,7 @@ async def test_serviceworker_request(
     await wait_for_future_safe(on_response_started)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -443,7 +444,13 @@ async def test_serviceworker_request(
 
 @pytest.mark.asyncio
 async def test_url_with_fragment(
-    url, wait_for_event, wait_for_future_safe, fetch, setup_network_test, current_time
+    bidi_session,
+    url,
+    wait_for_event,
+    wait_for_future_safe,
+    fetch,
+    setup_network_test,
+    current_time,
 ):
     fragment_url = url(f"{PAGE_EMPTY_HTML}#foo")
 
@@ -459,7 +466,7 @@ async def test_url_with_fragment(
     await wait_for_future_safe(on_response_started)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -507,7 +514,7 @@ async def test_navigate_data_url(
     await wait_for_future_safe(on_response_started)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
@@ -541,6 +548,7 @@ async def test_navigate_data_url(
 )
 @pytest.mark.asyncio
 async def test_fetch_data_url(
+    bidi_session,
     wait_for_event,
     wait_for_future_safe,
     fetch,
@@ -560,7 +568,7 @@ async def test_fetch_data_url(
     await wait_for_future_safe(on_response_started)
 
     time_end = await current_time()
-    time_range = number_interval(time_start - 1, time_end + 1)
+    time_range = get_network_event_timerange(time_start, time_end, bidi_session)
 
     assert len(events) == 1
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/subscription_id.py b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/subscription_id.py
index 36a57111f6d..d0e869e52d7 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/subscription_id.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/subscription_id.py
@@ -1,8 +1,17 @@
 import pytest
 import uuid
 
-@pytest.mark.asyncio
+pytestmark = pytest.mark.asyncio
+
+
 async def test_subscribe_subscription_id(subscribe_events):
     result = await subscribe_events(events=["browsingContext"])
-    assert isinstance(result['subscription'], str)
-    uuid.UUID(hex=result['subscription'])
+    assert isinstance(result["subscription"], str)
+    uuid.UUID(hex=result["subscription"])
+
+
+async def test_subscribe_twice(subscribe_events):
+    result_1 = await subscribe_events(events=["browsingContext"])
+    result_2 = await subscribe_events(events=["script"])
+
+    assert result_1["subscription"] != result_2["subscription"]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py
index 0b13e949673..3d532c8f28c 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py
@@ -207,8 +207,26 @@ async def test_params_subscriptions_invalid_type(bidi_session, subscriptions):
         await bidi_session.session.unsubscribe(subscriptions=subscriptions)
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize("subscription", [None, True, 42, {}, []])
+async def test_params_subscriptions_entry_invalid_type(bidi_session, subscription):
+    with pytest.raises(InvalidArgumentException):
+        await bidi_session.session.unsubscribe(subscriptions=[subscription])
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("subscriptions", [[""], ["12345678-1234-5678-1234-567812345678"]])
 async def test_params_subscriptions_invalid_value(bidi_session, subscriptions):
     with pytest.raises(InvalidArgumentException):
         await bidi_session.session.unsubscribe(subscriptions=subscriptions)
+
+
+@pytest.mark.asyncio
+async def test_unsubscribe_with_subscription_id_twice(bidi_session):
+    result = await bidi_session.session.subscribe(events=["log.entryAdded"])
+
+    await bidi_session.session.unsubscribe(subscriptions=[result["subscription"]])
+
+    # Trying to unsubscribe second time with the same subscription id should fail.
+    with pytest.raises(InvalidArgumentException):
+        await bidi_session.session.unsubscribe(subscriptions=[result["subscription"]])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/subscriptions.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/subscriptions.py
new file mode 100644
index 00000000000..b79621ff5a1
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/subscriptions.py
@@ -0,0 +1,243 @@
+import pytest
+
+from ... import create_console_api_message, recursive_compare
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_unsubscribe_with_subscription_id(bidi_session, top_context):
+    result = await bidi_session.session.subscribe(
+        events=["log.entryAdded"], contexts=[top_context["context"]]
+    )
+
+    # Unsubscribe from log events in one of the contexts
+    await bidi_session.session.unsubscribe(subscriptions=[result["subscription"]])
+
+    # Track all received log.entryAdded events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener("log.entryAdded", on_event)
+
+    # Trigger console event
+    await create_console_api_message(bidi_session, top_context, "text1")
+    assert len(events) == 0
+
+    remove_listener()
+
+
+async def test_unsubscribe_with_multiple_subscription_ids(
+    bidi_session, new_tab, inline
+):
+    # Subscribe to multiple events
+    result_1 = await bidi_session.session.subscribe(
+        events=["browsingContext.domContentLoaded"]
+    )
+    result_2 = await bidi_session.session.subscribe(events=["browsingContext.load"])
+
+    # Unsubscribe from both events with subscription ids
+    await bidi_session.session.unsubscribe(
+        subscriptions=[result_1["subscription"], result_2["subscription"]]
+    )
+
+    # Track all received events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener_1 = bidi_session.add_event_listener(
+        "browsingContext.domContentLoaded", on_event
+    )
+    remove_listener_2 = bidi_session.add_event_listener(
+        "browsingContext.load", on_event
+    )
+
+    # Trigger browsingContext events
+    url = inline("<div>foo</div>")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url, wait="complete"
+    )
+
+    # Make sure that we didn't receive any events
+    assert len(events) == 0
+
+    remove_listener_1()
+    remove_listener_2()
+
+
+async def test_unsubscribe_from_one_of_the_context(
+    bidi_session, top_context, new_tab, wait_for_event, wait_for_future_safe
+):
+    # Subscribe for log events to multiple contexts
+    result_1 = await bidi_session.session.subscribe(
+        events=["log.entryAdded"], contexts=[top_context["context"]]
+    )
+    result_2 = await bidi_session.session.subscribe(
+        events=["log.entryAdded"], contexts=[new_tab["context"]]
+    )
+    # Unsubscribe from log events in one of the subscriptions
+    await bidi_session.session.unsubscribe(subscriptions=[result_1["subscription"]])
+
+    # Track all received log.entryAdded events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener("log.entryAdded", on_event)
+
+    # Trigger console event in the unsubscribed context
+    await create_console_api_message(bidi_session, top_context, "text1")
+    assert len(events) == 0
+
+    # Trigger another console event in the still observed context
+    on_entry_added = wait_for_event("log.entryAdded")
+    expected_text = await create_console_api_message(bidi_session, new_tab, "text2")
+    await wait_for_future_safe(on_entry_added)
+
+    assert len(events) == 1
+    recursive_compare(
+        {
+            "text": expected_text,
+        },
+        events[0],
+    )
+
+    remove_listener()
+    await bidi_session.session.unsubscribe(subscriptions=[result_2["subscription"]])
+
+
+async def test_unsubscribe_partially_from_one_event(bidi_session, top_context, inline):
+    # Subscribe to multiple events at once
+    result = await bidi_session.session.subscribe(
+        events=["browsingContext.domContentLoaded", "browsingContext.load"]
+    )
+    # Unsubscribe from one event
+    await bidi_session.session.unsubscribe(events=["browsingContext.domContentLoaded"])
+
+    # Track all received browsingContext.domContentLoaded and browsingContext.load events in the events arrays
+    events_domContentLoaded = []
+    events_load = []
+
+    async def on_domContentLoaded_event(method, data):
+        events_domContentLoaded.append(data)
+
+    async def on_load_event(method, data):
+        events_load.append(data)
+
+    remove_listener_1 = bidi_session.add_event_listener(
+        "browsingContext.domContentLoaded", on_domContentLoaded_event
+    )
+    remove_listener_2 = bidi_session.add_event_listener(
+        "browsingContext.load", on_load_event
+    )
+
+    # Trigger browsingContext events in the unsubscribed context
+    url = inline("<div>foo</div>")
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=url, wait="complete"
+    )
+    # Make sure that we received "browsingContext.load" event
+    assert len(events_domContentLoaded) == 0
+    assert len(events_load) == 1
+
+    # Unsubscribe from subscription.
+    await bidi_session.session.unsubscribe(subscriptions=[result["subscription"]])
+
+    # Trigger browsingContext events in the unsubscribed context
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=url, wait="complete"
+    )
+
+    # Make sure that there're no new events
+    assert len(events_domContentLoaded) == 0
+    assert len(events_load) == 1
+
+    remove_listener_1()
+    remove_listener_2()
+
+
+async def test_unsubscribe_partially_from_one_context(
+    bidi_session, top_context, new_tab, wait_for_event, wait_for_future_safe
+):
+    # Subscribe for log events to multiple contexts at once
+    result = await bidi_session.session.subscribe(
+        events=["log.entryAdded"], contexts=[top_context["context"], new_tab["context"]]
+    )
+    # Unsubscribe from log events in one of the contexts
+    await bidi_session.session.unsubscribe(
+        events=["log.entryAdded"], contexts=[top_context["context"]]
+    )
+
+    # Track all received log.entryAdded events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener("log.entryAdded", on_event)
+
+    # Trigger console event in the unsubscribed context
+    await create_console_api_message(bidi_session, top_context, "text1")
+    assert len(events) == 0
+
+    # Trigger another console event in the still observed context
+    on_entry_added = wait_for_event("log.entryAdded")
+    expected_text = await create_console_api_message(bidi_session, new_tab, "text2")
+    await wait_for_future_safe(on_entry_added)
+
+    assert len(events) == 1
+    recursive_compare(
+        {
+            "text": expected_text,
+        },
+        events[0],
+    )
+
+    # Unsubscribe from subscription.
+    await bidi_session.session.unsubscribe(subscriptions=[result["subscription"]])
+
+    # Trigger another console event
+    await create_console_api_message(bidi_session, new_tab, "text2")
+
+    # Make sure that there're no new events
+    assert len(events) == 1
+
+    remove_listener()
+
+
+async def test_unsubscribe_with_event_and_subscriptions(bidi_session, new_tab, inline):
+    result = await bidi_session.session.subscribe(events=["browsingContext"])
+
+    # Provide both `events` and `subscriptions` arguments
+    await bidi_session.session.unsubscribe(
+        events=["browsingContext.domContentLoaded"],
+        subscriptions=[result["subscription"]],
+    )
+
+    # Track all received browsing context events in the events array
+    events = []
+
+    async def on_event(method, _):
+        events.append(method)
+
+    remove_listener_domContentLoaded = bidi_session.add_event_listener(
+        "browsingContext.domContentLoaded", on_event
+    )
+    remove_listener_load = bidi_session.add_event_listener(
+        "browsingContext.load", on_event
+    )
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div></div>"), wait="complete"
+    )
+
+    # Make sure we didn't receive any events. Which would indicate that
+    # `subscriptions` argument took precedent over `events`.
+    assert len(events) == 0
+
+    remove_listener_domContentLoaded()
+    remove_listener_load()
diff --git a/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
index 27425c9f35f..d047582ce7b 100644
--- a/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/arg_min_max.https.any.js
@@ -12,8 +12,9 @@
 // Return the index location of the minimum or maximum values of all the input
 // values along the axis.
 //
-// dictionary MLArgMinMaxOptions {
+// dictionary MLArgMinMaxOptions : MLOperatorOptions {
 //   boolean keepDimensions = false;
+//   MLOperandDataType outputDataType = "int32";
 // };
 //
 // MLOperand argMin(MLOperand input, [EnforceRange] unsigned long axis,
@@ -21,12 +22,8 @@
 // MLOperand argMax(MLOperand input, [EnforceRange] unsigned long axis,
 //                  optional MLArgMinMaxOptions options = {});
 
-
-const getArgMinMaxPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {int64: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+const getArgMinMaxPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 0};
 };
 
 const argMinMaxTests = [
@@ -35,7 +32,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 1D constant tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -52,11 +49,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput':
+        'argMinOutput':
             {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
@@ -65,7 +62,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 1D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -81,11 +78,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput':
+        'argMinOutput':
             {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
@@ -94,7 +91,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 2D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -110,11 +107,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 2, 0, 1, 1],
           'descriptor': {shape: [6], dataType: 'int32'}
         }
@@ -125,7 +122,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 3D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -141,11 +138,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
           'descriptor': {shape: [3, 4], dataType: 'int32'}
         }
@@ -156,7 +153,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 4D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -172,11 +169,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
           'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
@@ -187,7 +184,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 5D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -203,11 +200,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 0}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
           'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
         }
@@ -218,7 +215,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 4D tensor, axis=2',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -234,11 +231,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMin',
-        'arguments': [{'input': 'argminInput'}, {'axis': 2}],
-        'outputs': 'argminOutput'
+        'arguments': [{'input': 'argMinInput'}, {'axis': 2}],
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [2, 2, 0, 0, 0, 0],
           'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
         }
@@ -249,7 +246,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 4D tensor, axis=0, options.keepDimensions=true',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -266,13 +263,13 @@ const argMinMaxTests = [
       'operators': [{
         'name': 'argMin',
         'arguments': [
-          {'input': 'argminInput'}, {'axis': 0},
+          {'input': 'argMinInput'}, {'axis': 0},
           {'options': {'keepDimensions': true}}
         ],
-        'outputs': 'argminOutput'
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
           'descriptor': {shape: [1, 1, 4, 3], dataType: 'int32'}
         }
@@ -283,7 +280,7 @@ const argMinMaxTests = [
     'name': 'argMin float32 4D tensor, axis=0, options.keepDimensions=false',
     'graph': {
       'inputs': {
-        'argminInput': {
+        'argMinInput': {
           'data': [
             3.8301241397857666, -24.986488342285156, 5.29998254776001,
             -48.54866027832031, 40.308868408203125,  60.184295654296875,
@@ -300,26 +297,482 @@ const argMinMaxTests = [
       'operators': [{
         'name': 'argMin',
         'arguments': [
-          {'input': 'argminInput'}, {'axis': 0},
+          {'input': 'argMinInput'}, {'axis': 0},
           {'options': {'keepDimensions': false}}
         ],
-        'outputs': 'argminOutput'
+        'outputs': 'argMinOutput'
       }],
       'expectedOutputs': {
-        'argminOutput': {
+        'argMinOutput': {
           'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
           'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
       }
     }
   },
+  {
+    'name':
+        'argMin float32 4D tensor, axis=0, explicit options.outputDataType=\'int32\'',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.8301241397857666, -24.986488342285156, 5.29998254776001,
+            -48.54866027832031, 40.308868408203125,  60.184295654296875,
+            -82.78385925292969, -96.50904083251953,  71.87028503417969,
+            38.86639404296875,  -39.14372634887695,  31.444366455078125,
+            -82.78385925292969, -96.50904083251953,  -25.533889770507812,
+            -16.14226531982422, 66.63677215576172,   82.51197814941406,
+            -82.78385925292969, -96.50904083251953,  39.76872634887695,
+            42.1504020690918,   82.66864013671875,   85.45269012451172
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'outputDataType': 'int32'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMin float32 4D tensor, axis=0, options.outputDataType=\'int64\'',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.8301241397857666, -24.986488342285156, 5.29998254776001,
+            -48.54866027832031, 40.308868408203125,  60.184295654296875,
+            -82.78385925292969, -96.50904083251953,  71.87028503417969,
+            38.86639404296875,  -39.14372634887695,  31.444366455078125,
+            -82.78385925292969, -96.50904083251953,  -25.533889770507812,
+            -16.14226531982422, 66.63677215576172,   82.51197814941406,
+            -82.78385925292969, -96.50904083251953,  39.76872634887695,
+            42.1504020690918,   82.66864013671875,   85.45269012451172
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1n, 1n, 1n, 0n, 0n, 0n, 0n, 0n, 1n, 0n, 0n, 0n],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int64'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float32 4D tensor, axis=0, all options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.8301241397857666, -24.986488342285156, 5.29998254776001,
+            -48.54866027832031, 40.308868408203125,  60.184295654296875,
+            -82.78385925292969, -96.50904083251953,  71.87028503417969,
+            38.86639404296875,  -39.14372634887695,  31.444366455078125,
+            -82.78385925292969, -96.50904083251953,  -25.533889770507812,
+            -16.14226531982422, 66.63677215576172,   82.51197814941406,
+            -82.78385925292969, -96.50904083251953,  39.76872634887695,
+            42.1504020690918,   82.66864013671875,   85.45269012451172
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'keepDimensions': true, 'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1n, 1n, 1n, 0n, 0n, 0n, 0n, 0n, 1n, 0n, 0n, 0n],
+          'descriptor': {shape: [1, 1, 4, 3], dataType: 'int64'}
+        }
+      }
+    }
+  },
+
+  // float16 argMin tests
+  {
+    'name': 'argMin float16 1D constant tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput':
+            {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 1D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput':
+            {'data': [7], 'descriptor': {shape: [], dataType: 'int32'}}
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 2D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 2, 0, 1, 1],
+          'descriptor': {shape: [6], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 3D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [3, 4], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 4D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 5D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 0}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 4D tensor, axis=2',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [{'input': 'argMinInput'}, {'axis': 2}],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [2, 2, 0, 0, 0, 0],
+          'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 4D tensor, axis=0, options.keepDimensions=true',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'keepDimensions': true}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 4D tensor, axis=0, options.keepDimensions=false',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'keepDimensions': false}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMin float16 4D tensor, axis=0, explicit options.outputDataType=\'int32\'',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'outputDataType': 'int32'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMin float16 4D tensor, axis=0, options.outputDataType=\'int64\'',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1n, 1n, 1n, 0n, 0n, 0n, 0n, 0n, 1n, 0n, 0n, 0n],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int64'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMin float16 4D tensor, axis=0, all options',
+    'graph': {
+      'inputs': {
+        'argMinInput': {
+          'data': [
+            3.830078125, -24.984375, 5.30078125, -48.5625, 40.3125,
+            60.1875,     -82.8125,   -96.5,      71.875,   38.875,
+            -39.15625,   31.4375,    -82.8125,   -96.5,    -25.53125,
+            -16.140625,  66.625,     82.5,       -82.8125, -96.5,
+            39.78125,    42.15625,   82.6875,    85.4375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMin',
+        'arguments': [
+          {'input': 'argMinInput'}, {'axis': 0},
+          {'options': {'keepDimensions': true, 'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMinOutput'
+      }],
+      'expectedOutputs': {
+        'argMinOutput': {
+          'data': [1n, 1n, 1n, 0n, 0n, 0n, 0n, 0n, 1n, 0n, 0n, 0n],
+          'descriptor': {shape: [1, 1, 4, 3], dataType: 'int64'}
+        }
+      }
+    }
+  },
 
   // argMax tests
   {
     'name': 'argMax float32 1D constant tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -336,11 +789,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput':
+        'argMaxOutput':
             {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
@@ -349,7 +802,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 1D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -365,11 +818,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput':
+        'argMaxOutput':
             {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
       }
     }
@@ -378,7 +831,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 2D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -394,11 +847,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [1, 1, 1, 0, 0, 0],
           'descriptor': {shape: [6], dataType: 'int32'}
         }
@@ -409,7 +862,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 3D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -425,11 +878,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           'descriptor': {shape: [3, 4], dataType: 'int32'}
         }
@@ -440,7 +893,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 4D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -456,11 +909,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
         }
@@ -471,7 +924,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 5D tensor, axis=0, default options',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -487,11 +940,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 0}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
         }
@@ -502,7 +955,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 4D tensor, axis=2',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -518,11 +971,11 @@ const argMinMaxTests = [
       },
       'operators': [{
         'name': 'argMax',
-        'arguments': [{'input': 'argmaxInput'}, {'axis': 2}],
-        'outputs': 'argmaxOutput'
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 2}],
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [1, 2, 2, 1, 2, 2],
           'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
         }
@@ -533,7 +986,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 4D tensor, axis=3, options.keepDimensions=true',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -550,13 +1003,13 @@ const argMinMaxTests = [
       'operators': [{
         'name': 'argMax',
         'arguments': [
-          {'input': 'argmaxInput'}, {'axis': 3},
+          {'input': 'argMaxInput'}, {'axis': 3},
           {'options': {'keepDimensions': true}}
         ],
-        'outputs': 'argmaxOutput'
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [2, 0, 2, 1, 2, 0, 2, 1],
           'descriptor': {shape: [2, 1, 4, 1], dataType: 'int32'}
         }
@@ -567,7 +1020,7 @@ const argMinMaxTests = [
     'name': 'argMax float32 4D tensor, axis=3, options.keepDimensions=false',
     'graph': {
       'inputs': {
-        'argmaxInput': {
+        'argMaxInput': {
           'data': [
             -51.09362030029297, -6.53970193862915,  73.8133773803711,
             88.46114349365234,  -5.294266700744629, -79.20668029785156,
@@ -584,19 +1037,463 @@ const argMinMaxTests = [
       'operators': [{
         'name': 'argMax',
         'arguments': [
-          {'input': 'argmaxInput'}, {'axis': 3},
+          {'input': 'argMaxInput'}, {'axis': 3},
           {'options': {'keepDimensions': false}}
         ],
-        'outputs': 'argmaxOutput'
+        'outputs': 'argMaxOutput'
       }],
       'expectedOutputs': {
-        'argmaxOutput': {
+        'argMaxOutput': {
           'data': [2, 0, 2, 1, 2, 0, 2, 1],
           'descriptor': {shape: [2, 1, 4], dataType: 'int32'}
         }
       }
     }
-  }
+  },
+  {
+    'name':
+        'argMax float32 4D tensor, axis=3, explicit options.outputDataType=\'int32\'',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875,
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'outputDataType': 'int32'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2, 0, 2, 1, 2, 0, 2, 1],
+          'descriptor': {shape: [2, 1, 4], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMax float32 4D tensor, axis=3, options.outputDataType=\'int64\'',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875,
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2n, 0n, 2n, 1n, 2n, 0n, 2n, 1n],
+          'descriptor': {shape: [2, 1, 4], dataType: 'int64'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float32 4D tensor, axis=3, all options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875,
+            -51.09362030029297, -6.53970193862915,  73.8133773803711,
+            88.46114349365234,  -5.294266700744629, -79.20668029785156,
+            -41.70176696777344, 73.8133773803711,   88.46114349365234,
+            -84.94000244140625, -61.48894119262695, -98.3387451171875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'keepDimensions': true, 'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2n, 0n, 2n, 1n, 2n, 0n, 2n, 1n],
+          'descriptor': {shape: [2, 1, 4, 1], dataType: 'int64'}
+        }
+      }
+    }
+  },
+
+  // float16 argMax tests
+  {
+    'name': 'argMax float16 1D constant tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput':
+            {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 1D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput':
+            {'data': [3], 'descriptor': {shape: [], dataType: 'int32'}}
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 2D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [1, 1, 1, 0, 0, 0],
+          'descriptor': {shape: [6], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 3D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+          'descriptor': {shape: [3, 4], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 4D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 5D tensor, axis=0, default options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 0}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+          'descriptor': {shape: [1, 4, 1, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 4D tensor, axis=2',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [{'input': 'argMaxInput'}, {'axis': 2}],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [1, 2, 2, 1, 2, 2],
+          'descriptor': {shape: [2, 1, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 4D tensor, axis=3, options.keepDimensions=true',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'keepDimensions': true}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2, 0, 2, 1, 2, 0, 2, 1],
+          'descriptor': {shape: [2, 1, 4, 1], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 4D tensor, axis=3, options.keepDimensions=false',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'keepDimensions': false}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2, 0, 2, 1, 2, 0, 2, 1],
+          'descriptor': {shape: [2, 1, 4], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMax float16 4D tensor, axis=3, explicit options.outputDataType=\'int32\'',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'outputDataType': 'int32'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2, 0, 2, 1, 2, 0, 2, 1],
+          'descriptor': {shape: [2, 1, 4], dataType: 'int32'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'argMax float16 4D tensor, axis=3, options.outputDataType=\'int64\'',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2n, 0n, 2n, 1n, 2n, 0n, 2n, 1n],
+          'descriptor': {shape: [2, 1, 4], dataType: 'int64'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'argMax float16 4D tensor, axis=3, all options',
+    'graph': {
+      'inputs': {
+        'argMaxInput': {
+          'data': [
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125,
+            -51.09375, -6.5390625, 73.8125, 88.4375,  -5.29296875, -79.1875,
+            -41.6875,  73.8125,    88.4375, -84.9375, -61.5,       -98.3125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'argMax',
+        'arguments': [
+          {'input': 'argMaxInput'}, {'axis': 3},
+          {'options': {'keepDimensions': true, 'outputDataType': 'int64'}}
+        ],
+        'outputs': 'argMaxOutput'
+      }],
+      'expectedOutputs': {
+        'argMaxOutput': {
+          'data': [2n, 0n, 2n, 1n, 2n, 0n, 2n, 1n],
+          'descriptor': {shape: [2, 1, 4, 1], dataType: 'int64'}
+        }
+      }
+    }
+  },
 ];
 
 if (navigator.ml) {
diff --git a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
index d6d5a2a7afa..e474faa241e 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
@@ -664,6 +664,53 @@ const poolingOperatorsTests = [
       }
     }
   },
+  {
+    'name':
+        'averagePool2d float32 4D tensor options.roundingType=ceil and no padding',
+    'graph': {
+      'inputs': {
+        'averagePool2dInput': {
+          'data': [
+            22.975555419921875, 78.15438079833984,  9.686111450195312,
+            51.298038482666016, 32.193084716796875, 87.65037536621094,
+            87.25082397460938,  39.49794006347656,  80.0996322631836,
+            10.220142364501953, 52.602699279785156, 1.4128639698028564,
+            11.95406436920166,  85.00074768066406,  64.78374481201172,
+            88.03128814697266,  11.333850860595703, 70.61659240722656,
+            84.90442657470703,  79.06687927246094,  7.3287248611450195,
+            35.97796630859375,  10.177306175231934, 1.4140757322311401,
+            78.10037994384766,  91.59549713134766,  65.64701080322266,
+            55.14215087890625,  18.432437896728516, 49.34624099731445,
+            15.648024559020996, 68.02723693847656
+          ],
+          'descriptor': {shape: [1, 2, 4, 4], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'averagePool2d',
+        'arguments': [
+          {'input': 'averagePool2dInput'}, {
+            'options': {
+              'windowDimensions': [3, 3],
+              'strides': [2, 2],
+              'roundingType': 'ceil'
+            }
+          }
+        ],
+        'outputs': 'averagePool2dOutput'
+      }],
+      'expectedOutputs': {
+        'averagePool2dOutput': {
+          'data': [
+            51.20364761352539, 40.29140853881836, 50.77684020996094,
+            51.70764923095703, 50.63130187988281, 49.3919792175293,
+            53.128265380859375, 51.11610412597656
+          ],
+          'descriptor': {shape: [1, 2, 2, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name':
         'averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=floor',
diff --git a/tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
index b3129b49869..407e855edbd 100644
--- a/tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
+++ b/tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
@@ -272,6 +272,25 @@
     assert_equals(rtpParameters.codecs[0].name, firstCodec);
   }, `setCodecPreferences() modifies the order of video codecs in createOffer`);
 
+  ['rtx', 'red', 'ulpfec'].forEach(resiliencyMechanism => {
+    promise_test(async (t) => {
+      const pc = new RTCPeerConnection();
+      t.add_cleanup(() => pc.close());
+      const transceiver = pc.addTransceiver('video');
+      const {codecs} = RTCRtpReceiver.getCapabilities('video');
+      const filteredCodecs = codecs.
+        filter(codec => codec.mimeType !== 'video/' + resiliencyMechanism);
+      assert_not_equals(codecs.length, filteredCodecs.length);
+      transceiver.setCodecPreferences(filteredCodecs);
+
+      const offer = await pc.createOffer();
+      const mediaSection = SDPUtils.getMediaSections(offer.sdp)[0];
+      const rtpParameters = SDPUtils.parseRtpParameters(mediaSection);
+      assert_equals(rtpParameters.codecs.find(codec => codec.name === resiliencyMechanism),
+                    undefined);
+    }, `setCodecPreferences() can remove ${resiliencyMechanism}`);
+  });
+
   // Tests the note removed as result of discussion in
   // https://github.com/w3c/webrtc-pc/issues/2933
   promise_test(async (t) => {
diff --git a/tests/wpt/tests/webrtc/protocol/h264-unidirectional-codec-offer.https.html b/tests/wpt/tests/webrtc/protocol/h264-unidirectional-codec-offer.https.html
index 08640e1f62f..708d59e5242 100644
--- a/tests/wpt/tests/webrtc/protocol/h264-unidirectional-codec-offer.https.html
+++ b/tests/wpt/tests/webrtc/protocol/h264-unidirectional-codec-offer.https.html
@@ -52,36 +52,31 @@ function getCodecsWithDirection(mimeType, direction) {
   return codecs;
 }
 
-// Returns an array of { payloadType, sdpFmtpLine } entries in the order that
-// they appeared in the SDP.
+// Returns an array of { mimeType, payloadType, sdpFmtpLine } entries in the
+// order that they appeared in the SDP.
 function parseCodecsFromSdp(sdp) {
   const codecs = [];
   // For each a=rtpmap:...
-  const kRtpMapLineStart = 'a=rtpmap:';
-  const kFmtpLineStart = 'a=fmtp:';
-  for (let rtpmapIndex = 0;; ) {
-    rtpmapIndex = sdp.indexOf(kRtpMapLineStart, rtpmapIndex);
-    if (rtpmapIndex == -1) {
-      break;
-    }
-    rtpmapIndex += kRtpMapLineStart.length;
-    const payloadType =
-        Number(sdp.slice(rtpmapIndex, sdp.indexOf(' ', rtpmapIndex)));
-    const fmtpLineWithPT = kFmtpLineStart + payloadType;
+  const kRtpMapLineRegex = /\r\na=rtpmap:/g;
+  for (const match of sdp.matchAll(kRtpMapLineRegex)) {
+    const rtpmapIndex = match.index + 11;
+    const rtpmapSpaceIndex = sdp.indexOf(' ', rtpmapIndex)
+    const payloadType = Number(sdp.slice(rtpmapIndex, rtpmapSpaceIndex));
+    const codecName = sdp.slice(rtpmapSpaceIndex + 1,
+                                sdp.indexOf('/', rtpmapSpaceIndex));
+    let sdpFmtpLine = undefined;  // Can be undefined e.g. VP8.
+    const fmtpLineWithPT = `\r\na=fmtp:${payloadType} `;
     let fmtpIndex = sdp.indexOf(fmtpLineWithPT, rtpmapIndex);
-    if (fmtpIndex == -1) {
-      throw `Parse error: Missing expected ${fmtpLineWithPT} line`;
+    if (fmtpIndex != -1) {
+      fmtpIndex += fmtpLineWithPT.length;
+      const fmtpLineEnd = sdp.indexOf('\r\n', fmtpIndex);
+      if (fmtpLineEnd == -1) {
+        throw 'Parse error: Missing expected end of FMTP line';
+      }
+      sdpFmtpLine = sdp.slice(fmtpIndex, fmtpLineEnd);
     }
-    fmtpIndex += fmtpLineWithPT.length + 1;  // +1 to skip the space separator.
-    const fmtpLineEnd = sdp.indexOf('\r\n', fmtpIndex);
-    if (fmtpLineEnd == -1) {
-      throw 'Parse error: Missing expected end of FMTP line';
-    }
-    const sdpFmtpLine = sdp.slice(fmtpIndex, fmtpLineEnd);
-    const codec = { payloadType, sdpFmtpLine };
+    const codec = { mimeType: `video/${codecName}`, payloadType, sdpFmtpLine };
     codecs.push(codec);
-    // Continue the loop after end of current fmtp line.
-    rtpmapIndex = fmtpLineEnd;
   }
   return codecs;
 }
@@ -129,8 +124,8 @@ promise_test(async t => {
   // makes modifying the SDP answer easier, but because we cannot send the
   // recvonly codec we have to fake it with remote SDP munging.
   const sendRecvCodecs = getCodecsWithDirection('video/H264', 'sendrecv');
-  // If the folling optional asserts fail the test ends with
-  // [PRECONDITION_FAILED] as opposed to test failures.
+  // If any of the following optional asserts fail the test ends with
+  // [PRECONDITION_FAILED] as opposed to [FAIL].
   assert_implements_optional(
       recvOnlyCodecs.length > 0,
       `There are no recvonly H264 codecs available in getCapabilities.`);
@@ -147,10 +142,12 @@ promise_test(async t => {
   await pc1.setLocalDescription();
   const offeredCodecs = parseCodecsFromSdp(pc1.localDescription.sdp);
   assert_equals(offeredCodecs.length, 2, 'Two codecs should be offered');
-  assert_equals(offeredCodecs[0].sdpFmtpLine, recvOnlyCodec.sdpFmtpLine,
-                'The first offered codec should be the recvonly codec.');
-  assert_equals(offeredCodecs[1].sdpFmtpLine, sendRecvCodec.sdpFmtpLine,
-                'The second offered codec should be the sendrecv codec.');
+  assert_equals(offeredCodecs[0].mimeType, 'video/H264');
+  assert_true(offeredCodecs[0].sdpFmtpLine == recvOnlyCodec.sdpFmtpLine,
+              `The first offered codec's sdpFmtpLine is the recvonly one.`);
+  assert_equals(offeredCodecs[1].mimeType, 'video/H264');
+  assert_true(offeredCodecs[1].sdpFmtpLine == sendRecvCodec.sdpFmtpLine,
+              `The second offered codec's sdpFmtpLine is the sendrecv one.`);
   await pc2.setRemoteDescription(pc1.localDescription);
 
   // Answer to send.
@@ -161,15 +158,57 @@ promise_test(async t => {
   // been removed from the SDP answer.
   const answeredCodecs = parseCodecsFromSdp(pc2.localDescription.sdp);
   assert_equals(answeredCodecs.length, 1, 'One codec should be answered');
-  assert_equals(answeredCodecs[0].sdpFmtpLine, sendRecvCodec.sdpFmtpLine,
-                'The first answered codec should be the sendrecv codec.');
+  assert_equals(answeredCodecs[0].mimeType, 'video/H264');
+  assert_true(answeredCodecs[0].sdpFmtpLine == sendRecvCodec.sdpFmtpLine,
+              `The answered codec's sdpFmtpLine is the sendrecv one.`);
   // Trick `pc1` into thinking `pc2` can send the codec by modifying the SDP.
   // Receiving media is not testable but this ensures that the SDP is accepted.
   const modifiedSdp = replaceCodecInSdp(
       pc2.localDescription.sdp, answeredCodecs[0], offeredCodecs[0]);
   await pc1.setRemoteDescription({type: 'answer', sdp: modifiedSdp});
-}, `Offer to receive a recvonly H264 codec`);
+}, `Offer to receive a recvonly H264 codec on a recvonly transceiver`);
 
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  const h264RecvOnlyCodecs = getCodecsWithDirection('video/H264', 'recvonly');
+  const vp8SendRecvCodecs = getCodecsWithDirection('video/VP8', 'sendrecv');
+  // If any of the following optional asserts fail the test ends with
+  // [PRECONDITION_FAILED] as opposed to [FAIL].
+  assert_implements_optional(
+      h264RecvOnlyCodecs.length > 0,
+      `There are no recvonly H264 codecs available in getCapabilities.`);
+  assert_implements_optional(
+      vp8SendRecvCodecs.length > 0,
+      `There are no sendrecv VP8 codecs available in getCapabilities.`);
+  // Pick a level (3.1) that we're required to support for both sending and
+  // receiving. If such a codec is listed in `h264RecvOnlyCodecs` that means our
+  // sender capability has an even greater level.
+  const h264RecvOnlyCodec = h264RecvOnlyCodecs.find(
+      codec => codec.sdpFmtpLine.includes('profile-level-id=64001f'));
+  assert_implements_optional(
+      h264RecvOnlyCodec != undefined,
+      `profile-level-id=64001f is not exclusive to ` +
+      `RTCRtpReceiver.getCapabilities.`);
+  const vp8SendRecvCodec = vp8SendRecvCodecs[0];
+
+  const transceiver = pc.addTransceiver('video', {direction: 'sendrecv'});
+  transceiver.setCodecPreferences([h264RecvOnlyCodec, vp8SendRecvCodec]);
+
+  await pc.setLocalDescription();
+  const offeredCodecs = parseCodecsFromSdp(pc.localDescription.sdp);
+  // Even though this H264 codec with its level ID is recvonly, we should still
+  // offer to sendrecv it due to sender capabilities being even greater.
+  assert_equals(offeredCodecs.length, 2, 'Two codecs are offered (H264, VP8).');
+  assert_equals(offeredCodecs[0].mimeType, 'video/H264',
+                'The first offered codec is H264.');
+  assert_true(offeredCodecs[0].sdpFmtpLine == h264RecvOnlyCodec.sdpFmtpLine,
+              'The offered H264 profile-level-id should match the recvonly ' +
+              'codec since we expect the sender capability to be even higher.');
+  assert_equals(offeredCodecs[1].mimeType, 'video/VP8',
+                'The second offered codec is VP8.');
+}, `Offering a recvonly codec on a sendrecv transceiver`);
 
 promise_test(async t => {
   const pc1 = new RTCPeerConnection();
@@ -183,8 +222,8 @@ promise_test(async t => {
   // makes modifying the SDP answer easier, but because we cannot receive the
   // sendonly codec we have to fake it with remote SDP munging.
   const sendRecvCodecs = getCodecsWithDirection('video/H264', 'sendrecv');
-  // If the folling optional asserts fail the test ends with
-  // [PRECONDITION_FAILED] as opposed to test failures.
+  // If any of the following optional asserts fail the test ends with
+  // [PRECONDITION_FAILED] as opposed to [FAIL].
   assert_implements_optional(
       sendOnlyCodecs.length > 0,
       `There are no sendonly H264 codecs available in getCapabilities.`);
@@ -201,10 +240,12 @@ promise_test(async t => {
   await pc1.setLocalDescription();
   const offeredCodecs = parseCodecsFromSdp(pc1.localDescription.sdp);
   assert_equals(offeredCodecs.length, 2, 'Two codecs should be offered');
-  assert_equals(offeredCodecs[0].sdpFmtpLine, sendOnlyCodec.sdpFmtpLine,
-                'The first offered codec should be the sendonly codec.');
-  assert_equals(offeredCodecs[1].sdpFmtpLine, sendRecvCodec.sdpFmtpLine,
-                'The second offered codec should be the sendrecv codec.');
+  assert_equals(offeredCodecs[0].mimeType, 'video/H264');
+  assert_true(offeredCodecs[0].sdpFmtpLine == sendOnlyCodec.sdpFmtpLine,
+              `The first offered codec's sdpFmtpLine is the sendonly one.`);
+  assert_equals(offeredCodecs[1].mimeType, 'video/H264');
+  assert_true(offeredCodecs[1].sdpFmtpLine == sendRecvCodec.sdpFmtpLine,
+              `The second offered codec's sdpFmtpLine is the sendrecv one.`);
   await pc2.setRemoteDescription(pc1.localDescription);
 
   // Answer to receive.
@@ -213,8 +254,9 @@ promise_test(async t => {
   // been removed from the SDP answer.
   const answeredCodecs = parseCodecsFromSdp(pc2.localDescription.sdp);
   assert_equals(answeredCodecs.length, 1, 'One codec should be answered');
-  assert_equals(answeredCodecs[0].sdpFmtpLine, sendRecvCodec.sdpFmtpLine,
-                'The first answered codec should be the sendrecv codec.');
+  assert_equals(answeredCodecs[0].mimeType, 'video/H264');
+  assert_true(answeredCodecs[0].sdpFmtpLine == sendRecvCodec.sdpFmtpLine,
+              `The answered codec's sdpFmtpLine is the sendrecv one.`);
   // Trick `pc1` into thinking `pc2` can receive the codec by modifying the SDP.
   const modifiedSdp = replaceCodecInSdp(
       pc2.localDescription.sdp, answeredCodecs[0], offeredCodecs[0]);
@@ -226,7 +268,7 @@ promise_test(async t => {
                 `Only one codec should have been negotiated`);
   assert_equals(params.codecs[0].payloadType, offeredCodecs[0].payloadType,
                 `The sendonly codec's payloadType shows up in getParameters()`);
-  assert_equals(params.codecs[0].sdpFmtpLine, offeredCodecs[0].sdpFmtpLine,
-                `The sendonly codec's sdpFmtpLine shows up in getParameters()`);
-}, `Offer to send a sendonly H264 codec`);
+  assert_true(params.codecs[0].sdpFmtpLine == offeredCodecs[0].sdpFmtpLine,
+              `The sendonly codec's sdpFmtpLine shows up in getParameters()`);
+}, `Offer to send a sendonly H264 codec on a sendonly transceiver`);
 </script>