From cce3d8f521307704cf4e8a76044070a2950e02f1 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Tue, 12 Jan 2021 08:20:09 +0000
Subject: [PATCH] Update web-platform-tests to revision
 80090f6edd23993e9907dbc9fb1c6af7aebf91e7

---
 .../FileAPI/url/url-charset.window.js.ini     |    8 +
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../hyphens-auto-last-word-001.html.ini       |    2 +
 .../hyphens/hyphens-punctuation-001.html.ini  |    2 +
 .../transform-scale-hittest.html.ini          |    3 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 .../focus-in-focus-event-001.html.ini         |    7 +-
 .../fetch/content-type/response.window.js.ini |   27 +-
 .../fetch/content-type/script.window.js.ini   |    5 +-
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../idlharness-extensions.window.js.ini       |   33 +
 .../traverse_the_history_1.html.ini           |    4 +
 .../traverse_the_history_5.html.ini           |    4 -
 ...-no-child-bad-subdomain.sub.https.html.ini |   86 +
 ...arent-no-child-yes-port.sub.https.html.ini |   14 +
 ...arent-no-child-yes-same.sub.https.html.ini |   14 +
 ...subdomain-with-redirect.sub.https.html.ini |   14 +
 ...-no-child-yes-subdomain.sub.https.html.ini |   14 +
 ...yeswithparams-subdomain.sub.https.html.ini |   14 +
 ...arent-yes-child-no-port.sub.https.html.ini |   14 +
 ...arent-yes-child-no-same.sub.https.html.ini |   14 +
 ...-yes-child-no-subdomain.sub.https.html.ini |   14 +
 ...rent-yes-child-yes-port.sub.https.html.ini |   14 +
 ...rent-yes-child-yes-same.sub.https.html.ini |   14 +
 ...yes-child-yes-subdomain.sub.https.html.ini |   14 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 ...1-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...ubdomain-child2-no-port.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...in-child2-no-subdomain2.sub.https.html.ini |   35 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...n-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 ...ubdomain-child2-no-port.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...n-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 .../about-blank.https.sub.html.ini            |   29 +
 .../document-domain.sub.https.html.ini        |    4 +
 .../csp-sandbox-no.https.html.ini             |    4 +
 .../csp-sandbox-yes.https.html.ini            |    4 +
 .../data-to-javascript-no.https.html.ini      |    4 +
 .../data-to-javascript-yes.https.html.ini     |    4 +
 .../data-url-no.https.html.ini                |    4 +
 .../data-url-yes.https.html.ini               |    4 +
 .../javascript-url-no.https.html.ini          |    4 +
 .../javascript-url-yes.https.html.ini         |    4 +
 .../removed-iframe.sub.https.html.ini         |    4 +
 .../sandboxed-iframe-no.https.html.ini        |    5 +
 .../sandboxed-iframe-yes.https.html.ini       |    5 +
 ...boxed-same-origin-iframe-no.https.html.ini |    5 +
 ...oxed-same-origin-iframe-yes.https.html.ini |    5 +
 .../going-back.sub.https.html.ini             |   47 +
 ...no-1-no-same-2-yes-port.sub.https.html.ini |   29 +
 ...no-same-2-yes-subdomain.sub.https.html.ini |   29 +
 ...bdomain-2-yes-subdomain.sub.https.html.ini |   29 +
 ...domain-2-yes-subdomain2.sub.https.html.ini |   29 +
 ...ain-yes-2-subdomain2-no.sub.https.html.ini |   29 +
 ...ubdomain-2-no-subdomain.sub.https.html.ini |   29 +
 ...yes-1-no-same-2-no-port.sub.https.html.ini |   29 +
 ...-no-same-2-no-subdomain.sub.https.html.ini |   29 +
 .../insecure-http.sub.html.ini                |   14 +
 ...ener-no-openee-yes-port.sub.https.html.ini |   14 +
 ...ener-no-openee-yes-same.sub.https.html.ini |   14 +
 ...no-openee-yes-subdomain.sub.https.html.ini |   14 +
 ...ener-yes-openee-no-port.sub.https.html.ini |   14 +
 ...ener-yes-openee-no-same.sub.https.html.ini |   14 +
 ...yes-openee-no-subdomain.sub.https.html.ini |   14 +
 ...ner-yes-openee-yes-port.sub.https.html.ini |   14 +
 ...ner-yes-openee-yes-same.sub.https.html.ini |   14 +
 ...es-openee-yes-subdomain.sub.https.html.ini |   14 +
 .../removing-iframes.sub.https.html.ini       |   47 +
 .../embedded-opener-remove-frame.html.ini     |    1 -
 .../supported-elements.html.ini               |    4 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 .../textfieldselection/select-event.html.ini  |   82 +-
 .../pseudo-classes/autofill.html.ini          |    7 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../sub-sample-buffer-stitching.html.ini      |    3 +
 .../tests/get_computed_label/get.py.ini       |    2 +
 .../tests/get_computed_role/get.py.ini        |    2 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../webmessaging/with-ports/018.html.ini      |    5 +
 .../FileAPI/url/url-charset.window.js.ini     |    8 +
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              | 1551 +++++++++--------
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../hyphens-auto-last-word-001.html.ini       |    2 +
 .../hyphens/hyphens-punctuation-001.html.ini  |    2 +
 .../transform-scale-hittest.html.ini          |    3 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 .../focus-in-focus-event-001.html.ini         |    7 +-
 .../fetch/content-type/response.window.js.ini |   27 +-
 .../fetch/content-type/script.window.js.ini   |    5 +-
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../idlharness-extensions.window.js.ini       |   33 +
 .../traverse_the_history_1.html.ini           |    4 +
 .../traverse_the_history_5.html.ini           |    4 -
 ...-no-child-bad-subdomain.sub.https.html.ini |   86 +
 ...arent-no-child-yes-port.sub.https.html.ini |   14 +
 ...arent-no-child-yes-same.sub.https.html.ini |   14 +
 ...subdomain-with-redirect.sub.https.html.ini |   14 +
 ...-no-child-yes-subdomain.sub.https.html.ini |   14 +
 ...yeswithparams-subdomain.sub.https.html.ini |   14 +
 ...arent-yes-child-no-port.sub.https.html.ini |   14 +
 ...arent-yes-child-no-same.sub.https.html.ini |   14 +
 ...-yes-child-no-subdomain.sub.https.html.ini |   14 +
 ...rent-yes-child-yes-port.sub.https.html.ini |   14 +
 ...rent-yes-child-yes-same.sub.https.html.ini |   14 +
 ...yes-child-yes-subdomain.sub.https.html.ini |   14 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 ...1-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...ubdomain-child2-no-port.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...in-child2-no-subdomain2.sub.https.html.ini |   35 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...n-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 ...ubdomain-child2-no-port.sub.https.html.ini |   35 +
 ...ain-child2-no-subdomain.sub.https.html.ini |   35 +
 ...in-child2-yes-subdomain.sub.https.html.ini |   35 +
 ...n-child2-yes-subdomain2.sub.https.html.ini |   35 +
 ...hild2-yes-subdomainport.sub.https.html.ini |   35 +
 .../about-blank.https.sub.html.ini            |   29 +
 .../document-domain.sub.https.html.ini        |    4 +
 .../csp-sandbox-no.https.html.ini             |    4 +
 .../csp-sandbox-yes.https.html.ini            |    4 +
 .../data-to-javascript-no.https.html.ini      |    4 +
 .../data-to-javascript-yes.https.html.ini     |    4 +
 .../data-url-no.https.html.ini                |    4 +
 .../data-url-yes.https.html.ini               |    4 +
 .../javascript-url-no.https.html.ini          |    4 +
 .../javascript-url-yes.https.html.ini         |    4 +
 .../removed-iframe.sub.https.html.ini         |    4 +
 .../sandboxed-iframe-no.https.html.ini        |    5 +
 .../sandboxed-iframe-yes.https.html.ini       |    5 +
 ...boxed-same-origin-iframe-no.https.html.ini |    5 +
 ...oxed-same-origin-iframe-yes.https.html.ini |    5 +
 .../going-back.sub.https.html.ini             |   47 +
 ...no-1-no-same-2-yes-port.sub.https.html.ini |   29 +
 ...no-same-2-yes-subdomain.sub.https.html.ini |   29 +
 ...bdomain-2-yes-subdomain.sub.https.html.ini |   29 +
 ...domain-2-yes-subdomain2.sub.https.html.ini |   29 +
 ...ain-yes-2-subdomain2-no.sub.https.html.ini |   29 +
 ...ubdomain-2-no-subdomain.sub.https.html.ini |   29 +
 ...yes-1-no-same-2-no-port.sub.https.html.ini |   29 +
 ...-no-same-2-no-subdomain.sub.https.html.ini |   29 +
 .../insecure-http.sub.html.ini                |   14 +
 ...ener-no-openee-yes-port.sub.https.html.ini |   14 +
 ...ener-no-openee-yes-same.sub.https.html.ini |   14 +
 ...no-openee-yes-subdomain.sub.https.html.ini |   14 +
 ...ener-yes-openee-no-port.sub.https.html.ini |   14 +
 ...ener-yes-openee-no-same.sub.https.html.ini |   14 +
 ...yes-openee-no-subdomain.sub.https.html.ini |   14 +
 ...ner-yes-openee-yes-port.sub.https.html.ini |   14 +
 ...ner-yes-openee-yes-same.sub.https.html.ini |   14 +
 ...es-openee-yes-subdomain.sub.https.html.ini |   14 +
 .../removing-iframes.sub.https.html.ini       |   47 +
 .../embedded-opener-remove-frame.html.ini     |    1 -
 .../supported-elements.html.ini               |    4 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 .../textfieldselection/select-event.html.ini  |   82 +-
 .../pseudo-classes/autofill.html.ini          |    7 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../sub-sample-buffer-stitching.html.ini      |    3 +
 .../tests/get_computed_label/get.py.ini       |    2 +
 .../tests/get_computed_role/get.py.ini        |    2 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../webmessaging/with-ports/018.html.ini      |    5 +
 .../out-of-flow-in-multicolumn-001.html       |    3 +-
 .../out-of-flow-in-multicolumn-002.html       |    2 +-
 .../out-of-flow-in-multicolumn-003.html       |    2 +-
 .../out-of-flow-in-multicolumn-004.html       |    2 +-
 .../out-of-flow-in-multicolumn-005.html       |    2 +-
 .../out-of-flow-in-multicolumn-006.html       |    2 +-
 .../out-of-flow-in-multicolumn-007.html       |    2 +-
 .../out-of-flow-in-multicolumn-008.html       |    2 +-
 .../out-of-flow-in-multicolumn-009.html       |    2 +-
 .../out-of-flow-in-multicolumn-010.html       |    2 +-
 .../out-of-flow-in-multicolumn-011.html       |    2 +-
 .../out-of-flow-in-multicolumn-012.html       |    2 +-
 .../out-of-flow-in-multicolumn-013.html       |    2 +-
 .../hyphens/hyphens-auto-last-word-001.html   |   21 +
 .../hyphens/hyphens-punctuation-001.html      |   17 +
 .../hyphens-auto-last-word-001-ref.html       |   15 +
 .../hyphens-auto-last-word-001-ref2.html      |   15 +
 .../hyphens-punctuation-001-ref.html          |   12 +
 .../selectors/focus-in-focus-event-001.html   |   24 +-
 .../selectors/focus-in-focusin-event-001.html |   24 +-
 ...rent-no-child-bad-subdomain.sub.https.html |    4 +-
 .../parent-no-child-yes-port.sub.https.html   |    6 +-
 .../parent-no-child-yes-same.sub.https.html   |    7 +-
 ...yes-subdomain-with-redirect.sub.https.html |    6 +-
 ...rent-no-child-yes-subdomain.sub.https.html |    6 +-
 ...ild-yeswithparams-subdomain.sub.https.html |    6 +-
 .../parent-yes-child-no-port.sub.https.html   |    8 +-
 ...t-yes-child-no-port.sub.https.html.headers |    0
 .../parent-yes-child-no-same.sub.https.html   |    6 +-
 ...t-yes-child-no-same.sub.https.html.headers |    0
 ...rent-yes-child-no-subdomain.sub.https.html |    8 +-
 ...-child-no-subdomain.sub.https.html.headers |    0
 .../parent-yes-child-yes-port.sub.https.html  |    4 +-
 ...-yes-child-yes-port.sub.https.html.headers |    0
 .../parent-yes-child-yes-same.sub.https.html  |    6 +-
 ...-yes-child-yes-same.sub.https.html.headers |    0
 ...ent-yes-child-yes-subdomain.sub.https.html |    4 +-
 ...child-yes-subdomain.sub.https.html.headers |    0
 ...domain-child2-yes-subdomain.sub.https.html |   10 +-
 ...in-child2-yes-subdomainport.sub.https.html |    2 +-
 ...main1-child2-yes-subdomain2.sub.https.html |    2 +-
 ...es-subdomain-child2-no-port.sub.https.html |    2 +-
 ...bdomain-child2-no-subdomain.sub.https.html |   10 +-
 ...bdomain-child2-no-subdomain.sub.https.html |    2 +-
 ...child2-no-subdomain.sub.https.html.headers |    0
 ...domain-child2-no-subdomain2.sub.https.html |    2 +-
 ...hild2-no-subdomain2.sub.https.html.headers |    0
 ...domain-child2-yes-subdomain.sub.https.html |    8 +-
 ...hild2-yes-subdomain.sub.https.html.headers |    0
 ...omain-child2-yes-subdomain2.sub.https.html |    2 +-
 ...ild2-yes-subdomain2.sub.https.html.headers |    0
 ...in-child2-yes-subdomainport.sub.https.html |    2 +-
 ...2-yes-subdomainport.sub.https.html.headers |    0
 ...es-subdomain-child2-no-port.sub.https.html |    2 +-
 ...main-child2-no-port.sub.https.html.headers |    0
 ...bdomain-child2-no-subdomain.sub.https.html |   10 +-
 ...child2-no-subdomain.sub.https.html.headers |    0
 ...domain-child2-yes-subdomain.sub.https.html |    8 +-
 ...hild2-yes-subdomain.sub.https.html.headers |    0
 ...omain-child2-yes-subdomain2.sub.https.html |    2 +-
 ...ild2-yes-subdomain2.sub.https.html.headers |    0
 ...in-child2-yes-subdomainport.sub.https.html |    2 +-
 ...2-yes-subdomainport.sub.https.html.headers |    0
 .../origin-keyed-agent-clusters/META.yml      |    5 +
 .../origin-keyed-agent-clusters/README.md     |   30 +
 .../about-blank.https.sub.html                |    0
 .../about-blank.https.sub.html.headers        |    0
 .../document-domain.sub.https.html            |   14 +-
 .../document-domain.sub.https.html.headers    |    0
 .../csp-sandbox-no.https.html                 |    4 +-
 .../csp-sandbox-no.https.html.headers         |    0
 .../csp-sandbox-yes.https.html                |    6 +-
 .../csp-sandbox-yes.https.html.headers        |    0
 .../data-to-javascript-no.https.html          |    2 +-
 .../data-to-javascript-yes.https.html         |    2 +-
 .../data-to-javascript-yes.https.html.headers |    0
 .../data-url-no.https.html                    |    2 +-
 .../data-url-yes.https.html                   |    2 +-
 .../data-url-yes.https.html.headers           |    0
 .../javascript-url-no.https.html              |    2 +-
 .../javascript-url-yes.https.html             |    2 +-
 .../javascript-url-yes.https.html.headers     |    0
 .../removed-iframe.sub.https.html             |    4 +-
 .../removed-iframe.sub.https.html.headers     |    0
 .../resources/data-to-javascript-test.mjs     |    0
 .../resources/data-url-test.mjs               |    2 +-
 .../resources/helpers.mjs                     |    7 +-
 .../resources/javascript-url-test.mjs         |    0
 .../resources/sandboxed-iframe-test.sub.mjs   |    2 +-
 .../sandboxed-same-origin-iframe-test.sub.mjs |    0
 .../sandboxed-iframe-no.https.html            |    2 +-
 .../sandboxed-iframe-yes.https.html           |    2 +-
 .../sandboxed-iframe-yes.https.html.headers   |    0
 ...sandboxed-same-origin-iframe-no.https.html |    2 +-
 ...andboxed-same-origin-iframe-yes.https.html |    2 +-
 ...-same-origin-iframe-yes.https.html.headers |    0
 .../going-back.sub.https.html                 |   12 +-
 .../going-back.sub.https.html.headers         |    0
 ...ent-no-1-no-same-2-yes-port.sub.https.html |    7 +-
 ...o-1-no-same-2-yes-subdomain.sub.https.html |    7 +-
 ...o-subdomain-2-yes-subdomain.sub.https.html |    8 +-
 ...-subdomain-2-yes-subdomain2.sub.https.html |    6 +-
 ...bdomain-yes-2-subdomain2-no.sub.https.html |   10 +-
 ...es-subdomain-2-no-subdomain.sub.https.html |    9 +-
 ...ent-yes-1-no-same-2-no-port.sub.https.html |    6 +-
 ...1-no-same-2-no-port.sub.https.html.headers |    0
 ...es-1-no-same-2-no-subdomain.sub.https.html |    6 +-
 ...same-2-no-subdomain.sub.https.html.headers |    0
 .../insecure-http.sub.html                    |    4 +-
 .../insecure-http.sub.html.headers            |    0
 .../popups-crash.https.html                   |    0
 .../opener-no-openee-yes-port.sub.https.html  |    8 +-
 .../opener-no-openee-yes-same.sub.https.html  |    6 +-
 ...ner-no-openee-yes-subdomain.sub.https.html |    8 +-
 .../opener-yes-openee-no-port.sub.https.html  |    8 +-
 ...-yes-openee-no-port.sub.https.html.headers |    0
 .../opener-yes-openee-no-same.sub.https.html  |    6 +-
 ...-yes-openee-no-same.sub.https.html.headers |    0
 ...ner-yes-openee-no-subdomain.sub.https.html |    8 +-
 ...openee-no-subdomain.sub.https.html.headers |    0
 .../opener-yes-openee-yes-port.sub.https.html |    4 +-
 ...yes-openee-yes-port.sub.https.html.headers |    0
 .../opener-yes-openee-yes-same.sub.https.html |    6 +-
 ...yes-openee-yes-same.sub.https.html.headers |    0
 ...er-yes-openee-yes-subdomain.sub.https.html |    4 +-
 ...penee-yes-subdomain.sub.https.html.headers |    0
 .../removing-iframes.sub.https.html           |   12 +-
 .../removing-iframes.sub.https.html.headers   |    0
 .../resources/README.md                       |    0
 .../resources/crashy-popup.sub.html           |    6 +
 .../resources/crashy-popup.sub.html.headers   |    0
 .../resources/frame.html                      |    0
 .../resources/frame.html.headers              |    0
 .../resources/helpers.mjs                     |   73 +-
 .../resources/helpers.mjs.headers             |    0
 .../resources/send-header-page-script.mjs     |    2 +-
 .../send-header-page-script.mjs.headers       |    0
 .../resources/send-oac-header.py}             |    8 +-
 .../selectors/pseudo-classes/autofill.html    |   11 +
 .../multiple-import-maps/basic.html           |   36 +
 .../multiple-import-maps/with-errors.html     |   32 +
 .../interfaces/gamepad-extensions.idl         |    9 +
 .../origin-isolation/META.yml                 |    5 -
 .../origin-isolation/README.md                |   38 -
 .../resources/crashy-popup.sub.html           |    6 -
 .../avoid-prefetching-on-text-plain.html      |    4 -
 .../scroll-animations/current-time.html       |   82 -
 .../multiple-scroll-offsets.tentative.html    |  143 ++
 .../use-animate-display-none-symbol.html      |   16 +
 .../tools/wptserve/wptserve/server.py         |    4 +-
 .../Node-multiple-arguments.tentative.html    |   13 +-
 ...ock-Node-multiple-arguments.tentative.html |   11 +-
 .../webcodecs/audio-decoder.any.js            |   49 +
 .../tests/get_computed_label/__init__.py      |    0
 .../webdriver/tests/get_computed_label/get.py |   37 +
 .../tests/get_computed_role/__init__.py       |    0
 .../webdriver/tests/get_computed_role/get.py  |   35 +
 .../webusb/resources/manual.js                |   72 +
 .../usbDevice_transferIn-manual.https.html    |  148 +-
 342 files changed, 4696 insertions(+), 1330 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/selectors/pseudo-classes/autofill.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_label/get.py.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_role/get.py.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/hyphens/hyphens-punctuation-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/selectors/pseudo-classes/autofill.html.ini
 create mode 100644 tests/wpt/metadata/webdriver/tests/get_computed_label/get.py.ini
 create mode 100644 tests/wpt/metadata/webdriver/tests/get_computed_role/get.py.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-bad-subdomain.sub.https.html (76%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-yes-port.sub.https.html (65%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-yes-same.sub.https.html (64%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html (64%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-yes-subdomain.sub.https.html (67%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html (64%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-port.sub.https.html (59%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-same.sub.https.html (65%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-same.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-subdomain.sub.https.html (60%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-port.sub.https.html (75%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-same.sub.https.html (68%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-same.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-subdomain.sub.https.html (78%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html (66%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html (89%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html (69%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html (75%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html (89%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html (70%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers (100%)
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/about-blank.https.sub.html (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/about-blank.https.sub.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/document-domain.sub.https.html (72%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/document-domain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/csp-sandbox-no.https.html (71%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/csp-sandbox-no.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/csp-sandbox-yes.https.html (54%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/csp-sandbox-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-to-javascript-no.https.html (70%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-to-javascript-yes.https.html (70%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-to-javascript-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-url-no.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-url-yes.https.html (75%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/data-url-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/javascript-url-no.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/javascript-url-yes.https.html (76%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/javascript-url-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/removed-iframe.sub.https.html (87%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/removed-iframe.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/data-to-javascript-test.mjs (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/data-url-test.mjs (84%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/helpers.mjs (68%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/javascript-url-test.mjs (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs (90%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-iframe-no.https.html (76%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-iframe-yes.https.html (75%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-iframe-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-same-origin-iframe-no.https.html (74%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html (74%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/going-back.sub.https.html (75%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/going-back.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html (74%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html (83%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html (76%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html (72%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html (79%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html (79%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/insecure-http.sub.html (71%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/insecure-http.sub.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups-crash.https.html (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-no-openee-yes-port.sub.https.html (64%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-no-openee-yes-same.sub.https.html (68%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-no-openee-yes-subdomain.sub.https.html (66%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-port.sub.https.html (64%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-same.sub.https.html (70%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-same.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-subdomain.sub.https.html (66%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-no-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-port.sub.https.html (77%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-port.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-same.sub.https.html (71%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-same.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-subdomain.sub.https.html (79%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/removing-iframes.sub.https.html (68%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/removing-iframes.sub.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/README.md (100%)
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/crashy-popup.sub.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/frame.html (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/frame.html.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/helpers.mjs (85%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/helpers.mjs.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/send-header-page-script.mjs (97%)
 rename tests/wpt/web-platform-tests/{origin-isolation => html/browsers/origin/origin-keyed-agent-clusters}/resources/send-header-page-script.mjs.headers (100%)
 rename tests/wpt/web-platform-tests/{origin-isolation/resources/send-origin-isolation-header.py => html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py} (83%)
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html
 delete mode 100644 tests/wpt/web-platform-tests/origin-isolation/META.yml
 delete mode 100644 tests/wpt/web-platform-tests/origin-isolation/README.md
 delete mode 100644 tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
new file mode 100644
index 00000000000..a9005e45d6e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
@@ -0,0 +1,8 @@
+[url-charset.window.html]
+  expected: TIMEOUT
+  [Blob charset should override any auto-detected charset.]
+    expected: TIMEOUT
+
+  [Blob charset should override <meta charset>.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b44d9e9cf..3605e8f3fc9 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
new file mode 100644
index 00000000000..93ffa116c99
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
@@ -0,0 +1,2 @@
+[hyphens-auto-last-word-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini
new file mode 100644
index 00000000000..756c4be5011
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini
@@ -0,0 +1,2 @@
+[hyphens-punctuation-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index c131078eace..23c61ede1a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,3 +17,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini b/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini
index bef445ff6c0..81a52405f4f 100644
--- a/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini
@@ -1,2 +1,7 @@
 [focus-in-focus-event-001.html]
-  expected: ERROR
+  [Checks that ':focus-visible' pseudo-class matches inside 'focus' event handler]
+    expected: FAIL
+
+  [Checks that ':focus-within' pseudo-class matches inside 'focus' event handler]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 4ceef939a35..2dad0a40380 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,18 +312,21 @@
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index ac4cbcba706..25318ac5846 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,9 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
-  [separate text/javascript x/x]
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 58de838d890..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/gamepad/idlharness-extensions.window.js.ini b/tests/wpt/metadata-layout-2020/gamepad/idlharness-extensions.window.js.ini
index e7297d19793..b635cadc93d 100644
--- a/tests/wpt/metadata-layout-2020/gamepad/idlharness-extensions.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/gamepad/idlharness-extensions.window.js.ini
@@ -26,3 +26,36 @@
   [GamepadHapticActuator interface: operation pulse(double, double)]
     expected: FAIL
 
+  [GamepadTouch interface object name]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute surfaceId]
+    expected: FAIL
+
+  [Gamepad interface: attribute touchEvents]
+    expected: FAIL
+
+  [GamepadTouch interface object length]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute touchId]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface object]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute position]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute surfaceDimensions]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..cd1a90d2adb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
@@ -0,0 +1,86 @@
+[parent-no-child-bad-subdomain.sub.https.html]
+  expected: TIMEOUT
+  ["true": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": message event must occur]
+    expected: NOTRUN
+
+  ["(?1)": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["1": frame insertion]
+    expected: NOTRUN
+
+  ["?2": message event must occur]
+    expected: NOTRUN
+
+  ["?0": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["true": message event must occur]
+    expected: NOTRUN
+
+  ["": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["true": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [""?1"": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["": message event must occur]
+    expected: NOTRUN
+
+  ["": frame insertion]
+    expected: TIMEOUT
+
+  ["?2": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["?2": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["(?1)": frame insertion]
+    expected: NOTRUN
+
+  ["1": message event must occur]
+    expected: NOTRUN
+
+  ["?0": frame insertion]
+    expected: NOTRUN
+
+  ["?0": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["1": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["(?1)": message event must occur]
+    expected: NOTRUN
+
+  ["true": frame insertion]
+    expected: NOTRUN
+
+  ["1": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": frame insertion]
+    expected: NOTRUN
+
+  ["?0": message event must occur]
+    expected: NOTRUN
+
+  ["?2": frame insertion]
+    expected: NOTRUN
+
+  ["(?1)": setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..64d2c814354
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..4385877c6fd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
new file mode 100644
index 00000000000..fd918cb11b0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-subdomain-with-redirect.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..3ecd5865d4a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..74f3b5b183f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yeswithparams-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..f658d23788e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
new file mode 100644
index 00000000000..96d8f30c0de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6247aec0f60
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..fd2de159525
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..d2d83f66f47
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..999756b668e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6949be77a2e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: message event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..aa21fb48a84
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..ed8ae3091cd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..4f7e8accb4d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-yes-subdomain-child2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..b63adc11bde
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..577b046afc7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..6ac6bcc1097
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6fec83f7964
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..931c0916432
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..c898a1cd9c7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..874744808f6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..465f9a41eef
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6b7c96a651a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..e3932be26ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..20cf0eb9ce7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
new file mode 100644
index 00000000000..66f36f1896a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
@@ -0,0 +1,29 @@
+[about-blank.https.sub.html]
+  expected: TIMEOUT
+  [about:blank to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent to about:blank: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent to about:blank: message event must occur]
+    expected: NOTRUN
+
+  [about:blank to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [about:blank: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to about:blank: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to about:blank: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
new file mode 100644
index 00000000000..c977ae418ea
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
@@ -0,0 +1,4 @@
+[document-domain.sub.https.html]
+  [Having an origin-keyed subdomain child try to set document.domain must not change the document.domain value it sees]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
new file mode 100644
index 00000000000..911aa5daaad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
@@ -0,0 +1,4 @@
+[csp-sandbox-no.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
new file mode 100644
index 00000000000..f1281a23f30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
@@ -0,0 +1,4 @@
+[csp-sandbox-yes.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
new file mode 100644
index 00000000000..a2deae20de9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
@@ -0,0 +1,4 @@
+[data-to-javascript-no.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
new file mode 100644
index 00000000000..a4cdd82746b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
@@ -0,0 +1,4 @@
+[data-to-javascript-yes.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
new file mode 100644
index 00000000000..dc8f998aa7a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
@@ -0,0 +1,4 @@
+[data-url-no.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
new file mode 100644
index 00000000000..7c64a2d6ac3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
@@ -0,0 +1,4 @@
+[data-url-yes.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
new file mode 100644
index 00000000000..de911b09419
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-no.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
new file mode 100644
index 00000000000..4b090085929
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-yes.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
new file mode 100644
index 00000000000..524b0cf1334
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
@@ -0,0 +1,4 @@
+[removed-iframe.sub.https.html]
+  [Removing the iframe does not change originAgentCluster]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
new file mode 100644
index 00000000000..3f89efcf3c1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-iframe-no.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
new file mode 100644
index 00000000000..f30b7d905bd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-iframe-yes.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
new file mode 100644
index 00000000000..96a7fc7734e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-same-origin-iframe-no.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal false]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
new file mode 100644
index 00000000000..83a5d993b8f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-same-origin-iframe-yes.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
new file mode 100644
index 00000000000..f81a9654ae9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
@@ -0,0 +1,47 @@
+[going-back.sub.https.html]
+  expected: TIMEOUT
+  [After navigation: parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before navigation: parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [After back: parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Inserting a second iframe]
+    expected: NOTRUN
+
+  [After navigation: parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [After back: parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [After back: parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [Going back in history (navigating back the first iframe)]
+    expected: NOTRUN
+
+  [Before navigation: parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After back: parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..196062e11eb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-same-2-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..2088e2421e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-same-2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..0f155f0b52b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: message event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..3f229760f14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
new file mode 100644
index 00000000000..cac9a629763
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: message event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..afd83780b0f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..8c86815e8f7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-yes-1-no-same-2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [after parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [before parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..d7f85e71c3e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-yes-1-no-same-2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [after parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [before parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
new file mode 100644
index 00000000000..489335a88b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
@@ -0,0 +1,14 @@
+[insecure-http.sub.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..84bff58edfb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..3dca2a42963
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..14e1d8e16d8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..2110e1ffd44
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
new file mode 100644
index 00000000000..543e94f4593
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..7bba1fcf2c5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..ed7dc956386
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..1597a413fba
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..396cab14b68
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
new file mode 100644
index 00000000000..347352f2c41
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
@@ -0,0 +1,47 @@
+[removing-iframes.sub.https.html]
+  expected: TIMEOUT
+  [child2 to child3: message event must occur]
+    expected: NOTRUN
+
+  [child3: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child3 to child2: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child3: messageerror event must occur]
+    expected: NOTRUN
+
+  [Remove the iframe and insert new ones]
+    expected: NOTRUN
+
+  [child2 to child3: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before: messageerror event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child3: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child3 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2a63e3b7f..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 4e69eb752b6..d81ae5a4949 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,7 +4,7 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Element with tabindex should support autofocus]
     expected: FAIL
@@ -13,5 +13,5 @@
     expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 42ebcc9d57e..88f4ddd0e9a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index c41ffa5ae94..73b4e6216a3 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,31 +1,13 @@
 [select-event.html]
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -41,39 +23,63 @@
   [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setRangeText() a second time (must not fire select)]
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/selectors/pseudo-classes/autofill.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/selectors/pseudo-classes/autofill.html.ini
new file mode 100644
index 00000000000..85f8e43548f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/selectors/pseudo-classes/autofill.html.ini
@@ -0,0 +1,7 @@
+[autofill.html]
+  [":autofill" should be a valid selector]
+    expected: FAIL
+
+  [":-webkit-autofill" should be a valid selector]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 4fe124a8cd8..ccc9e408a28 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -521,3 +521,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.5391719726329690e+21\t9.3139332532882690e-1\t2.5391719726329690e+21\t2.7262080407721607e+21\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.5391719726329690e+21 at index of 28696.\n\tMax RelError of 2.7262080407721607e+21 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-6.7702334005389212e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_label/get.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_label/get.py.ini
new file mode 100644
index 00000000000..cba4c52ff20
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_label/get.py.ini
@@ -0,0 +1,2 @@
+[get.py]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_role/get.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_role/get.py.ini
new file mode 100644
index 00000000000..cba4c52ff20
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/get_computed_role/get.py.ini
@@ -0,0 +1,2 @@
+[get.py]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
new file mode 100644
index 00000000000..a9005e45d6e
--- /dev/null
+++ b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
@@ -0,0 +1,8 @@
+[url-charset.window.html]
+  expected: TIMEOUT
+  [Blob charset should override any auto-detected charset.]
+    expected: TIMEOUT
+
+  [Blob charset should override <meta charset>.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index d4f62ed7113..faa00f45ecf 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2c960a7c8be..c4df368d9e3 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -777,6 +777,19 @@
     }
    },
    "html": {
+    "browsers": {
+     "origin": {
+      "origin-keyed-agent-clusters": {
+       "popups-crash.https.html": [
+        "dcfb5eb277489b5849f250275d6ce8197eedc224",
+        [
+         null,
+         {}
+        ]
+       ]
+      }
+     }
+    },
     "canvas": {
      "element": {
       "manual": {
@@ -1097,15 +1110,6 @@
      ]
     }
    },
-   "origin-isolation": {
-    "popups-crash.https.html": [
-     "dcfb5eb277489b5849f250275d6ce8197eedc224",
-     [
-      null,
-      {}
-     ]
-    ]
-   },
    "portals": {
     "portals-no-frame-crash.html": [
      "c87afa38c29bf98344c9d01039ed6bf9af1d5d96",
@@ -24291,7 +24295,7 @@
      ]
     ],
     "usbDevice_transferIn-manual.https.html": [
-     "bd3df7d54ea63b45920d31d5719782ca1f066911",
+     "c0fad37e2090c1dfc06f48c978bb9fdf424f4fa9",
      [
       null,
       {}
@@ -128546,7 +128550,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-001.html": [
-      "33036d99d33bfc767eee8c3946b0299d9807515d",
+      "0322f5171014e162ee0870574166e78624602fab",
       [
        null,
        [
@@ -128559,7 +128563,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-002.html": [
-      "b5fa72b33297990a89cfbc45229eaf0fabf746ba",
+      "0138a3a41db6775eadbbde28d43a09c2481de48a",
       [
        null,
        [
@@ -128572,7 +128576,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-003.html": [
-      "c8e1b6f3cbbcecf7053ed0dcbdb2ca04a677f078",
+      "b37bfad7b73c553cc15648f610a2ce8b3365a5e9",
       [
        null,
        [
@@ -128585,7 +128589,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-004.html": [
-      "86ffa50d269c6c98d3b6b51c8d730ada91a6717f",
+      "f2e4aa97309b2b016160b6c8918a7a520402f979",
       [
        null,
        [
@@ -128598,7 +128602,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-005.html": [
-      "3917db44daf06a906382349418dc3d2989c810af",
+      "a87a074d6c31f5db8ea5468ced35603f061cc323",
       [
        null,
        [
@@ -128611,7 +128615,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-006.html": [
-      "7d1803e4183751562f53c294c865a2750d8b8a5d",
+      "d724ad013729d3343cdf675f4d216cc9a9a62c70",
       [
        null,
        [
@@ -128624,7 +128628,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-007.html": [
-      "a6e68a08e102473b40cd91492baf3bf24088377e",
+      "0e6988c3ff470b66e76193b646bbec55096717a4",
       [
        null,
        [
@@ -128637,7 +128641,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-008.html": [
-      "0c1405dd30fb13ff698637a758e254a72057442e",
+      "98c7764569919918e65a5e4abdcb9ac696b613d4",
       [
        null,
        [
@@ -128650,7 +128654,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-009.html": [
-      "88b8d4886698a1cd3be8024020f39aedf5ac885d",
+      "4db33effbf68a75de3964db66fb6a7618c4233fd",
       [
        null,
        [
@@ -128663,7 +128667,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-010.html": [
-      "708b13400b8da2d42e8a5457a4cb341cc3210f6c",
+      "5ae87e703ded3c28db9c4b90d148a20365050127",
       [
        null,
        [
@@ -128676,7 +128680,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-011.html": [
-      "93350899950a11631484564027cad7d458f8f39b",
+      "17e8908e3762440666fa4d2fc863ddd0b1b5e072",
       [
        null,
        [
@@ -128689,7 +128693,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-012.html": [
-      "349d059b7a77f9b70046d99bc4a5e26c7c298bad",
+      "4e59979db2e701bf83e6eb8935b376fc903af6f4",
       [
        null,
        [
@@ -128702,7 +128706,7 @@
       ]
      ],
      "out-of-flow-in-multicolumn-013.html": [
-      "3bf06dfc1a779e3034122987a456fb33b2feb36e",
+      "6580a65b5004cb51f7a2aeb22c0bc291d1caadf7",
       [
        null,
        [
@@ -182955,6 +182959,23 @@
         {}
        ]
       ],
+      "hyphens-auto-last-word-001.html": [
+       "273f060d871eb4787e27afc704bdab609179a1f1",
+       [
+        null,
+        [
+         [
+          "/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "hyphens-manual-010.html": [
        "8ceaceb1f3f1486b1e9cee141f821d634f946527",
        [
@@ -183170,6 +183191,19 @@
         {}
        ]
       ],
+      "hyphens-punctuation-001.html": [
+       "feea83635c736c13ff7014bab4d16f7a3dd9bb61",
+       [
+        null,
+        [
+         [
+          "/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "hyphens-shaping-001.html": [
        "0cd2243bdac0e89add0223c03ba2328cb239c980",
        [
@@ -253038,6 +253072,21 @@
     }
    },
    "svg": {
+    "animations": {
+     "use-animate-display-none-symbol.html": [
+      "6ae10ca8739dbedcc148bf7b398437131519d62b",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "coordinate-systems": {
      "abspos.html": [
       "fb37bbe7f3ae4a61d1c216970c8a263673aed0dc",
@@ -320418,6 +320467,14 @@
         "59f5247e50fd9f42187193af7eafa9d385a14229",
         []
        ],
+       "hyphens-auto-last-word-001-ref.html": [
+        "7fe23fe75d633750026ef0ab4cf60760ab92d96a",
+        []
+       ],
+       "hyphens-auto-last-word-001-ref2.html": [
+        "9c9f41312e8da239ca02b435e3fa0ab7a14e669a",
+        []
+       ],
        "hyphens-manual-010-ref.html": [
         "f79ce17a4c71bfac19b543b70bb8e95510bad321",
         []
@@ -320466,6 +320523,10 @@
         "db002ce45d84a89ba9692e8e6d3c97a5227fc64f",
         []
        ],
+       "hyphens-punctuation-001-ref.html": [
+        "75e2363789047924c68527d74abedcaa206e3bb5",
+        []
+       ],
        "hyphens-shaping-001-ref.html": [
         "9eb1d7fd686e0f9bc1c82baf2235f8f1ef8cbb81",
         []
@@ -339767,6 +339828,242 @@
         []
        ]
       },
+      "origin-keyed-agent-clusters": {
+       "1-iframe": {
+        "parent-yes-child-no-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child-no-same.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child-no-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child-yes-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child-yes-same.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child-yes-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ]
+       },
+       "2-iframes": {
+        "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ]
+       },
+       "META.yml": [
+        "f21ce69f6a710cafbb84cdbe715ffd8ae0bc75af",
+        []
+       ],
+       "README.md": [
+        "85ba3bce7f8740793791923a7d711b755531048a",
+        []
+       ],
+       "about-blank.https.sub.html.headers": [
+        "79a20f30fc0f486014c8b93edef7483605101504",
+        []
+       ],
+       "document-domain.sub.https.html.headers": [
+        "79a20f30fc0f486014c8b93edef7483605101504",
+        []
+       ],
+       "getter-special-cases": {
+        "csp-sandbox-no.https.html.headers": [
+         "4705ce9dedeeabf8208bf602176511c0cbe2cb76",
+         []
+        ],
+        "csp-sandbox-yes.https.html.headers": [
+         "a52bf509006a3b9a5518f4f0679b05d7cff12b42",
+         []
+        ],
+        "data-to-javascript-yes.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "data-url-yes.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "javascript-url-yes.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "removed-iframe.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "resources": {
+         "data-to-javascript-test.mjs": [
+          "3a88253ee3053465472ef7d6ecba74b92fab79ce",
+          []
+         ],
+         "data-url-test.mjs": [
+          "1a9b3be47f67b57bc8299def97cc660f6a282b9d",
+          []
+         ],
+         "helpers.mjs": [
+          "4610ffcad0a2f4be0f495a4d9e0107ecadf63eae",
+          []
+         ],
+         "javascript-url-test.mjs": [
+          "de474d8cafca9c073f306034b6c70c68d4222b31",
+          []
+         ],
+         "sandboxed-iframe-test.sub.mjs": [
+          "9357df00c5c686f0c06e7822644cff71d40dc20d",
+          []
+         ],
+         "sandboxed-same-origin-iframe-test.sub.mjs": [
+          "272f805870c932377b80b442f850d55018fdf0dd",
+          []
+         ]
+        },
+        "sandboxed-iframe-yes.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "sandboxed-same-origin-iframe-yes.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ]
+       },
+       "going-back.sub.https.html.headers": [
+        "79a20f30fc0f486014c8b93edef7483605101504",
+        []
+       ],
+       "iframe-navigation": {
+        "parent-yes-1-no-same-2-no-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ]
+       },
+       "insecure-http.sub.html.headers": [
+        "79a20f30fc0f486014c8b93edef7483605101504",
+        []
+       ],
+       "popups": {
+        "opener-yes-openee-no-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "opener-yes-openee-no-same.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "opener-yes-openee-no-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "opener-yes-openee-yes-port.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "opener-yes-openee-yes-same.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "opener-yes-openee-yes-subdomain.sub.https.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ]
+       },
+       "removing-iframes.sub.https.html.headers": [
+        "79a20f30fc0f486014c8b93edef7483605101504",
+        []
+       ],
+       "resources": {
+        "README.md": [
+         "9292fe3894e4a82f77a8877b76faa19fe6dfdb47",
+         []
+        ],
+        "crashy-popup.sub.html": [
+         "45c8d5074d22b3233d8bee4c6d1236e8899009e4",
+         []
+        ],
+        "crashy-popup.sub.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "frame.html": [
+         "537de07b140d79367161c5be16918b79e8d40048",
+         []
+        ],
+        "frame.html.headers": [
+         "79a20f30fc0f486014c8b93edef7483605101504",
+         []
+        ],
+        "helpers.mjs": [
+         "f858c5fefbca75c30a958e31ac46c264e7007337",
+         []
+        ],
+        "helpers.mjs.headers": [
+         "cb762eff806849df46dc758ef7b98b63f27f54c9",
+         []
+        ],
+        "send-header-page-script.mjs": [
+         "17b00684d643c85a30465435489ac31bceb9eb2d",
+         []
+        ],
+        "send-header-page-script.mjs.headers": [
+         "cb762eff806849df46dc758ef7b98b63f27f54c9",
+         []
+        ],
+        "send-oac-header.py": [
+         "cc8860fe75b0ab504553513ac17f1cf5ee805758",
+         []
+        ]
+       }
+      },
       "relaxing-the-same-origin-restriction": {
        "sandboxed-document_domain.html.headers": [
         "82e8023d0ba61851af5747ee2ccba154193d1875",
@@ -352048,7 +352345,7 @@
      []
     ],
     "gamepad-extensions.idl": [
-     "2d353b061c4b728ce61e61ed4be1f5981027865f",
+     "29ab815c411b4ce399570e9493f86559bfc0c85c",
      []
     ],
     "gamepad.idl": [
@@ -354912,242 +355209,6 @@
      []
     ]
    },
-   "origin-isolation": {
-    "1-iframe": {
-     "parent-yes-child-no-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child-no-same.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child-no-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child-yes-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child-yes-same.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child-yes-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ]
-    },
-    "2-iframes": {
-     "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ]
-    },
-    "META.yml": [
-     "937eca52e71dffcbd50b6f9dd869cb95e1808cd5",
-     []
-    ],
-    "README.md": [
-     "7446ff2495d6ac03d38335817364a6ead115d61e",
-     []
-    ],
-    "about-blank.https.sub.html.headers": [
-     "79a20f30fc0f486014c8b93edef7483605101504",
-     []
-    ],
-    "document-domain.sub.https.html.headers": [
-     "79a20f30fc0f486014c8b93edef7483605101504",
-     []
-    ],
-    "getter-special-cases": {
-     "csp-sandbox-no.https.html.headers": [
-      "4705ce9dedeeabf8208bf602176511c0cbe2cb76",
-      []
-     ],
-     "csp-sandbox-yes.https.html.headers": [
-      "a52bf509006a3b9a5518f4f0679b05d7cff12b42",
-      []
-     ],
-     "data-to-javascript-yes.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "data-url-yes.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "javascript-url-yes.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "removed-iframe.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "resources": {
-      "data-to-javascript-test.mjs": [
-       "3a88253ee3053465472ef7d6ecba74b92fab79ce",
-       []
-      ],
-      "data-url-test.mjs": [
-       "d32d8521be47187b7f8db5d8d5d915e8f9d79de3",
-       []
-      ],
-      "helpers.mjs": [
-       "6cc2ed6b697956b859ade3e0c0956c804cc5f8a4",
-       []
-      ],
-      "javascript-url-test.mjs": [
-       "de474d8cafca9c073f306034b6c70c68d4222b31",
-       []
-      ],
-      "sandboxed-iframe-test.sub.mjs": [
-       "98575b8d80ecda8c294d29ca8c40199ef40f6fe9",
-       []
-      ],
-      "sandboxed-same-origin-iframe-test.sub.mjs": [
-       "272f805870c932377b80b442f850d55018fdf0dd",
-       []
-      ]
-     },
-     "sandboxed-iframe-yes.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "sandboxed-same-origin-iframe-yes.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ]
-    },
-    "going-back.sub.https.html.headers": [
-     "79a20f30fc0f486014c8b93edef7483605101504",
-     []
-    ],
-    "iframe-navigation": {
-     "parent-yes-1-no-same-2-no-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ]
-    },
-    "insecure-http.sub.html.headers": [
-     "79a20f30fc0f486014c8b93edef7483605101504",
-     []
-    ],
-    "popups": {
-     "opener-yes-openee-no-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "opener-yes-openee-no-same.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "opener-yes-openee-no-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "opener-yes-openee-yes-port.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "opener-yes-openee-yes-same.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "opener-yes-openee-yes-subdomain.sub.https.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ]
-    },
-    "removing-iframes.sub.https.html.headers": [
-     "79a20f30fc0f486014c8b93edef7483605101504",
-     []
-    ],
-    "resources": {
-     "README.md": [
-      "9292fe3894e4a82f77a8877b76faa19fe6dfdb47",
-      []
-     ],
-     "crashy-popup.sub.html": [
-      "f8d077c2a29ff494d502d70fc7f2cd80a443da68",
-      []
-     ],
-     "crashy-popup.sub.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "frame.html": [
-      "537de07b140d79367161c5be16918b79e8d40048",
-      []
-     ],
-     "frame.html.headers": [
-      "79a20f30fc0f486014c8b93edef7483605101504",
-      []
-     ],
-     "helpers.mjs": [
-      "02ba405c60190019b909ca84bb05c3370b912855",
-      []
-     ],
-     "helpers.mjs.headers": [
-      "cb762eff806849df46dc758ef7b98b63f27f54c9",
-      []
-     ],
-     "send-header-page-script.mjs": [
-      "515987f3f20de655f4d1bab87850e7a625fd1faa",
-      []
-     ],
-     "send-header-page-script.mjs.headers": [
-      "cb762eff806849df46dc758ef7b98b63f27f54c9",
-      []
-     ],
-     "send-origin-isolation-header.py": [
-      "8acf989f964d9964007fa84771843525580fc5fc",
-      []
-     ]
-    }
-   },
    "origin-policy": {
     "META.yml": [
      "9efb2a7d6718d1c98161329470238a165a004824",
@@ -372222,7 +372283,7 @@
        []
       ],
       "server.py": [
-       "d4472811e593e0232d3ffe86536479e68b11808f",
+       "2b5ed4a27d5125ba3474b2036fa006924a5dec1f",
        []
       ],
       "sslutils": {
@@ -374068,6 +374129,18 @@
        []
       ]
      },
+     "get_computed_label": {
+      "__init__.py": [
+       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+       []
+      ]
+     },
+     "get_computed_role": {
+      "__init__.py": [
+       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+       []
+      ]
+     },
      "get_current_url": {
       "__init__.py": [
        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -375043,7 +375116,7 @@
       []
      ],
      "manual.js": [
-      "869ac450acf19a029eb924a6b290bcabc1acff2d",
+      "e8dc08a8bde4343dd37c8f9e1cf03a16a5fb3445",
       []
      ],
      "open-in-iframe.html": [
@@ -428998,14 +429071,14 @@
       ]
      ],
      "focus-in-focus-event-001.html": [
-      "2f9a3dde5783f09c102b6fd74aaa7f2950cfdcd3",
+      "01562733e40b1a69471a04c2a6836dafd98cf492",
       [
        null,
        {}
       ]
      ],
      "focus-in-focusin-event-001.html": [
-      "e18401fcf37747f96334bba996dd307f5b71d44e",
+      "633f4df87e560d077dc5ea158a0bf66226c3340e",
       [
        null,
        {}
@@ -460788,6 +460861,452 @@
         ]
        ]
       },
+      "origin-keyed-agent-clusters": {
+       "1-iframe": {
+        "parent-no-child-bad-subdomain.sub.https.html": [
+         "3a45ee6d6a8e2b0d5e449e4d98229ae37aab82ee",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child-yes-port.sub.https.html": [
+         "85fb1f64e0975434f838943364d4fe205027f95f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child-yes-same.sub.https.html": [
+         "7ece02c81a257feff3d4ab2f2eb19545384d2928",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child-yes-subdomain-with-redirect.sub.https.html": [
+         "994f80876d5f6d31d74ed73fe2dfeef4f1575684",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child-yes-subdomain.sub.https.html": [
+         "5fc2fa29f3e851a4d3ab588a9dd8fa4b6e5d81cc",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child-yeswithparams-subdomain.sub.https.html": [
+         "3e7c8419b36a096b385f047e7192bc27d352c085",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-no-port.sub.https.html": [
+         "f00814cfbf63b293b3c6060f3df986127a53056c",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-no-same.sub.https.html": [
+         "307f8c48d74e5dbfa77b4627ef6e03a75884e1da",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-no-subdomain.sub.https.html": [
+         "8c823fa36f5bc2321ca87f2e0f4d1bb5cb164c0e",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-yes-port.sub.https.html": [
+         "5e431e6e41310bb22db730c49deb44886e02dc98",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-yes-same.sub.https.html": [
+         "3b8c214a6186740e0224486092a8efb42083c949",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child-yes-subdomain.sub.https.html": [
+         "136a3a0bbadbffceafd3512cd8a0e2f4edf95ee2",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "2-iframes": {
+        "parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
+         "1bb252f0ab3ad066a48b665e604ce2450f33c2ac",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
+         "5b80c528f00895c81f1c2f41a5e253bd4149fd7d",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html": [
+         "bba13b82a4d74cfa41a9c3efe1695bcf9d27be99",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child1-yes-subdomain-child2-no-port.sub.https.html": [
+         "d01d1802135c797dd4dd449f4c033d7c50b6366b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
+         "9a245b3acef0821934df63efbd3b7aa80cef6e42",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html": [
+         "c308b9a17acabdcb5403a89d9f3a22e48ad4db6c",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html": [
+         "767d908c21f377fc0556d300b23549d18570fee4",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
+         "45047f3ae150023df115ae4e7731356ec326e55f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html": [
+         "202b916767c61a79f149170c851af76afcbdf088",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
+         "a1316731ac2e46c3ee4427d97aaf63f983132764",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html": [
+         "46bef4b9a9e9e69189acd1307207a6da5c1d2592",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
+         "39dcfc04b096f6ecaa94d7e82d5ffff3c83aa63b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html": [
+         "b6daf91b54e0ab25901cec44076047decd0056b2",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html": [
+         "b94f9392d462e880bc96f8cf49ba188eb63a2da8",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html": [
+         "fb3fda1bf27e1576a5c6af66b99221f07b0591a6",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "about-blank.https.sub.html": [
+        "edc98b363e46471b3e5db54b6b5a0b827dbb0a6d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "document-domain.sub.https.html": [
+        "b4535d9e548c7010c676114dfa259f5201f5ce7f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "getter-special-cases": {
+        "csp-sandbox-no.https.html": [
+         "e0b5f92376287417ab099c49e0b7396dc0d87256",
+         [
+          null,
+          {}
+         ]
+        ],
+        "csp-sandbox-yes.https.html": [
+         "a2220c5acc5c4bfac7c158fd2ba4f965ad05d039",
+         [
+          null,
+          {}
+         ]
+        ],
+        "data-to-javascript-no.https.html": [
+         "06149cda8ab72081769a926d169620be9d0f5cd5",
+         [
+          null,
+          {}
+         ]
+        ],
+        "data-to-javascript-yes.https.html": [
+         "af6fea0ad979b65c74ab6ae8062c8e025b2f13a8",
+         [
+          null,
+          {}
+         ]
+        ],
+        "data-url-no.https.html": [
+         "8ae564a072a4b8338e00e3a6b8f54b7425d4f563",
+         [
+          null,
+          {}
+         ]
+        ],
+        "data-url-yes.https.html": [
+         "bcbf098a664ef20a8c083e7f43fd939ac49c5c64",
+         [
+          null,
+          {}
+         ]
+        ],
+        "javascript-url-no.https.html": [
+         "1b54ad42a4333b333bf1897ab4a47567d9c141b3",
+         [
+          null,
+          {}
+         ]
+        ],
+        "javascript-url-yes.https.html": [
+         "e2b7730dd2b3cffb5bc7f7422175ef931a538b62",
+         [
+          null,
+          {}
+         ]
+        ],
+        "removed-iframe.sub.https.html": [
+         "fcf5068908800f6fcec7d6a951d5c7b06895ba29",
+         [
+          null,
+          {}
+         ]
+        ],
+        "sandboxed-iframe-no.https.html": [
+         "29758a17b877ab0561388e2b5a92c70f4f010c56",
+         [
+          null,
+          {}
+         ]
+        ],
+        "sandboxed-iframe-yes.https.html": [
+         "5eb5d08d10f6ec621e454232c342bcdcc0d005b9",
+         [
+          null,
+          {}
+         ]
+        ],
+        "sandboxed-same-origin-iframe-no.https.html": [
+         "3ed4096f399175e133797a4116af5cca566b7dd0",
+         [
+          null,
+          {}
+         ]
+        ],
+        "sandboxed-same-origin-iframe-yes.https.html": [
+         "c7ea5f069321f6f65d114ce44f843bcbaf1c2f1a",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "going-back.sub.https.html": [
+        "a593619ea64a98ccc6151be606ab245016e4b885",
+        [
+         null,
+         {}
+        ]
+       ],
+       "iframe-navigation": {
+        "parent-no-1-no-same-2-yes-port.sub.https.html": [
+         "8237f2f23f9479bd1669642b7d2077e9681859e2",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-1-no-same-2-yes-subdomain.sub.https.html": [
+         "00d8c3164a699bb2daa86aac333b24a29cc51af5",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html": [
+         "803e684e1ca2d6cbad82a307f7f0d55c6c513c7e",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html": [
+         "b96d10afd13b9009e9c39d1bb5941682f751e7f3",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html": [
+         "a70ed566708ce99a77e0386f3acacdd4f309fc32",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html": [
+         "38e26301288d190e6547f0d34312aed686cab26f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-1-no-same-2-no-port.sub.https.html": [
+         "6211845be1f74e6686ee6f47400c6d8895444199",
+         [
+          null,
+          {}
+         ]
+        ],
+        "parent-yes-1-no-same-2-no-subdomain.sub.https.html": [
+         "ead56754a7085acf8e82bddcc6cc76df6f7f7dad",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "insecure-http.sub.html": [
+        "6f9e5d8b73a1a811710e4450515a36f7ce9cc4d9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "popups": {
+        "opener-no-openee-yes-port.sub.https.html": [
+         "a0bf569b124b449d7884ce96f8e0e46a765f13ce",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-no-openee-yes-same.sub.https.html": [
+         "196dff1449b34b5fea5fc6369b2eda992cceee6b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-no-openee-yes-subdomain.sub.https.html": [
+         "f96d2273d5e73ff75581df5ba465c0cc4ffdf0f7",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-no-port.sub.https.html": [
+         "51c5a208c5ef088091fc5a6019e61fac53f4d07b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-no-same.sub.https.html": [
+         "562ab40c68bf4163a540d96f447dc13287f9438f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-no-subdomain.sub.https.html": [
+         "d7d4791459eb30470fca7d77950fc9c8d79df721",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-yes-port.sub.https.html": [
+         "32a5066d2eef6ba0fb3264d9b01666a71cdc30ff",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-yes-same.sub.https.html": [
+         "a85decac3c1906a35399786c5a56914c047eede3",
+         [
+          null,
+          {}
+         ]
+        ],
+        "opener-yes-openee-yes-subdomain.sub.https.html": [
+         "148b39af232f3e4588f0c74187f416b8a5c395ed",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "removing-iframes.sub.https.html": [
+        "b83aa9f5bedbaf64c7af9215d926d86013894cab",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "origin-of-data-document.html": [
        "448f47fa244c1134549150367a0991f79c13da86",
        [
@@ -493599,6 +494118,13 @@
      },
      "selectors": {
       "pseudo-classes": {
+       "autofill.html": [
+        "b7c3644bdbad02f7775c3ae4a341715d082870c2",
+        [
+         null,
+         {}
+        ]
+       ],
        "checked-type-change.html": [
         "661d9e4355eb46a6ea0bb64ea44daa0c9c0d2497",
         [
@@ -498249,6 +498775,22 @@
       {}
      ]
     ],
+    "multiple-import-maps": {
+     "basic.html": [
+      "9ab03ddc302af11ad7fc12d4dc8c1ed6b90084a6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "with-errors.html": [
+      "a93ecaaeff5b329916bfd003959d4cb067d5ee41",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "not-as-classic-script.html": [
      "5f97394e4408bc8db5624e5d0c6f1b2fa1b028dd",
      [
@@ -509266,452 +509808,6 @@
      ]
     ]
    },
-   "origin-isolation": {
-    "1-iframe": {
-     "parent-no-child-bad-subdomain.sub.https.html": [
-      "27085aa151ed219718a9538ba44f720ad20c62ca",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child-yes-port.sub.https.html": [
-      "d1466e55c04136f04263bd288f7299bf33ed5a15",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child-yes-same.sub.https.html": [
-      "39d6cf996a842c6e84d9b8bec6a74dbf5d0e4a2b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child-yes-subdomain-with-redirect.sub.https.html": [
-      "9004500b764191493112feeb26c48d61acf54fb8",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child-yes-subdomain.sub.https.html": [
-      "648c641553cdd6d6f5a0f53ce4fc94f2314e2e11",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child-yeswithparams-subdomain.sub.https.html": [
-      "400a8f72332a2620c3957bfe1aa7d6b572c927e2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-no-port.sub.https.html": [
-      "793c47328e103c5f63677ebdaa6818b07ce0e198",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-no-same.sub.https.html": [
-      "f1ca9a9a7cdec13d38b42abcc93f2eb9a57242a1",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-no-subdomain.sub.https.html": [
-      "be84ecac2d1891554bab21ae4c12cdfb59f1ebf3",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-yes-port.sub.https.html": [
-      "58516b86742e4ea3ccae560066bdf44a4fd80a9e",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-yes-same.sub.https.html": [
-      "b08206b4478fceb24013abe39907dee5d2d95446",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child-yes-subdomain.sub.https.html": [
-      "9a426d068aef3b6115c803aa1e3828dbe6a2fbc9",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
-    "2-iframes": {
-     "parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
-      "55c158381275a4d63e43bf7dbb8b40c366e3ba55",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "2c0bb614b50b35dab4086dc35d360601570084ec",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html": [
-      "e31af2061fb9ae5bb5000c7980c6637f391a444b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child1-yes-subdomain-child2-no-port.sub.https.html": [
-      "eaccc8509cdc4d8afb2d9144af15acb9fd67ef18",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
-      "5adb911ae8b466125696caf0d828db43f66afdaa",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html": [
-      "e463f328f19d1c91f51c6494c182ece8ee8072ef",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html": [
-      "2d67979b68a355c0860847b9a4779cfa833647bf",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
-      "ecf759cde06706311e77c0244ca796906deec83d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html": [
-      "0448076178aa3a2956e98116afa8bcad549cc5f6",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "1b14ca48ba730791c9128da85490c606dada3f3a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html": [
-      "fcdb13699710bf8ba5aca0d15b0e2908d60e7af1",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
-      "011bcd1637b818b24d552f25fcfcd615c6e25528",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html": [
-      "1a4dd4c9a655b56c4c94a0b8297bc0faa711154c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html": [
-      "852fd2d216e3be0f0b1b18606ad46fa313a4782c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "ba8edadc188c7cc7fe8de79e95a06a824911e458",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
-    "about-blank.https.sub.html": [
-     "edc98b363e46471b3e5db54b6b5a0b827dbb0a6d",
-     [
-      null,
-      {}
-     ]
-    ],
-    "document-domain.sub.https.html": [
-     "48f9a99b5f7dbe10b7dac7f12764029657d4ff0d",
-     [
-      null,
-      {}
-     ]
-    ],
-    "getter-special-cases": {
-     "csp-sandbox-no.https.html": [
-      "16ecb45192950d29329c6bd54a6b561f281b07a2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "csp-sandbox-yes.https.html": [
-      "b9a7359974d5651f955cb65c03862a0eeb79a35d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "data-to-javascript-no.https.html": [
-      "cb00ef782d0cf558ebcc28a6fa103b9826fb541d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "data-to-javascript-yes.https.html": [
-      "6856441deff1d0c707dbc8b1217dd6fb718eea36",
-      [
-       null,
-       {}
-      ]
-     ],
-     "data-url-no.https.html": [
-      "5b194eaef3552fd7c7f5ba64ab3f4db648f0d457",
-      [
-       null,
-       {}
-      ]
-     ],
-     "data-url-yes.https.html": [
-      "85821be32b53245bc1356321a8bc085716a710c2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "javascript-url-no.https.html": [
-      "b75cae47cdbb6c49b33044729a141ed52462af7e",
-      [
-       null,
-       {}
-      ]
-     ],
-     "javascript-url-yes.https.html": [
-      "573b1a0b712bd6c93c3931642fbe3603cc721d54",
-      [
-       null,
-       {}
-      ]
-     ],
-     "removed-iframe.sub.https.html": [
-      "8a29076e56111444a7f8d83b8d0e413291de4e51",
-      [
-       null,
-       {}
-      ]
-     ],
-     "sandboxed-iframe-no.https.html": [
-      "bc2276fede8ac74f4cb7fb9b119a8e306bc9160a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "sandboxed-iframe-yes.https.html": [
-      "5805d3421ebe2590585f0f7166d781eb979e6277",
-      [
-       null,
-       {}
-      ]
-     ],
-     "sandboxed-same-origin-iframe-no.https.html": [
-      "a1b44a1e5b34778aa7f8aa8fc64d5f0cbceced52",
-      [
-       null,
-       {}
-      ]
-     ],
-     "sandboxed-same-origin-iframe-yes.https.html": [
-      "b9339afae2e802178d55972af5033cf7050a2408",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
-    "going-back.sub.https.html": [
-     "7e95f19366996ce0c97b87631b10d660d07c2e56",
-     [
-      null,
-      {}
-     ]
-    ],
-    "iframe-navigation": {
-     "parent-no-1-no-same-2-yes-port.sub.https.html": [
-      "85ee2f677f31dd23814276c015c39ac8abb88bef",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-1-no-same-2-yes-subdomain.sub.https.html": [
-      "bb39de648acf177ef0ee6479a4b7a8655ee8b168",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html": [
-      "b52ca783f6f711fae40f9e01795d5072c9d36644",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html": [
-      "67e99cee090ad9766b3734784dec96e39dda511a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html": [
-      "1b7dd01947f69eb7311ef3d7235701fe229b6aa3",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html": [
-      "783f5870a839b1b63f96e28a9c734e0538839547",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-1-no-same-2-no-port.sub.https.html": [
-      "461fd0ddc4b88697fb49cd3a89166f88c0310636",
-      [
-       null,
-       {}
-      ]
-     ],
-     "parent-yes-1-no-same-2-no-subdomain.sub.https.html": [
-      "6832cd03858cab38e03993b676a52ca81c594c97",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
-    "insecure-http.sub.html": [
-     "18e0216e2627a2f81d9237be5e497aed3f22a482",
-     [
-      null,
-      {}
-     ]
-    ],
-    "popups": {
-     "opener-no-openee-yes-port.sub.https.html": [
-      "270162530b100da850d4834c049553fc01d32a84",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-no-openee-yes-same.sub.https.html": [
-      "0c8d89b8e66bf21ac2aa693f5dbf2131d9f8b4d0",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-no-openee-yes-subdomain.sub.https.html": [
-      "d1aaabd9206239469b2e7871cf6a0ab30a48bcb1",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-no-port.sub.https.html": [
-      "96b839e167f92326d72afad1b62a36b36ee25b6a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-no-same.sub.https.html": [
-      "0dee5fae002277fdb3811524b37e8025a4118a3e",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-no-subdomain.sub.https.html": [
-      "cfec0fda1301d90bf71da00e1f93f02e71fb8119",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-yes-port.sub.https.html": [
-      "4ea37421df0ac11baa99d6fc435ca5be50af2b6b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-yes-same.sub.https.html": [
-      "603f11d8de6cb78b96735a740330145787f5cf75",
-      [
-       null,
-       {}
-      ]
-     ],
-     "opener-yes-openee-yes-subdomain.sub.https.html": [
-      "b182d496a9278b17e26c7ee870aa9252f0a05b18",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
-    "removing-iframes.sub.https.html": [
-     "cbe13af820798a1a88300cea92ea2bf843b77933",
-     [
-      null,
-      {}
-     ]
-    ]
-   },
    "origin-policy": {
     "bad-server": {
      "bad-headers.https.html": [
@@ -513687,7 +513783,7 @@
      ]
     ],
     "avoid-prefetching-on-text-plain.html": [
-     "45564e1bfaca07f2ea21bf460132c7f18ed6a24a",
+     "b14b7e4f8a90241c30cccbcd9e5b754fde515b8b",
      [
       null,
       {}
@@ -527526,7 +527622,7 @@
      ]
     ],
     "current-time.html": [
-     "cbe2d8d6005b0a0e361f858cdfc6b894dbce9011",
+     "fe8c64a6addc911147d480d73060756859e04f8b",
      [
       null,
       {}
@@ -527578,6 +527674,13 @@
       }
      ]
     ],
+    "multiple-scroll-offsets.tentative.html": [
+     "026b2e7673c8b863dc27072a9a4b06664f46d051",
+     [
+      null,
+      {}
+     ]
+    ],
     "pause-animation.html": [
      "9bddfedd436675ff940b935ce46aab250b2cdd11",
      [
@@ -541521,7 +541624,7 @@
      ]
     ],
     "Node-multiple-arguments.tentative.html": [
-     "e3e4a2635e9820c762ca0c10ccd54e244e7bb499",
+     "f6b9798f5021795da85615252e38b983f53ecc36",
      [
       null,
       {}
@@ -541684,7 +541787,7 @@
      ]
     ],
     "block-Node-multiple-arguments.tentative.html": [
-     "e87c8fca238d4dfaa4e5ca4b70ef73290aa167a7",
+     "f76b3587512d88ba249c7730176df5b1744fea62",
      [
       null,
       {}
@@ -552181,7 +552284,7 @@
    },
    "webcodecs": {
     "audio-decoder.any.js": [
-     "70110a7822ea0fb374b08a8fd5f3811a6164c3ea",
+     "a6367231b234a6e078bd96dc2e689ffb429593c6",
      [
       "webcodecs/audio-decoder.any.html",
       {
@@ -589401,6 +589504,24 @@
        ]
       ]
      },
+     "get_computed_label": {
+      "get.py": [
+       "89c0f9d2b29b410a5ccf55806c677d20b94576b1",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
+     "get_computed_role": {
+      "get.py": [
+       "06173ee6fcb2b169c11cb76e6e2955870a59e77f",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "get_current_url": {
       "get.py": [
        "fa2ff6a6595f165987f13ad7a7ad60fd6e3cbb44",
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini b/tests/wpt/metadata/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
new file mode 100644
index 00000000000..93ffa116c99
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini
@@ -0,0 +1,2 @@
+[hyphens-auto-last-word-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/hyphens/hyphens-punctuation-001.html.ini b/tests/wpt/metadata/css/css-text/hyphens/hyphens-punctuation-001.html.ini
new file mode 100644
index 00000000000..756c4be5011
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/hyphens/hyphens-punctuation-001.html.ini
@@ -0,0 +1,2 @@
+[hyphens-punctuation-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/selectors/focus-in-focus-event-001.html.ini b/tests/wpt/metadata/css/selectors/focus-in-focus-event-001.html.ini
index bef445ff6c0..81a52405f4f 100644
--- a/tests/wpt/metadata/css/selectors/focus-in-focus-event-001.html.ini
+++ b/tests/wpt/metadata/css/selectors/focus-in-focus-event-001.html.ini
@@ -1,2 +1,7 @@
 [focus-in-focus-event-001.html]
-  expected: ERROR
+  [Checks that ':focus-visible' pseudo-class matches inside 'focus' event handler]
+    expected: FAIL
+
+  [Checks that ':focus-within' pseudo-class matches inside 'focus' event handler]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 9591210d677..0d5d08e0976 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,18 +312,21 @@
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index ac4cbcba706..25318ac5846 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,9 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
-  [separate text/javascript x/x]
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 58de838d890..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/gamepad/idlharness-extensions.window.js.ini b/tests/wpt/metadata/gamepad/idlharness-extensions.window.js.ini
index e7297d19793..b635cadc93d 100644
--- a/tests/wpt/metadata/gamepad/idlharness-extensions.window.js.ini
+++ b/tests/wpt/metadata/gamepad/idlharness-extensions.window.js.ini
@@ -26,3 +26,36 @@
   [GamepadHapticActuator interface: operation pulse(double, double)]
     expected: FAIL
 
+  [GamepadTouch interface object name]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute surfaceId]
+    expected: FAIL
+
+  [Gamepad interface: attribute touchEvents]
+    expected: FAIL
+
+  [GamepadTouch interface object length]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute touchId]
+    expected: FAIL
+
+  [GamepadTouch interface: existence and properties of interface object]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute position]
+    expected: FAIL
+
+  [GamepadTouch interface: attribute surfaceDimensions]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..cd1a90d2adb
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html.ini
@@ -0,0 +1,86 @@
+[parent-no-child-bad-subdomain.sub.https.html]
+  expected: TIMEOUT
+  ["true": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": message event must occur]
+    expected: NOTRUN
+
+  ["(?1)": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["1": frame insertion]
+    expected: NOTRUN
+
+  ["?2": message event must occur]
+    expected: NOTRUN
+
+  ["?0": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["true": message event must occur]
+    expected: NOTRUN
+
+  ["": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["true": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [""?1"": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["": message event must occur]
+    expected: NOTRUN
+
+  ["": frame insertion]
+    expected: TIMEOUT
+
+  ["?2": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  ["?2": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["(?1)": frame insertion]
+    expected: NOTRUN
+
+  ["1": message event must occur]
+    expected: NOTRUN
+
+  ["?0": frame insertion]
+    expected: NOTRUN
+
+  ["?0": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["1": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["": setting document.domain must give sync access]
+    expected: NOTRUN
+
+  ["(?1)": message event must occur]
+    expected: NOTRUN
+
+  ["true": frame insertion]
+    expected: NOTRUN
+
+  ["1": originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [""?1"": frame insertion]
+    expected: NOTRUN
+
+  ["?0": message event must occur]
+    expected: NOTRUN
+
+  ["?2": frame insertion]
+    expected: NOTRUN
+
+  ["(?1)": setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..64d2c814354
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..4385877c6fd
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
new file mode 100644
index 00000000000..fd918cb11b0
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-subdomain-with-redirect.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..3ecd5865d4a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..74f3b5b183f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-no-child-yeswithparams-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..f658d23788e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
new file mode 100644
index 00000000000..96d8f30c0de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6247aec0f60
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..fd2de159525
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..d2d83f66f47
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..999756b668e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[parent-yes-child-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6949be77a2e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: message event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..aa21fb48a84
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..ed8ae3091cd
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..4f7e8accb4d
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-yes-subdomain-child2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..b63adc11bde
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..577b046afc7
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..6ac6bcc1097
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6fec83f7964
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..931c0916432
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..c898a1cd9c7
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..874744808f6
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..465f9a41eef
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..6b7c96a651a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..e3932be26ee
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
new file mode 100644
index 00000000000..20cf0eb9ce7
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -0,0 +1,35 @@
+[parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html]
+  expected: TIMEOUT
+  [child1: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
new file mode 100644
index 00000000000..66f36f1896a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.ini
@@ -0,0 +1,29 @@
+[about-blank.https.sub.html]
+  expected: TIMEOUT
+  [about:blank to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent to about:blank: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent to about:blank: message event must occur]
+    expected: NOTRUN
+
+  [about:blank to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [about:blank: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2 to about:blank: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to about:blank: messageerror event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
new file mode 100644
index 00000000000..c977ae418ea
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
@@ -0,0 +1,4 @@
+[document-domain.sub.https.html]
+  [Having an origin-keyed subdomain child try to set document.domain must not change the document.domain value it sees]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
new file mode 100644
index 00000000000..911aa5daaad
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
@@ -0,0 +1,4 @@
+[csp-sandbox-no.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
new file mode 100644
index 00000000000..f1281a23f30
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.ini
@@ -0,0 +1,4 @@
+[csp-sandbox-yes.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
new file mode 100644
index 00000000000..a2deae20de9
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html.ini
@@ -0,0 +1,4 @@
+[data-to-javascript-no.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
new file mode 100644
index 00000000000..a4cdd82746b
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.ini
@@ -0,0 +1,4 @@
+[data-to-javascript-yes.https.html]
+  [originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
new file mode 100644
index 00000000000..dc8f998aa7a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini
@@ -0,0 +1,4 @@
+[data-url-no.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
new file mode 100644
index 00000000000..7c64a2d6ac3
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.ini
@@ -0,0 +1,4 @@
+[data-url-yes.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
new file mode 100644
index 00000000000..de911b09419
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-no.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
new file mode 100644
index 00000000000..4b090085929
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-yes.https.html]
+  [data: URL child: originAgentCluster must equal true]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
new file mode 100644
index 00000000000..524b0cf1334
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
@@ -0,0 +1,4 @@
+[removed-iframe.sub.https.html]
+  [Removing the iframe does not change originAgentCluster]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
new file mode 100644
index 00000000000..3f89efcf3c1
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-iframe-no.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
new file mode 100644
index 00000000000..f30b7d905bd
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-iframe-yes.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
new file mode 100644
index 00000000000..96a7fc7734e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-same-origin-iframe-no.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal false]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
new file mode 100644
index 00000000000..83a5d993b8f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
@@ -0,0 +1,5 @@
+[sandboxed-same-origin-iframe-yes.https.html]
+  expected: TIMEOUT
+  [originAgentCluster must equal true]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
new file mode 100644
index 00000000000..f81a9654ae9
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.ini
@@ -0,0 +1,47 @@
+[going-back.sub.https.html]
+  expected: TIMEOUT
+  [After navigation: parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child2 to child1: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before navigation: parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [After back: parent to child1: messageerror event must occur]
+    expected: NOTRUN
+
+  [child2 to child1: message event must occur]
+    expected: NOTRUN
+
+  [Inserting a second iframe]
+    expected: NOTRUN
+
+  [After navigation: parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [After back: parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [After back: parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [child1 to child2: message event must occur]
+    expected: NOTRUN
+
+  [Going back in history (navigating back the first iframe)]
+    expected: NOTRUN
+
+  [Before navigation: parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child1 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After back: parent to child1: setting document.domain must not give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..196062e11eb
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-same-2-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..2088e2421e1
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-same-2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..0f155f0b52b
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: message event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
new file mode 100644
index 00000000000..3f229760f14
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
new file mode 100644
index 00000000000..cac9a629763
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: message event must occur]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..afd83780b0f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [before parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [after parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..8c86815e8f7
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-yes-1-no-same-2-no-port.sub.https.html]
+  expected: TIMEOUT
+  [after parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [before parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..d7f85e71c3e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -0,0 +1,29 @@
+[parent-yes-1-no-same-2-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [after parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [Before: parent to child: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [before parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [before child: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [After: parent to child: messageerror event must occur]
+    expected: NOTRUN
+
+  [after child: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Navigation]
+    expected: NOTRUN
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Before: parent to child: message event must occur]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
new file mode 100644
index 00000000000..489335a88b6
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.ini
@@ -0,0 +1,14 @@
+[insecure-http.sub.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..84bff58edfb
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..3dca2a42963
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..14e1d8e16d8
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-no-openee-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
new file mode 100644
index 00000000000..2110e1ffd44
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
new file mode 100644
index 00000000000..543e94f4593
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..7bba1fcf2c5
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-no-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
new file mode 100644
index 00000000000..ed7dc956386
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-port.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
new file mode 100644
index 00000000000..1597a413fba
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-same.sub.https.html]
+  expected: TIMEOUT
+  [message event must occur]
+    expected: NOTRUN
+
+  [setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
new file mode 100644
index 00000000000..396cab14b68
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,14 @@
+[opener-yes-openee-yes-subdomain.sub.https.html]
+  expected: TIMEOUT
+  [setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [messageerror event must occur]
+    expected: NOTRUN
+
+  [openee: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [opener: originAgentCluster must equal true]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
new file mode 100644
index 00000000000..347352f2c41
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.ini
@@ -0,0 +1,47 @@
+[removing-iframes.sub.https.html]
+  expected: TIMEOUT
+  [child2 to child3: message event must occur]
+    expected: NOTRUN
+
+  [child3: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child3 to child2: message event must occur]
+    expected: NOTRUN
+
+  [Parent to child3: messageerror event must occur]
+    expected: NOTRUN
+
+  [Remove the iframe and insert new ones]
+    expected: NOTRUN
+
+  [child2 to child3: setting document.domain must give sync access]
+    expected: NOTRUN
+
+  [Before: messageerror event must occur]
+    expected: NOTRUN
+
+  [Parent to child2: messageerror event must occur]
+    expected: NOTRUN
+
+  [parent: originAgentCluster must equal true]
+    expected: NOTRUN
+
+  [child1: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [child2: originAgentCluster must equal false]
+    expected: NOTRUN
+
+  [Before: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child2: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [Parent to child3: setting document.domain must not give sync access]
+    expected: NOTRUN
+
+  [child3 to child2: setting document.domain must give sync access]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f4d11768961..dab21cae5d8 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Area element should support autofocus]
     expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index fc37df7e3fa..2a166bb97b7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [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/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index c41ffa5ae94..73b4e6216a3 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,31 +1,13 @@
 [select-event.html]
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -41,39 +23,63 @@
   [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setRangeText() a second time (must not fire select)]
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/selectors/pseudo-classes/autofill.html.ini b/tests/wpt/metadata/html/semantics/selectors/pseudo-classes/autofill.html.ini
new file mode 100644
index 00000000000..85f8e43548f
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/selectors/pseudo-classes/autofill.html.ini
@@ -0,0 +1,7 @@
+[autofill.html]
+  [":autofill" should be a valid selector]
+    expected: FAIL
+
+  [":-webkit-autofill" should be a valid selector]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index faee069e5d9..226bd926cc6 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -749,3 +749,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.5391719726329690e+21\t9.3139332532882690e-1\t2.5391719726329690e+21\t2.7262080407721607e+21\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.5391719726329690e+21 at index of 28696.\n\tMax RelError of 2.7262080407721607e+21 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-6.7702334005389212e-40\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/get_computed_label/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_computed_label/get.py.ini
new file mode 100644
index 00000000000..cba4c52ff20
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/get_computed_label/get.py.ini
@@ -0,0 +1,2 @@
+[get.py]
+  expected: ERROR
diff --git a/tests/wpt/metadata/webdriver/tests/get_computed_role/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_computed_role/get.py.ini
new file mode 100644
index 00000000000..cba4c52ff20
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/get_computed_role/get.py.ini
@@ -0,0 +1,2 @@
+[get.py]
+  expected: ERROR
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
index 33036d99d33..0322f517101 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<link rel="author" title="Benjamin Beaudry" href="mailto:bebeaudr@microsoft.com">
-<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
 <link rel="match" href="out-of-flow-in-multicolumn-001-ref.html">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html
index b5fa72b3329..0138a3a41db 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests fragmentation when a positioned node's child overflows. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
index c8e1b6f3cbb..b37bfad7b73 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests that empty column fragments are added if an OOF element begins layout
      in a fragmentainer that is more than one index beyond the last existing
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
index 86ffa50d269..f2e4aa97309 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#breaking-controls">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#breaking-controls">
 <link rel="match" href="out-of-flow-in-multicolumn-004-ref.html">
 <!-- break-inside: avoid and break-before: column do not apply to absolute positioned elements. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
index 3917db44daf..a87a074d6c3 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#breaking-controls">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#breaking-controls">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- break-after: column does not apply to absolute positioned elements. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
index 7d1803e4183..d724ad01372 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests that the fragments of a positioned element are added to the right fragmentainer despite the presence of column spanners. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
index a6e68a08e10..0e6988c3ff4 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests that a positioned element without a top or bottom property uses the static position -
      even though it's treated as an OOF element. -->
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
index 0c1405dd30f..98c77645699 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests fragmented abspos elements with a spanner nested inside. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
index 88b8d488669..4db33effbf6 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Tests that empty column fragments are added if an OOF element begins layout in a fragmentainer that is more than one index beyond the last existing column fragmentainer in the presence of a spanner. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
index 708b13400b8..5ae87e703de 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Fragmented OOF element with block-size percentage resolution. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
index 93350899950..17e8908e376 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Fragmented OOF element with block-size percentage resolution and overflow. -->
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html
index 349d059b7a7..4e59979db2e 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Fragmented OOF with `height: auto`, positioned with the bottom property and
      the second child fragment has a 'break-inside: avoid'. The abspos fragment
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html
index 3bf06dfc1a7..6580a65b500 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#abspos-breaking">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
 <!-- Nested abspos with `height: auto` and positioned with the bottom property.
      The innermost abspos only is fragmented. -->
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html
new file mode 100644
index 00000000000..273f060d871
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Text: `hyphens: auto` for last word</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-text-3/#hyphenation">
+<link rel="match" href="reference/hyphens-auto-last-word-001-ref.html">
+<link rel="match" href="reference/hyphens-auto-last-word-001-ref2.html">
+<style>
+div {
+  hyphens: auto;
+  width: 5ch;
+  border: 1px solid blue;
+}
+</style>
+<body lang="en-us">
+  <div style="width: 10ch">Test example</div>
+  <div>example</div>
+  <div>1 example</div>
+  <div>1234 example</div>
+  <div>example 5678</div>
+  <div>1234 example 5678</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html
new file mode 100644
index 00000000000..feea83635c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>CSS Text Test: Automatic hyphenation for trailing punctuation characters</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#hyphens-property">
+<link rel="match" href="reference/hyphens-punctuation-001-ref.html">
+<style>
+div {
+  hyphens: auto;
+  width: 5ch;
+  border: 1px solid blue;
+}
+</style>
+<body lang="en-us">
+  <div>00000 example 00000</div>
+  <div>00000 example. 00000</div>
+  <div>00000 (example 00000</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html
new file mode 100644
index 00000000000..7fe23fe75d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<style>
+div {
+  width: 5ch;
+  border: 1px solid blue;
+}
+</style>
+<body lang="en-us">
+  <div style="width: 10ch">Test ex&shy;am&shy;ple</div>
+  <div>ex&shy;am&shy;ple</div>
+  <div>1 ex&shy;am&shy;ple</div>
+  <div>1234 ex&shy;am&shy;ple</div>
+  <div>ex&shy;am&shy;ple 5678</div>
+  <div>1234 ex&shy;am&shy;ple 5678</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html
new file mode 100644
index 00000000000..9c9f41312e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<style>
+div {
+  width: 5ch;
+  border: 1px solid blue;
+}
+</style>
+<body lang="en-us">
+  <div style="width: 10ch">Test example</div>
+  <div>ex&shy;am&shy;ple</div>
+  <div>1<br>ex&shy;am&shy;ple</div>
+  <div>1234 ex&shy;am&shy;ple</div>
+  <div>ex&shy;am&shy;ple 5678</div>
+  <div>1234 ex&shy;am&shy;ple 5678</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html
new file mode 100644
index 00000000000..75e23637890
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<style>
+div {
+  width: 5ch;
+  border: 1px solid blue;
+}
+</style>
+<body lang="en-us">
+  <div>00000 ex&shy;am&shy;ple 00000</div>
+  <div>00000 ex&shy;am&shy;ple. 00000</div>
+  <div>00000 (ex&shy;am&shy;ple 00000</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html b/tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html
index 2f9a3dde578..01562733e40 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html
@@ -14,17 +14,29 @@
 <script>
 var input = document.querySelector('input');
 input.addEventListener('focus', function(e) {
-  var focusPseudo = document.querySelector(':focus');
-  var focusVisiblePseudo = document.querySelector(':focus-visible');
-  var focusWithinPseudo = document.querySelector(':focus-within');
   test(() => {
-    assert_equals(e.target, focusPseudo, "':focus' matches event.target");
+    try {
+      var focusPseudo = document.querySelector(':focus');
+      assert_equals(e.target, focusPseudo, "':focus' matches event.target");
+    } catch (error) {
+      assert_unreached("':focus'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus' pseudo-class matches inside 'focus' event handler");
   test(() => {
-    assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+    try {
+      var focusVisiblePseudo = document.querySelector(':focus-visible');
+      assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+    } catch (error) {
+      assert_unreached("':focus-visible'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus-visible' pseudo-class matches inside 'focus' event handler");
   test(() => {
-    assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+    try {
+      var focusWithinPseudo = document.querySelector(':focus-within');
+      assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+    } catch (error) {
+      assert_unreached("':focus-within'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus-within' pseudo-class matches inside 'focus' event handler");
 }, false);
 input.focus();
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html b/tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html
index e18401fcf37..633f4df87e5 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html
@@ -12,17 +12,29 @@
 <script>
 var input = document.querySelector('input');
 input.addEventListener('focusin', function(e) {
-  var focusPseudo = document.querySelector(':focus');
-  var focusVisiblePseudo = document.querySelector(':focus-visible');
-  var focusWithinPseudo = document.querySelector(':focus-within');
   test(() => {
-    assert_equals(e.target, focusPseudo, "':focus' matches event.target");
+    try {
+      var focusPseudo = document.querySelector(':focus');
+      assert_equals(e.target, focusPseudo, "':focus' matches event.target");
+    } catch (error) {
+      assert_unreached("':focus'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus' pseudo-class matches inside 'focusin' event handler");
   test(() => {
-    assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+    try {
+      var focusVisiblePseudo = document.querySelector(':focus-visible');
+      assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+    } catch (error) {
+      assert_unreached("':focus-visible'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus-visible' pseudo-class matches inside 'focusin' event handler");
   test(() => {
-    assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+    try {
+      var focusWithinPseudo = document.querySelector(':focus-within');
+      assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+    } catch (error) {
+      assert_unreached("':focus-within'  is an invalid selector. SyntaxError: " + error);
+    }
   }, "Checks that ':focus-within' pseudo-class matches inside 'focusin' event handler");
 }, false);
 input.focus();
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html
similarity index 76%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html
index 27085aa151e..3a45ee6d6a8 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child attempts to isolate but uses a bad header value, child is a subdomain of the parent</title>
+<title>Parent is site-keyed, child attempts to origin-key but uses a bad header value, child is a subdomain of the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -19,7 +19,7 @@ for (const badValue of ["", "?0", "true", "\"?1\"", "1", "?2", "(?1)"]) {
     await insertIframe("{{hosts[][www]}}", badValue);
   }, `"${badValue}": frame insertion`);
 
-  // Since the header values are bad there should be no isolation
+  // Since the header values are bad they should be site-keyed.
   testSameAgentCluster([self, frameIndex], `"${badValue}"`);
   testGetter(frameIndex, false, `"${badValue}"`);
   ++frameIndex;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html
similarity index 65%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html
index d1466e55c04..85fb1f64e09 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child is isolated, child is different-origin to the parent because of a port mismatch</title>
+<title>Parent is site-keyed, child is origin-keyed, child is different-origin to the parent because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}:{{ports[https][1]}}", "?1");
 });
 
-// Since they're different-origin, the child's isolation request is respected,
-// so the parent ends up in the site-keyed agent cluster and the child in the
+// Since they're different-origin, the child's request is respected, so the
+// parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html
similarity index 64%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html
index 39d6cf996a8..7ece02c81a2 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child is isolated, child is same-origin to the parent</title>
+<title>Parent is site-keyed, child is origin-keyed, child is same-origin to the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,9 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}", "?1");
 });
 
-// Since they're same-origin, and the parent loaded without isolation, the
-// child's request for isolation gets ignored, and both end up site-keyed.
+// Since they're same-origin, and the parent loaded in the site-keyed agent
+// cluster, the child's request for origin-keying gets ignored, and both end up
+// site-keyed.
 testSameAgentCluster([self, 0]);
 
 testGetter(self, false, "parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html
similarity index 64%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html
index 9004500b764..994f80876d5 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child is reached via a redirect response with no header, child final response does have the header</title>
+<title>Parent is site-keyed, child is reached via a redirect response with no header, child final response does have the header</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}", "?1", { redirectFirst: true });
 });
 
-// Since they're different-origin, the child's isolation request is respected,
-// so the parent ends up in the site-keyed agent cluster and the child in the
+// Since they're different-origin, the child's request is respected, so the
+// parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html
similarity index 67%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html
index 648c641553c..5fc2fa29f3e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child is isolated, child is a subdomain of the parent</title>
+<title>Parent is site-keyed, child is origin-keyed, child is a subdomain of the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}", "?1");
 });
 
-// Since they're different-origin, the child's isolation request is respected,
-// so the parent ends up in the site-keyed agent cluster and the child in the
+// Since they're different-origin, the child's request is respected, so the
+// parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
similarity index 64%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
index 400a8f72332..3e7c8419b36 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, child is isolated using parameters on its structured header, child is a subdomain of the parent</title>
+<title>Parent is site-keyed, child is origin-keyed using parameters on its structured header, child is a subdomain of the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}", "?1;param1;param2=value2");
 });
 
-// Since they're different-origin, the child's isolation request is respected,
-// so the parent ends up in the site-keyed agent cluster and the child in the
+// Since they're different-origin, the child's request is respected, so the
+// parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html
similarity index 59%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html
index 793c47328e1..f00814cfbf6 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is is different-origin to the parent because of a port mismatch</title>
+<title>Parent is origin-keyed, child is site-keyed, child is is different-origin to the parent because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,9 +17,9 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}:{{ports[https][1]}}");
 });
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is the child's non-request. So the parent ends up in the origin-keyed
-// agent cluster and the child ends up in the site-keyed one.
+// Since they're different-origin, the parent's request is respected, as is the
+// child's non-request. So the parent ends up in the origin-keyed agent cluster
+// and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0]);
 
 testGetter(self, true, "parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html
similarity index 65%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html
index f1ca9a9a7cd..307f8c48d74 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is same-origin to the parent</title>
+<title>Parent is origin-keyed, child is site-keyed, child is same-origin to the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}");
 });
 
-// Since they're same-origin, and the parent loaded with isolation, the
-// child's non-request for isolation gets ignored, and both end up origin-keyed.
+// Since they're same-origin, and the parent loaded with origin-keying, the
+// child's non-request gets ignored, and both end up origin-keyed.
 testSameAgentCluster([self, 0]);
 
 testGetter(self, true, "parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html
similarity index 60%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html
index be84ecac2d1..8c823fa36f5 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is a subdomain of the parent</title>
+<title>Parent is origin-keyed, child is site-keyed, child is a subdomain of the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,9 +17,9 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}");
 });
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is the child's non-request. So the parent ends up in the origin-keyed
-// agent cluster and the child ends up in the site-keyed one.
+// Since they're different-origin, the parent's request is respected, as is the
+// child's non-request. So the parent ends up in the origin-keyed agent cluster
+// and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0]);
 
 testGetter(self, true, "parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html
index 58516b86742..5e431e6e413 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is different-origin to the parent because of a port mismatch</title>
+<title>Parent is origin-keyed, child is site-keyed, child is different-origin to the parent because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,7 +17,7 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}:{{ports[https][1]}}", "?1");
 });
 
-// Both request isolation, so the parent ends up in one origin-keyed agent
+// Both request origin-keying, so the parent ends up in one origin-keyed agent
 // cluster (the default port's origin), and the child ends up in a different
 // origin-keyed agent cluster (the other port's origin).
 testDifferentAgentClusters([self, 0]);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html
similarity index 68%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html
index b08206b4478..3b8c214a618 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is same-origin to the parent</title>
+<title>Parent is origin-keyed, child is site-keyed, child is same-origin to the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,8 +17,8 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][]}}", "?1");
 });
 
-// Both request isolation, and they're same-origin, so they both end up in the
-// same origin-keyed agent cluster.
+// Both request origin-keying, and they're same-origin, so they both end up in
+// the same origin-keyed agent cluster.
 testSameAgentCluster([self, 0]);
 
 testGetter(self, true, "parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
similarity index 78%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
index 9a426d068ae..136a3a0bbad 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child is not isolated, child is a subdomain of the parent</title>
+<title>Parent is origin-keyed, child is site-keyed, child is a subdomain of the parent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,7 +17,7 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}", "?1");
 });
 
-// Both request isolation, so the parent ends up in one origin-keyed agent
+// Both request origin-keying, so the parent ends up in one origin-keyed agent
 // cluster (the base domain's origin), and the child ends up in a different
 // origin-keyed agent cluster (the www subdomain's origin).
 testDifferentAgentClusters([self, 0]);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
similarity index 66%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
index 55c15838127..1bb252f0ab3 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, subdomain child 1 is not isolated, same-subdomain child 2 is isolated</title>
+<title>Parent is site-keyed, subdomain child 1 is site-keyed, same-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -14,15 +14,15 @@ import {
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
-  // Must be sequential, not parallel: the non-isolated frame must load first.
+  // Must be sequential, not parallel: the site-keyed frame must load first.
   await insertIframe("{{hosts[][www]}}");
   await insertIframe("{{hosts[][www]}}", "?1");
 });
 
 
-// Since they're different-origin, the parent's isolation non-request is
-// respected, as is child 1's non-request. child 2 requests isolation
-// but is ignored, since child 1 is in the same browsing context group.
+// Since they're different-origin, the parent's non-request is respected, as is
+// child 1's non-request. child 2 requests origin-keying but is ignored, since
+// child 1 is in the same browsing context group.
 //
 // So, everyone ends up in the site-keyed agent cluster.
 testSameAgentCluster([self, 0], "Parent to child1");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
index 2c0bb614b50..5b80c528f00 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, subdomain child 1 is not isolated, different-port-same-subdomain child 2 is isolated</title>
+<title>Parent is site-keyed, subdomain child 1 is site-keyed, different-port-same-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
index e31af2061fb..bba13b82a4d 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, subdomain child 1 is not isolated, different-subdomain child 2 is isolated</title>
+<title>Parent is site-keyed, subdomain child 1 is site-keyed, different-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
similarity index 89%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
index eaccc8509cd..d01d1802135 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, subdomain child 1 is isolated, non-subdomain but different-port child 2 is not isolated</title>
+<title>Parent is site-keyed, subdomain child 1 is origin-keyed, non-subdomain but different-port child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
similarity index 69%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
index 5adb911ae8b..9a245b3acef 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, subdomain child 1 is isolated, same-subdomain child 2 is not isolated</title>
+<title>Parent is site-keyed, subdomain child 1 is origin-keyed, same-subdomain child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -15,15 +15,15 @@ import {
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
-  // Must be sequential, not parallel: the isolated frame must load first.
+  // Must be sequential, not parallel: the origin-keyed frame must load first.
   await insertIframe("{{hosts[][www]}}", "?1");
   await insertIframe("{{hosts[][www]}}");
 });
 
 
-// Since they're different-origin, the parent's isolation non-request is
-// respected, as is child 1's request. child 2's non-request is
-// ignored, since child 1 is in the same browsing context group.
+// Since they're different-origin, the parent's non-request is respected, as is
+// child 1's request. child 2's non-request is ignored, since child 1 is in the
+// same browsing context group.
 //
 // So, the parent ends up in the site-keyed agent cluster, and both children end
 // up in an origin-keyed agent cluster.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
index e463f328f19..c308b9a17ac 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is not isolated, same-subdomain child 2 is not isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is site-keyed, same-subdomain child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
index 2d67979b68a..767d908c21f 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is not isolated, different-subdomain child 2 is not isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is site-keyed, different-subdomain child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
index ecf759cde06..45047f3ae15 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is not isolated, same-subdomain child 2 is isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is site-keyed, same-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,9 +21,9 @@ promise_setup(async () => {
 });
 
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is child 1's non-request. child 2 requests isolation but is
-// ignored, since child 1 is in the same browsing context group.
+// Since they're different-origin, the parent's request is respected, as is
+// child 1's non-request. child 2 requests origin-keying but is ignored, since
+// child 1 is in the same browsing context group.
 //
 // So, the parent ends up in the origin-keyed agent cluster, and both children
 // ends up in the site-keyed one.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
index 0448076178a..202b916767c 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is not isolated, different-subdomain child 2 is isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is site-keyed, different-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
index 1b14ca48ba7..a1316731ac2 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is not isolated, different-port-same-subdomain child 2 is isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is site-keyed, different-port-same-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
similarity index 89%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
index fcdb1369971..46bef4b9a9e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is isolated, non-subdomain but different-port child 2 is not isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is origin-keyed, non-subdomain but different-port child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
similarity index 70%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
index 011bcd1637b..39dcfc04b09 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is isolated, same-subdomain child 2 is not isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is origin-keyed, same-subdomain child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -15,15 +15,15 @@ import {
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
-  // Must be sequential, not parallel: the isolated frame must load first.
+  // Must be sequential, not parallel: the origin-keyed frame must load first.
   await insertIframe("{{hosts[][www]}}", "?1");
   await insertIframe("{{hosts[][www]}}");
 });
 
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is child 1's request. child 2's non-request is ignored, since
-// child 1 is in the same browsing context group.
+// Since they're different-origin, the parent's request is respected, as is
+// child 1's request. child 2's non-request is ignored, since  child 1 is in the
+// same browsing context group.
 //
 // So, the parent ends up in the origin-keyed agent cluster, and both children
 // ends up in a different origin-keyed agent cluster.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
index 1a4dd4c9a65..b6daf91b54e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is isolated, same-subdomain child 2 is not isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is origin-keyed, same-subdomain child 2 is site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -22,9 +22,9 @@ promise_setup(async () => {
 });
 
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is child 1's request. child 2's request is redundant, since
-// child 1 is in the same browsing context group.
+// Since they're different-origin, the parent's request is respected, as is
+// child 1's request. child 2's request is redundant, since child 1 is in the
+// same browsing context group.
 //
 // So, the parent ends up in the origin-keyed agent cluster, and both children
 // ends up in a different origin-keyed agent cluster.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
index 852fd2d216e..b94f9392d46 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is isolated, different-subdomain child 2 is isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is origin-keyed, different-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
index ba8edadc188..fb3fda1bf27 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, subdomain child 1 is isolated, different-port-same-subdomain child 2 is isolated</title>
+<title>Parent is origin-keyed, subdomain child 1 is origin-keyed, different-port-same-subdomain child 2 is origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml
new file mode 100644
index 00000000000..f21ce69f6a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml
@@ -0,0 +1,5 @@
+spec: https://html.spec.whatwg.org/multipage/#origin-keyed-agent-clusters
+suggested_reviewers:
+  - domenic
+  - annevk
+  - wjmaclean
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md
new file mode 100644
index 00000000000..85ba3bce7f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md
@@ -0,0 +1,30 @@
+# Origin-keyed agent clusters tests
+
+These are tests for the [origin-keyed agent clusters](https://html.spec.whatwg.org/multipage/origin.html#origin-keyed-agent-clusters)
+feature.
+
+## Test filenames
+
+The tests in `2-iframes` follow the file naming pattern
+
+```
+parent-[yes|no]-child1-[yes|no]-[designator]-child2-[yes|no]-[designator]
+```
+
+Here:
+
+* `yes` or `no` refers to whether the `Origin-Agent-Cluster` header is set or
+  unset.
+* `designator` explains how the child differs from the parent: e.g. by being a
+  subdomain, or having a different port, or both. There's also `same` if it's
+  same-origin.
+
+Other directories have variations on this, e.g. `1-iframe/` does the same thing
+but for a single `child` instead of `child1` and `child2`, and `navigation/`
+uses `1` and `2` to represent the two different locations the single iframe will
+be navigated to.
+
+## Coverage
+
+Header parsing is covered by a few tests in the `1-iframe/` subdirectory, and
+not duplicated to all other scenarios.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html
diff --git a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html
similarity index 72%
rename from tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html
index 48f9a99b5f7..b4535d9e548 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Setting document.domain does not change same-originness</title>
+<title>Setting document.domain does not change same-originness when origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <!--
   Other tests check that using document.domain doesn't allow cross-origin
-  access. This test ensures a different, more subtle property: that origin
-  isolation makes document.domain into a no-op in other ways.
+  access. This test ensures a different, more subtle property: that
+  origin-keying makes document.domain into a no-op in other ways.
 -->
 
 <iframe src="resources/frame.html"></iframe>
-<iframe src="//{{domains[www1]}}:{{location[port]}}/origin-isolation/resources/frame.html"></iframe>
+<iframe src="//{{domains[www1]}}:{{location[port]}}/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html"></iframe>
 
 <script type="module">
 setup({ explicit_done: true });
@@ -23,8 +23,8 @@ window.onload = () => {
     // the two would then be considered cross-origin.
     document.domain = document.domain;
 
-    // However, because we're using origin isolation, this shouldn't have any
-    // impact. The test fails if this throws, and passes if it succeeds.
+    // However, because we're origin-keyed, this shouldn't have any impact. The
+    // test fails if this throws, and passes if it succeeds.
     frames[0].document;
   }, "Setting document.domain must not change same-originness");
 
@@ -44,7 +44,7 @@ window.onload = () => {
       assert_equals(e.data.type, "new document.domain");
       assert_equals(e.data.result, "{{domains[www1]}}");
     });
-  }, "Having an origin-isolated subdomain child try to set document.domain " +
+  }, "Having an origin-keyed subdomain child try to set document.domain " +
      "must not change the document.domain value it sees");
 
   done();
diff --git a/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html
similarity index 71%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html
index 16ecb451929..e0b5f923762 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a top-level frame sandboxed by CSP with no Origin-Isolation header</title>
+<title>window.originAgentCluster for a top-level frame sandboxed by CSP with no Origin-Agent-Cluster header</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -10,6 +10,6 @@
 import { testGetter } from "../resources/helpers.mjs";
 
 // Even without the header, sandboxing makes this page have an opaque origin,
-// so it is origin-isolated.
+// so it is origin-keyed.
 testGetter(self, true);
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html
similarity index 54%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html
index b9a7359974d..a2220c5acc5 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a top-level frame sandboxed by CSP with an Origin-Isolation header</title>
+<title>window.originAgentCluster for a top-level frame sandboxed by CSP with an Origin-Agent-Cluster header</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -9,7 +9,7 @@
 <script type="module">
 import { testGetter } from "../resources/helpers.mjs";
 
-// We're definitely origin-isolated: both the CSP sandboxing and the
-// Origin-Isolation header should ensure this.
+// We're definitely origin-keyed: both the CSP sandboxing and the
+// Origin-Agent-Cluster header should ensure this.
 testGetter(self, true);
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html
similarity index 70%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html
index cb00ef782d0..06149cda8ab 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a javascript: URL navigated to from a data: URL on a non-isolated page</title>
+<title>window.originAgentCluster for a javascript: URL navigated to from a data: URL on a site-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html
similarity index 70%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html
index 6856441deff..af6fea0ad97 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a javascript: URL navigated to from a data: URL on an isolated page</title>
+<title>window.originAgentCluster for a javascript: URL navigated to from a data: URL on an origin-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html
index 5b194eaef35..8ae564a072a 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a data: URL on a non-isolated page</title>
+<title>window.originAgentCluster for a data: URL on a site-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html
index 85821be32b5..bcbf098a664 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolationRestricted for a data: URL on an isolated page</title>
+<title>window.originAgentCluster for a data: URL on an origin-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html
index b75cae47cdb..1b54ad42a43 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a javascript: URL on a non-isolated page</title>
+<title>window.originAgentCluster for a javascript: URL on a site-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html
similarity index 76%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html
index 573b1a0b712..e2b7730dd2b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a javascript: URL on an isolated page</title>
+<title>window.originAgentCluster for a javascript: URL on an origin-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html
similarity index 87%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html
index 8a29076e561..fcf50689088 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a removed frame</title>
+<title>window.originAgentCluster for a removed frame</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -23,5 +23,5 @@ promise_test(async () => {
   assert_equals(frameWindow.originAgentCluster, true, "before");
   iframe.remove();
   assert_equals(frameWindow.originAgentCluster, true, "after");
-}, "Removing the iframe does not change originIsolated");
+}, "Removing the iframe does not change originAgentCluster");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs
similarity index 84%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs
index d32d8521be4..1a9b3be47f6 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs
@@ -7,7 +7,7 @@ export default () => {
   });
 
   // The data: URL iframe has an opaque origin, so it should return true, since
-  // for them site === origin so they are always "origin-isolated".
+  // for them site === origin so they are always origin-keyed.
 
   testGetter(0, true, "data: URL child");
 };
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs
similarity index 68%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs
index 6cc2ed6b697..4610ffcad0a 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs
@@ -1,8 +1,8 @@
 import { waitForIframe } from "../../resources/helpers.mjs";
 
 /**
- * Inserts an iframe, not specialized for origin-isolation testing, pointing to
- * a custom URL. This is just a wrapper to remove some boilerplate.
+ * Inserts an iframe, not specialized for origin-keyed agent cluster testing,
+ * pointing to a custom URL. This is just a wrapper to remove some boilerplate.
  * @param {string} src - The src="" value for the iframe
  */
 export async function insertCustomIframe(src) {
@@ -17,8 +17,7 @@ export async function insertCustomIframe(src) {
 }
 
 /**
- * This is the part of send-origin-isolation-header.py that allows
- * us to reuse testGetter.
+ * This is the part of send-oac-header.py that allows us to reuse testGetter.
  */
 export const testSupportScript = `
   <script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
similarity index 90%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
index 98575b8d80e..9357df00c5c 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
@@ -15,6 +15,6 @@ export default () => {
   });
 
   // Sandboxed iframes have an opaque origin, so it should return true, since
-  // for them site === origin so they are always "origin-isolated".
+  // for them site === origin so they are always origin-keyed.
   testGetter(0, true);
 };
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html
similarity index 76%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html
index bc2276fede8..29758a17b87 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a sandboxed iframe on a non-isolated page</title>
+<title>window.originAgentCluster for a sandboxed iframe on a site-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html
index 5805d3421eb..5eb5d08d10f 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a sandboxed iframe on an isolated page</title>
+<title>window.originAgentCluster for a sandboxed iframe on an origin-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
similarity index 74%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
index a1b44a1e5b3..3ed4096f399 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a sandboxed, but same-origin, iframe on a non-isolated page</title>
+<title>window.originAgentCluster for a sandboxed, but same-origin, iframe on a site-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
similarity index 74%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
index b9339afae2e..c7ea5f06932 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolated for a sandboxed, but same-origin, iframe on an isolated page</title>
+<title>window.originAgentCluster for a sandboxed, but same-origin, iframe on an origin-keyed page</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html
index 7e95f193669..a593619ea64 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, child1 is not isolated, child1 navigates to a different site, child2 gets inserted and is isolated, child1 navigates back</title>
+<title>Parent is origin-keyed, child1 is site-keyed, child1 navigates to a different site, child2 gets inserted and is origin-keyed, child1 navigates back</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,9 +21,9 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}");
 });
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is the child's non-request. So the parent ends up in the origin-keyed
-// agent cluster and the child ends up in the site-keyed one.
+// Since they're different-origin, the parent's origin-keying request is
+// respected, as is the child's non-request. So the parent ends up in the
+// origin-keyed agent cluster and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0], "Before navigation: parent to child1");
 
 // Navigate the iframe to a different site. These, of course, must not be in the
@@ -34,7 +34,7 @@ promise_test(async () => {
 }, "Navigation");
 
 // Now insert a second iframe, pointing to the same place as the first one
-// originally did, but this time with origin isolation enabled. Because of the
+// originally did, but this time with origin-keying requested. Because of the
 // historical map of agent cluster keys for the browsing context group, the new
 // iframe should still end up in the site-keyed agent cluster.
 
@@ -45,7 +45,7 @@ promise_test(async () => {
 testDifferentAgentClusters([self, 1], "After navigation: parent to child2");
 
 // Now navigate the first iframe back. The resulting Document should be put in
-// the site agent cluster, together with the second iframe's Document.
+// the site-keyed agent cluster, together with the second iframe's Document.
 
 promise_test(async () => {
   const waitPromise = waitForIframe(frame1);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
index 85ee2f677f3..8237f2f23f9 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from same-origin non-isolated to different-origin (different-port) isolated</title>
+<title>Parent is site-keyed, navigate a frame from same-origin site-keyed to different-origin (different-port) origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,7 +21,7 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][]}}");
 });
 
-// Nobody requested isolation yet.
+// Nobody requested origin-keying yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -32,7 +32,8 @@ promise_test(async () => {
   await setBothDocumentDomains(frames[0]);
 }, "Navigation");
 
-// Since the new page is different-origin, it should be isolated.
+// Since the new page is different-origin, its origin-keying request should be
+// respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
index bb39de648ac..00d8c3164a6 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from same-origin non-isolated to different-origin (subdomain) isolated</title>
+<title>Parent is site-keyed, navigate a frame from same-origin site-keyed to different-origin (subdomain) origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,7 +21,7 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][]}}");
 });
 
-// Nobody requested isolation yet.
+// Nobody requested origin-keying yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -32,7 +32,8 @@ promise_test(async () => {
   await setBothDocumentDomains(frames[0]);
 }, "Navigation");
 
-// Since the new page is different-origin, it should be isolated.
+// Since the new page is different-origin, its origin-keying request should be
+// respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
similarity index 74%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
index b52ca783f6f..803e684e1ca 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from a subdomain non-isolated to the same subdomain isolated</title>
+<title>Parent is site-keyed, navigate a frame from a subdomain site-keyed to the same subdomain origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -20,7 +20,7 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}");
 });
 
-// Nobody requested isolation yet.
+// Nobody requested origin-keying yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -31,8 +31,8 @@ promise_test(async () => {
   await setBothDocumentDomains(frames[0]);
 }, "Navigation");
 
-// Because this subdomain was previously non-isolated, the second load's
-// isolation request is ignored; instead we continue isolating.
+// Because this subdomain was previously site-keyed, the second load's
+// origin-keying request is ignored; instead we continue with site-keying.
 
 testSameAgentCluster([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
similarity index 83%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
index 67e99cee090..b96d10afd13 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from a subdomain non-isolated to a second-subdomain isolated</title>
+<title>Parent is site-keyed, navigate a frame from a subdomain site-keyed to a second-subdomain origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,7 +21,7 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}");
 });
 
-// Nobody requested isolation yet.
+// Nobody requested origin-keying yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -33,7 +33,7 @@ promise_test(async () => {
 }, "Navigation");
 
 // Because we're going to a different subdomain (and thus different origin), the
-// isolation request is respected.
+// origin-keying request is respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
similarity index 76%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
index 1b7dd01947f..a70ed566708 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from a subdomain isolated to a second-subdomain non-isolated</title>
+<title>Parent is site-keyed, navigate a frame from a subdomain origin-keyed to a second-subdomain site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,7 +21,8 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}", "?1");
 });
 
-// Since they are different-origin, the child's isolation request is respected.
+// Since they are different-origin, the child's origin-keying request is
+// respected.
 
 testDifferentAgentClusters([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -32,8 +33,9 @@ promise_test(async () => {
   await setBothDocumentDomains(frames[0]);
 }, "Navigation");
 
-// Make sure that the different-subdomain page (which doesn't request isolation)
-// doesn't somehow get isolated just because its predecessor was.
+// Make sure that the different-subdomain page (which doesn't request
+// origin-keying) doesn't somehow get origin-keyed just because its predecessor
+// was.
 
 testSameAgentCluster([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
similarity index 72%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
index 783f5870a83..38e26301288 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is not isolated, navigate a frame from a subdomain isolated to the same subdomain non-isolated</title>
+<title>Parent is site-keyed, navigate a frame from a subdomain origin-keyed to the same subdomain site-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -20,7 +20,8 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}", "?1");
 });
 
-// Since they are different-origin, the child's isolation request is respected.
+// Since they are different-origin, the child's origin-keying request is
+// respected.
 
 testDifferentAgentClusters([self, 0], "Before: parent to child");
 testGetter(self, false, "before parent");
@@ -31,8 +32,8 @@ promise_test(async () => {
   await setBothDocumentDomains(frames[0]);
 }, "Navigation");
 
-// Because this subdomain was previously isolated, the second load's
-// non-isolation request is ignored; instead we continue isolating.
+// Because this subdomain was previously origin-keyed, the second load's
+// non-request is ignored; instead we continue origin-keying.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
 testGetter(self, false, "after parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
similarity index 79%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
index 461fd0ddc4b..6211845be1f 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, navigate a frame from same-origin non-isolated to different-origin (different-port) isolated</title>
+<title>Parent is origin-keyed, navigate a frame from same-origin site-keyed to different-origin (different-port) origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,8 +21,8 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][]}}");
 });
 
-// Since the parent is isolated, the same-origin child's non-request is ignored,
-// so it gets isolated too.
+// Since the parent is origin-keyed, the same-origin child's non-request is
+// ignored, so it gets origin-keyed too.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, true, "before parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
similarity index 79%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
index 6832cd03858..ead56754a70 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent is isolated, navigate a frame from same-origin non-isolated to different-origin (subdomain) isolated</title>
+<title>Parent is origin-keyed, navigate a frame from same-origin site-keyed to different-origin (subdomain) origin-keyed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -21,8 +21,8 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][]}}");
 });
 
-// Since the parent is isolated, the same-origin child's non-request is ignored,
-// so it gets isolated too.
+// Since the parent is origin-keyed, the same-origin child's non-request is
+// ignored, so it gets origin-keyed too.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
 testGetter(self, true, "before parent");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html
similarity index 71%
rename from tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html
index 18e0216e262..6f9e5d8b73a 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Parent requests isolation, child requests isolation, child is a subdomain of the parent, but all over insecure HTTP</title>
+<title>Parent requests origin-keying, child requests origin-keying, child is a subdomain of the parent, but all over insecure HTTP</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -17,7 +17,7 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www]}}", "?1");
 });
 
-// All isolation requests are ignored, since this is over insecure HTTP.
+// All origin-keying requests are ignored, since this is over insecure HTTP.
 // So both end up in the site-keyed agent cluster.
 testSameAgentCluster([self, 0]);
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups-crash.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups-crash.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html
similarity index 64%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html
index 270162530b1..a0bf569b124 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is not isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch</title>
+<title>Opener is site-keyed, openee is origin-keyed, openee is different-origin to the opener because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,9 +18,9 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1");
 });
 
-// Since they're different-origin, the openee's isolation request is respected,
-// so the opener ends up in the site-keyed agent cluster and the openee in the
-// origin-keyed one.
+// Since they're different-origin, the openee's origin-keying request is
+// respected, so the opener ends up in the site-keyed agent cluster and the
+// openee in the origin-keyed one.
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
 
 testGetter(self, false, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html
similarity index 68%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html
index 0c8d89b8e66..196dff1449b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is not isolated, openee is isolated, openee is same-origin to the opener</title>
+<title>Opener is site-keyed, openee is origin-keyed, openee is same-origin to the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,8 +18,8 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}", "?1");
 });
 
-// Since they're same-origin, and the opener loaded without isolation, the
-// child's request for isolation gets ignored, and both end up site-keyed.
+// Since they're same-origin, and the opener loaded with site-keying, the
+// child's request for origin-keying gets ignored, and both end up site-keyed.
 testOpenedWindowIsInSameAgentCluster(() => openee);
 
 testGetter(self, false, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html
similarity index 66%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html
index d1aaabd9206..f96d2273d5e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is not isolated, openee is isolated, openee is a subdomain of the opener</title>
+<title>Opener is site-keyed, openee is origin-keyed, openee is a subdomain of the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,9 +18,9 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][www]}}", "?1");
 });
 
-// Since they're different-origin, the openee's isolation request is respected,
-// so the opener ends up in the site-keyed agent cluster and the openee in the
-// origin-keyed one.
+// Since they're different-origin, the openee's origin-keying request is
+// respected, so the opener ends up in the site-keyed agent cluster and the
+// openee in the origin-keyed one.
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
 
 testGetter(self, false, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html
similarity index 64%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html
index 96b839e167f..51c5a208c5e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is not isolated, openee is different-origin to the opener because of a port mismatch</title>
+<title>Opener is origin-keyed, openee is site-keyed, openee is different-origin to the opener because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,9 +18,9 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}");
 });
 
-// Since they're different-origin, the openee's isolation non-request is
-// respected, so the opener ends up in the origin-keyed agent cluster and the
-// openee in the site-keyed one.
+// Since they're different-origin, the openee's non-request is respected, so the
+// opener ends up in the origin-keyed agent cluster and the openee in the
+// site-keyed one.
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
 
 testGetter(self, true, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html
similarity index 70%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html
index 0dee5fae002..562ab40c68b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is not isolated, openee is same-origin to the opener</title>
+<title>Opener is origin-keyed, openee is site-keyed, openee is same-origin to the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,8 +18,8 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}");
 });
 
-// Since they're same-origin, the openee's isolation non-request is ignored,
-// so both end up in the origin-keyed agent cluster.
+// Since they're same-origin, the openee's non-request is ignored, so both end
+// up in the origin-keyed agent cluster.
 testOpenedWindowIsInSameAgentCluster(() => openee);
 
 testGetter(self, true, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html
similarity index 66%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html
index cfec0fda130..d7d4791459e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is not isolated, openee is a subdomain of the opener</title>
+<title>Opener is origin-keyed, openee is site-keyed, openee is a subdomain of the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,9 +18,9 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][www]}}");
 });
 
-// Since they're different-origin, the openee's isolation non-request is
-// respected, so the opener ends up in the origin-keyed agent cluster and the
-// openee in the site-keyed one.
+// Since they're different-origin, the openee's non-request is respected, so the
+// opener ends up in the origin-keyed agent cluster and the openee in the
+// site-keyed one.
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
 
 testGetter(self, true, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html
similarity index 77%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html
index 4ea37421df0..32a5066d2ee 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch</title>
+<title>Opener is origin-keyed, openee is origin-keyed, openee is different-origin to the opener because of a port mismatch</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,7 +18,7 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1");
 });
 
-// Both request isolation, so the opener ends up in one origin-keyed agent
+// Both request origin-keying, so the opener ends up in one origin-keyed agent
 // cluster (the default port's origin), and the openee ends up in a different
 // origin-keyed agent cluster (the other port's origin).
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html
similarity index 71%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html
index 603f11d8de6..a85decac3c1 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is isolated, openee is same-origin to the opener</title>
+<title>Opener is origin-keyed, openee is origin-keyed, openee is same-origin to the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,8 +18,8 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][]}}", "?1");
 });
 
-// Both request isolation, and they're same-origin, so they both end up in the
-// same origin-keyed agent cluster.
+// Both request origin-keying, and they're same-origin, so they both end up in
+// the same origin-keyed agent cluster.
 testOpenedWindowIsInSameAgentCluster(() => openee);
 
 testGetter(self, true, "opener");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html
similarity index 79%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html
index b182d496a92..148b39af232 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Opener is isolated, openee is isolated, openee is a subdomain of the opener</title>
+<title>Opener is origin-keyed, openee is origin-keyed, openee is a subdomain of the opener</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -18,7 +18,7 @@ promise_setup(async () => {
   openee = await openWindow("{{hosts[][www]}}", "?1");
 });
 
-// Both request isolation, so the opener ends up in one origin-keyed agent
+// Both request origin-keyed, so the opener ends up in one origin-keyed agent
 // cluster (the base domain's origin), and the openee ends up in a different
 // origin-keyed agent cluster (the www subdomain's origin).
 testOpenedWindowIsInADifferentAgentCluster(() => openee);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html
similarity index 68%
rename from tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html
index cbe13af8207..b83aa9f5bed 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>A non-isolated child at a given origin causes future children to also be non-isolated even after the iframe is removed</title>
+<title>A site-keyed child at a given origin causes future children to also be site-keyed even after the iframe is removed</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -19,9 +19,9 @@ promise_setup(async () => {
   frame1 = await insertIframe("{{hosts[][www]}}");
 });
 
-// Since they're different-origin, the parent's isolation request is respected,
-// as is the child's non-request. So the parent ends up in the origin-keyed
-// agent cluster and the child ends up in the site-keyed one.
+// Since they're different-origin, the parent's origin-keying request is
+// respected, as is the child's non-request. So the parent ends up in the
+// origin-keyed agent cluster and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0], "Before");
 testGetter(self, true, "parent");
 testGetter(0, false, "child1");
@@ -33,8 +33,8 @@ promise_test(async () => {
   await insertIframe("{{hosts[][www1]}}");
 }, "Remove the iframe and insert new ones");
 
-// Because of the historical presence of a non-isolated {{hosts[][www]}} iframe,
-// the origin isolation request for child 2 will be ignored. So,
+// Because of the historical presence of a site-keyed {{hosts[][www]}} iframe,
+// the origin-keying request for child 2 will be ignored. So,
 // child 2 and child 3 both end up in the site-keyed agent cluster.
 testDifferentAgentClusters([self, 0], "Parent to child2");
 testDifferentAgentClusters([self, 1], "Parent to child3");
diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/README.md b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/README.md
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html
new file mode 100644
index 00000000000..45c8d5074d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>This page helps exhibit a crash bug when window.open()ed (see ../popups-crash.https.html)</title>
+
+<iframe src="https://{{hosts[][www]}}:{{ports[https][0]}}/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py"></iframe>
+<iframe src="https://{{hosts[][www]}}:{{ports[https][0]}}/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py?header=?1"></iframe>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/frame.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs
similarity index 85%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs
index 02ba405c601..f858c5fefbc 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs
@@ -1,15 +1,15 @@
 /**
- * Inserts an iframe usable for origin isolation testing, and returns a promise
- * fulfilled when the iframe is loaded and its document.domain is set. The
- * iframe will point to the send-origin-isolation-header.py file, on the
- * designated host
+ * Inserts an iframe usable for origin-keyed agent cluster testing, and returns
+ * a promise fulfilled when the iframe is loaded and its document.domain is set.
+ * The iframe will point to the send-oac-header.py file, on the  designated
+ * host.
  * @param {string} host - The host used to calculate the iframe's src=""
- * @param {string=} header - The value of the Origin-Isolation header that the
- *   iframe will set. Omit this to set no header.
+ * @param {string=} header - The value of the Origin-Agent-Cluster header that
+ *   the iframe will set. Omit this to set no header.
  * @param {object=} options - Rarely-used options.
  * @param {boolean=} options.redirectFirst - Whether to do a 302 redirect first
- *   before arriving at the isolated page. The redirecting page will not set
- *   the Origin-Isolation header.
+ *   before arriving at the page that sets the header. The redirecting page will
+ *   not set the Origin-Agent-Cluster header.
  * @returns {HTMLIFrameElement} The created iframe element
  */
 export async function insertIframe(host, header, { redirectFirst = false } = {}) {
@@ -22,16 +22,16 @@ export async function insertIframe(host, header, { redirectFirst = false } = {})
 }
 
 /**
- * Navigates an iframe to a page for origin isolation testing, similar to
- * insertIframe but operating on an existing iframe.
+ * Navigates an iframe to a page for origin-keyed agent cluster testing, similar
+ * to insertIframe but operating on an existing iframe.
  * @param {HTMLIFrameElement} iframeEl - The <iframe> element to navigate
  * @param {string} host - The host to calculate the iframe's new src=""
- * @param {string=} header - The value of the Origin-Isolation header that the
- *   newly-navigated-to page will set. Omit this to set no header.
+ * @param {string=} header - The value of the Origin-Agent-Cluster header that
+ *   the newly-navigated-to page will set. Omit this to set no header.
  * @param {object=} options - Rarely-used options.
  * @param {boolean=} options.redirectFirst - Whether to do a 302 redirect first
- *   before arriving at the isolated page. The redirecting page will not set
- *   the Origin-Isolation header.
+ *   before arriving at the page that sets the header. The redirecting page will
+ *   not set the Origin-Agent-Cluster header.
  * @returns {Promise} a promise fulfilled when the load event fires, or rejected
  *   if the error event fires
  */
@@ -63,15 +63,14 @@ export function waitForIframe(iframeEl, destinationForErrorMessage) {
 }
 
 /**
- * Opens a new window usable for origin isolation testing, and returns a promise
- * fulfilled when the window is loaded and its document.domain is set. The
- * window will point to the send-origin-isolation-header.py file, on the
- * designated host.
+ * Opens a new window usable for origin-keyed agent cluster testing, and returns
+ * a promise fulfilled when the window is loaded and its document.domain is set.
+ * The window will point to the send-oac-header.py file, on the designated host.
  *
  * The opened window will be automatically closed when all the tests complete.
  * @param {string} host - The host used to calculate the window's URL
- * @param {string=} header - The value of the Origin-Isolation header that the
- *   iframe will set. Omit this to set no header.
+ * @param {string=} header - The value of the Origin-Agent-Cluster header that
+ *   the opened window's page will set. Omit this to set no header.
  * @returns {WindowProxy} The created window
  */
 export async function openWindow(host, header) {
@@ -259,11 +258,11 @@ export function testOpenedWindowIsInSameAgentCluster(openedWindowGetter) {
 }
 
 /**
- * Creates a promise_test() to check the value of the originIsolated getter in
- * the given testFrame.
+ * Creates a promise_test() to check the value of the originAgentCluster getter
+ * in the given testFrame.
  * @param {Window|number|function} testFrame - Either self, or a frame index to
-     test, or a function that returns a windwo to test.
- * @param {boolean} expected - The expected value for originIsolated.
+     test, or a function that returns a Window to test.
+ * @param {boolean} expected - The expected value for originAgentCluster.
  * @param {string=} testLabelPrefix - A prefix used in the test names. This can
  *   be omitted if the function is only used once in a test file.
  */
@@ -275,15 +274,15 @@ export function testGetter(testFrame, expected, testLabelPrefix) {
       assert_equals(self.originAgentCluster, expected);
     } else if (typeof testFrame === "number") {
       const frameWindow = frames[testFrame];
-      const result = await accessOriginIsolated(frameWindow);
+      const result = await accessOriginAgentCluster(frameWindow);
       assert_equals(result, expected);
     } else {
       assert_equals(typeof testFrame, "function",
         "testFrame argument must be self, a number, or a function");
-      const result = await accessOriginIsolated(testFrame());
+      const result = await accessOriginAgentCluster(testFrame());
       assert_equals(result, expected);
     }
-  }, `${prefix}originIsolated must equal ${expected}`);
+  }, `${prefix}originAgentCluster must equal ${expected}`);
 }
 
 /**
@@ -296,8 +295,8 @@ export function testGetter(testFrame, expected, testLabelPrefix) {
  *   "WebAssembly.Module message received" or "messageerror"
  */
 export async function sendWasmModule(frameWindow) {
-  // This function is coupled to ./send-origin-isolation-header.py, which ensures
-  // that sending such a message will result in a message back.
+  // This function is coupled to ./send-oac-header.py, which ensures that
+  // sending such a message will result in a message back.
   frameWindow.postMessage(await createWasmModule(), "*");
   return waitForMessage(frameWindow);
 }
@@ -313,27 +312,27 @@ export async function sendWasmModule(frameWindow) {
 export async function setBothDocumentDomains(frameWindow) {
   // By setting both this page's document.domain and the iframe's
   // document.domain to the same value, we ensure that they can synchronously
-  // access each other, unless they are origin-isolated.
+  // access each other, unless they are origin-keyed.
   // NOTE: document.domain being unset is different than it being set to its
   // current value. It is a terrible API.
   document.domain = document.domain;
 
-  // This function is coupled to ./send-origin-isolation-header.py, which ensures
-  // that sending such a message will result in a message back.
+  // This function is coupled to ./send-oac-header.py, which ensures that
+  // sending such a message will result in a message back.
   frameWindow.postMessage({ command: "set document.domain", newDocumentDomain: document.domain }, "*");
   const whatHappened = await waitForMessage(frameWindow);
   assert_equals(whatHappened, "document.domain is set");
 }
 
-async function accessOriginIsolated(frameWindow) {
-  // This function is coupled to ./send-origin-isolation-header.py, which ensures
-  // that sending such a message will result in a message back.
-  frameWindow.postMessage({ command: "get originIsolated" }, "*");
+async function accessOriginAgentCluster(frameWindow) {
+  // This function is coupled to ./send-oac-header.py, which ensures that
+  // sending such a message will result in a message back.
+  frameWindow.postMessage({ command: "get originAgentCluster" }, "*");
   return waitForMessage(frameWindow);
 }
 
 function getSendHeaderURL(host, header, { sendLoadedMessage = false, redirectFirst = false } = {}) {
-  const url = new URL("send-origin-isolation-header.py", import.meta.url);
+  const url = new URL("send-oac-header.py", import.meta.url);
   url.host = host;
   if (header !== undefined) {
     url.searchParams.set("header", header);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs
similarity index 97%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs
index 515987f3f20..17b00684d64 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs
@@ -17,7 +17,7 @@ window.onmessage = async (e) => {
   if (e.data.command === "set document.domain") {
     document.domain = e.data.newDocumentDomain;
     e.source.postMessage("document.domain is set", "*");
-  } else if (e.data.command === "get originIsolated") {
+  } else if (e.data.command === "get originAgentCluster") {
     e.source.postMessage(self.originAgentCluster, "*");
   }
 
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs.headers
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py
similarity index 83%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py
index 8acf989f964..cc8860fe75b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py
@@ -1,6 +1,6 @@
 def main(request, response):
-    """Send a response with the Origin-Agent-Cluster header given in the "header"
-    query parameter, or no header if that is not provided. Other query
+    """Send a response with the Origin-Agent-Cluster header given in the
+    "header" query parameter, or no header if that is not provided. Other query
     parameters (only their presence/absence matters) are "send-loaded-message"
     and "redirect-first", which modify the behavior a bit.
 
@@ -23,7 +23,7 @@ def main(request, response):
 
       return (
         302,
-        [(b"Location", b"/origin-isolation/resources/send-origin-isolation-header.py" + query_string)],
+        [(b"Location", b"/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py" + query_string)],
         u""
       )
 
@@ -36,7 +36,7 @@ def main(request, response):
     return u"""
     <!DOCTYPE html>
     <meta charset="utf-8">
-    <title>Helper page for origin isolation tests</title>
+    <title>Helper page for origin-keyed agent cluster tests</title>
 
     <body>
     <script type="module" src="send-header-page-script.mjs"></script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html b/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html
new file mode 100644
index 00000000000..b7c3644bdba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Selector: pseudo-classes (:autofill)</title>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+test_valid_selector(":autofill");
+test_valid_selector(":-webkit-autofill", [":autofill", ":-webkit-autofill"]);
+</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html b/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html
new file mode 100644
index 00000000000..9ab03ddc302
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+const log = [];
+</script>
+<script type="importmap" onerror="log.push('onerror 1')">
+{
+  "imports": {
+    "../resources/log.js?pipe=sub&name=A1": "../resources/log.js?pipe=sub&name=B1",
+    "../resources/log.js?pipe=sub&name=A2": "../resources/log.js?pipe=sub&name=B2"
+  }
+}
+</script>
+<script type="importmap" onerror="log.push('onerror 2')">
+{
+  "imports": {
+    "../resources/log.js?pipe=sub&name=A1": "../resources/log.js?pipe=sub&name=C1",
+    "../resources/log.js?pipe=sub&name=A3": "../resources/log.js?pipe=sub&name=C3"
+  }
+}
+</script>
+<script>
+// Currently the spec doesn't allow multiple import maps, by setting acquiring
+// import maps to false on preparing the first import map.
+promise_test(() => {
+  return import("../resources/log.js?pipe=sub&name=A1")
+    .then(() => import("../resources/log.js?pipe=sub&name=A2"))
+    .then(() => import("../resources/log.js?pipe=sub&name=A3"))
+    .then(() => assert_array_equals(
+                    log,
+                    ["onerror 2", "log:B1", "log:B2", "log:A3"]))
+  },
+  "Second import map should be rejected");
+</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html b/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html
new file mode 100644
index 00000000000..a93ecaaeff5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({allow_uncaught_exception : true});
+
+const log = [];
+</script>
+<script type="importmap" onerror="log.push('onerror 1')">
+Parse Error
+</script>
+<script type="importmap" onerror="log.push('onerror 2')">
+{
+  "imports": {
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=C"
+  }
+}
+</script>
+<script>
+// Currently the spec doesn't allow multiple import maps, by setting acquiring
+// import maps to false on preparing the first import map.
+// Even the first import map has errors and thus Document's import map is not
+// updated, the second import map is still rejected at preparationg.
+promise_test(() => {
+  return import("../resources/log.js?pipe=sub&name=A")
+    .then(() => assert_array_equals(
+                    log,
+                    ["onerror 2", "log:A"]))
+  },
+  "Second import map should be rejected after an import map with errors");
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl b/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
index 2d353b061c4..29ab815c411 100644
--- a/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
@@ -32,8 +32,17 @@ interface GamepadPose {
   readonly attribute Float32Array? angularAcceleration;
 };
 
+[Exposed=Window, SecureContext]
+interface GamepadTouch {
+  readonly attribute unsigned long touchId;
+  readonly attribute octet surfaceId;
+  readonly attribute Float32Array position;
+  readonly attribute Uint32Array? surfaceDimensions;
+};
+
 partial interface Gamepad {
   readonly attribute GamepadHand hand;
   readonly attribute FrozenArray<GamepadHapticActuator> hapticActuators;
   readonly attribute GamepadPose? pose;
+  readonly attribute FrozenArray<GamepadTouch>? touchEvents;
 };
diff --git a/tests/wpt/web-platform-tests/origin-isolation/META.yml b/tests/wpt/web-platform-tests/origin-isolation/META.yml
deleted file mode 100644
index 937eca52e71..00000000000
--- a/tests/wpt/web-platform-tests/origin-isolation/META.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-spec: https://github.com/WICG/origin-isolation
-suggested_reviewers:
-  - domenic
-  - annevk
-  - wjmaclean
diff --git a/tests/wpt/web-platform-tests/origin-isolation/README.md b/tests/wpt/web-platform-tests/origin-isolation/README.md
deleted file mode 100644
index 7446ff2495d..00000000000
--- a/tests/wpt/web-platform-tests/origin-isolation/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Origin isolation tests
-
-These tests are for the proposal at
-[WICG/origin-isolation](https://github.com/WICG/origin-isolation). They should
-eventually move into a subdirectory of `html/` if/when that proposal merges into
-the HTML Standard.
-
-TODO: in [whatwg/html#6214](https://github.com/whatwg/html/pull/6214), the
-header was renamed from `Origin-Isolation` to `Origin-Agent-Cluster`, and the
-getter was renamed from `window.originIsolated` to `window.originAgentCluster`.
-The tests reflect this in their expectations, but all their messaging, names,
-and even the name of this folder, do not yet reflect it. That work is being
-tracked in <https://crbug.com/1157917>.
-
-## Test filenames
-
-The tests in `2-iframes` follow the file naming pattern
-
-```
-parent-[yes|no]-child1-[yes|no]-[designator]-child2-[yes|no]-[designator]
-```
-
-Here:
-
-* `yes` or `no` refers to whether the `Origin-Isolation` header is set or unset.
-* `designator` explains how the child differs from the parent: e.g. by being a
-  subdomain, or having a different port, or both. There's also `same` if it's
-  same-origin.
-
-Other directories have variations on this, e.g. `1-iframe/` does the same thing
-but for a single `child` instead of `child1` and `child2`, and `navigation/`
-uses `1` and `2` to represent the two different locations the single iframe will
-be navigated to.
-
-## Coverage
-
-Header parsing is covered by a few tests in the `1-iframe/` subdirectory, and
-not duplicated to all other scenarios.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html b/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html
deleted file mode 100644
index f8d077c2a29..00000000000
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>This page helps exhibit a crash bug when window.open()ed</title>
-
-<iframe src="https://{{hosts[][www]}}:{{ports[https][0]}}/origin-isolation/resources/send-origin-isolation-header.py"></iframe>
-<iframe src="https://{{hosts[][www]}}:{{ports[https][0]}}/origin-isolation/resources/send-origin-isolation-header.py?header=?1"></iframe>
diff --git a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html b/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html
index 45564e1bfac..b14b7e4f8a9 100644
--- a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html
+++ b/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html
@@ -16,11 +16,9 @@
             window.addEventListener("message", function(msg) {
                 // Parse the Performance API data passed from the plain text iframe.
                 const entries = JSON.parse(msg.data);
-                const urls = [];
                 const resource_types = [];
                 for (const entry of entries) {
                     resource_types.push(entry.entryType);
-                    urls.push(entry.name);
                 }
                 // If preloading is working correctly, should only see the text document
                 // represented in the performance information. A 'resource' type indicates
@@ -33,8 +31,6 @@
                     }
                 }
                 assert_false(resource_found, "no resources should be present");
-                assert_equals(urls.length, 1);
-                assert_equals(urls[0].endsWith("avoid-prefetching-on-text-plain-inner.html"), true);
                 done();
             });
             prefetchingIframe.addEventListener('load', function() {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/current-time.html b/tests/wpt/web-platform-tests/scroll-animations/current-time.html
index cbe2d8d6005..fe8c64a6add 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/current-time.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/current-time.html
@@ -463,86 +463,4 @@ promise_test(async t => {
   assert_equals(scrollTimeline.currentTime, scrollTimeline.timeRange);
 }, 'currentTime handles startScrollOffset > endScrollOffset correctly');
 
-promise_test(async t => {
-  const scroller = setupScrollTimelineTest();
-  // Set the timeRange such that currentTime maps directly to the value
-  // scrolled. The contents and scroller are square, so it suffices to compute
-  // one edge and use it for all the timelines.
-  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
-
-  const scrollTimeline = new ScrollTimeline({
-    scrollSource: scroller,
-    timeRange: scrollerSize,
-    orientation: 'block',
-    scrollOffsets: [CSS.px(10), CSS.px(20), CSS.px(40), CSS.px(70), CSS.px(90)],
-  });
-
-  var offset = 0;
-  var w = 1 / 4; // offset weight
-  var p = 0;         // progress within the offset
-
-  scroller.scrollTop = 10;
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  p = (12 - 10) / (20 - 10);
-  scroller.scrollTop = 12;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  offset = 1;
-  p = 0;
-  scroller.scrollTop = 20;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  p = (35 - 20) / (40 - 20);
-  scroller.scrollTop = 35;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  offset = 2;
-  p = 0;
-  scroller.scrollTop = 40;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  p = (60 - 40) / (70 - 40);
-  scroller.scrollTop = 60;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  offset = 3;
-  p = 0;
-  scroller.scrollTop = 70;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  p = (80 - 70) / (90 - 70);
-  scroller.scrollTop = 80;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-
-  scroller.scrollTop = 90;
-  await waitForNextFrame();
-  assert_times_equal(
-    scrollTimeline.currentTime, scrollerSize,
-    "current time calculation when scroll = " + scroller.scrollTop);
-}, 'currentTime calculations when multiple scroll offsets are specified');
-
 </script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html
new file mode 100644
index 00000000000..026b2e7673c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ScrollTimeline current time algorithm</title>
+<link rel="help" href="https://wicg.github.io/scroll-animations/#current-time-algorithm">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script src="./resources/scrolltimeline-utils.js"></script>
+
+<body></body>
+
+<script>
+'use strict';
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    timeRange: scrollerSize,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(10), CSS.px(20), CSS.px(40), CSS.px(70), CSS.px(90)],
+  });
+
+  var offset = 0;
+  var w = 1 / 4; // offset weight
+  var p = 0;     // progress within the offset
+
+  scroller.scrollTop = 10;
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (12 - 10) / (20 - 10);
+  scroller.scrollTop = 12;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 1;
+  p = 0;
+  scroller.scrollTop = 20;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (35 - 20) / (40 - 20);
+  scroller.scrollTop = 35;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 2;
+  p = 0;
+  scroller.scrollTop = 40;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (60 - 40) / (70 - 40);
+  scroller.scrollTop = 60;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 3;
+  p = 0;
+  scroller.scrollTop = 70;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (80 - 70) / (90 - 70);
+  scroller.scrollTop = 80;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scroller.scrollTop = 90;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+}, 'currentTime calculations when multiple scroll offsets are specified');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  var scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    timeRange: scrollerSize,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(300), CSS.px(200), CSS.px(10)],
+  });
+
+  scroller.scrollTop = 250;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, 0,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scroller.scrollTop = 400;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    timeRange: scrollerSize,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(0), CSS.px(400), CSS.px(200)],
+  });
+
+  scroller.scrollTop = 100;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, 0.25 * 0.5 * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    timeRange: scrollerSize,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(200), CSS.px(0), CSS.px(400)],
+  });
+
+  scroller.scrollTop = 200;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, 0.5 * scrollerSize + 0.5 * 0.5 * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+}, 'currentTime calculations when overlapping scroll offsets are specified');
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html b/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html
new file mode 100644
index 00000000000..6ae10ca8739
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Animate a symbol in a display: none subtree</title>
+<link rel="match" href="../struct/reftests/reference/green-100x100.html">
+<script src="/common/reftest-wait.js"></script>
+<svg>
+  <use href="#hidden"/>
+</svg>
+<svg style="display: none">
+  <symbol id="hidden">
+    <rect width="100" height="100" fill="red">
+      <animate attributeName="fill" values="red; green" calcMode="discrete"
+               dur="1ms" fill="freeze" onend="takeScreenshot()"/>
+    </rect>
+  </symbol>
+</svg>
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
index d4472811e59..2b5ed4a27d5 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -429,7 +429,7 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
             return False
 
         method = extract_method_header(frame.headers)
-        if method != "CONNECT":
+        if method != b"CONNECT":
             return False
 
         protocol = ""
@@ -437,7 +437,7 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
             if key in (b':protocol', u':protocol'):
                 protocol = isomorphic_encode(value)
                 break
-        if protocol != "websocket":
+        if protocol != b"websocket":
             raise ProtocolError("Invalid protocol %s with CONNECT METHOD" % (protocol,))
 
         return True
diff --git a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
index e3e4a2635e9..f6b9798f502 100644
--- a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
@@ -8,6 +8,7 @@
 <body>
 <div id="container"></div>
 <script>
+  'use strict';
   const container = document.querySelector("#container");
   const policy = window.trustedTypes.createPolicy("policy", {
     createScript: t => t,
@@ -18,11 +19,11 @@
 
   // This test case mirrors the block-Node-multiple-arguments case except
   // that, because Trusted Types is not enabled, no exceptions should be
-  // thrown anyhwere.
+  // thrown anywhere.
   const targets = ["div", "script"];
   const all_args = [
     [ policy.createScript("'createScript';") ],
-    [ policy.createScript("'cresteScript #1';"), policy.createScript("'#2;'") ],
+    [ policy.createScript("'createScript #1';"), policy.createScript("'#2;'") ],
     [ "'plain text';" ],
     [ "'plain text #1';", "'plain text #2';" ],
     [ document.createTextNode("'node';") ],
@@ -34,10 +35,10 @@
       policy.createScript("'script';") ],
   ];
 
-  for (target of targets) {
-    for (args of all_args) {
+  for (const target of targets) {
+    for (const args of all_args) {
 
-      for (setter of [container.replaceWith, container.after, container.before]) {
+      for (const setter of [container.replaceWith, container.after, container.before]) {
         test(t => {
           var outer = document.createElement(target);
           container.appendChild(outer);
@@ -49,7 +50,7 @@
         }, `${setter.name}(${args.toString()}) on <${target}> should pass`);
       }
 
-      for (setter of [container.append, container.prepend]) {
+      for (const setter of [container.append, container.prepend]) {
         test(t => {
           let outer = document.createElement(target);
           container.appendChild(outer);
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
index e87c8fca238..f76b3587512 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
@@ -9,6 +9,7 @@
 <body>
 <div id="container"></div>
 <script>
+  'use strict';
   const container = document.querySelector("#container");
   const policy = window.trustedTypes.createPolicy("policy", {
     createScript: t => t,
@@ -28,7 +29,7 @@
   const targets = ["div", "script"];
   const pass_args = [
     [ policy.createScript("'createScript';") ],
-    [ policy.createScript("'cresteScript #1';"), policy.createScript("'#2;'") ],
+    [ policy.createScript("'createScript #1';"), policy.createScript("'#2;'") ],
   ];
   const fail_args = [
     [ "'plain text';" ],
@@ -43,12 +44,12 @@
   ];
   const all_args = [].concat(pass_args).concat(fail_args);
 
-  for (target of targets) {
-    for (args of all_args) {
+  for (const target of targets) {
+    for (const args of all_args) {
       var should_fail = target == "script" && fail_args.indexOf(args) != -1;
       var fail_string = should_fail ? "fail" : "pass";
 
-      for (setter of [container.replaceWith, container.after, container.before]) {
+      for (const setter of [container.replaceWith, container.after, container.before]) {
         test(t => {
           var outer = document.createElement(target);
           container.appendChild(outer);
@@ -67,7 +68,7 @@
         }, `${setter.name}(${args.toString()}) on <${target}> should ${fail_string}`);
       }
 
-      for (setter of [container.append, container.prepend]) {
+      for (const setter of [container.append, container.prepend]) {
         test(t => {
           let outer = document.createElement(target);
           container.appendChild(outer);
diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.any.js b/tests/wpt/web-platform-tests/webcodecs/audio-decoder.any.js
index 70110a7822e..a6367231b23 100644
--- a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.any.js
+++ b/tests/wpt/web-platform-tests/webcodecs/audio-decoder.any.js
@@ -15,6 +15,55 @@ function getFakeChunk() {
   });
 }
 
+const invalidConfigs = [
+  {
+    comment: 'Emtpy codec',
+    config: {codec: ''},
+  },
+  {
+    comment: 'Unrecognized codec',
+    config: {codec: 'bogus'},
+  },
+  {
+    comment: 'Video codec',
+    config: {codec: 'vp8'},
+  },
+  {
+    comment: 'Ambiguous codec',
+    config: {codec: 'vp9'},
+  },
+  {
+    comment: 'Codec with MIME type',
+    config: {codec: 'audio/webm; codecs="opus"'},
+  },
+];
+
+invalidConfigs.forEach(entry => {
+  promise_test(t => {
+    return promise_rejects_js(t, TypeError, AudioDecoder.isConfigSupported(entry.config));
+  }, 'Test that AudioDecoder.isConfigSupported() rejects invalid config:' + entry.comment);
+});
+
+
+invalidConfigs.forEach(entry => {
+  async_test(t => {
+    let codec = new AudioDecoder(getDefaultCodecInit(t));
+    assert_throws_js(TypeError, () => { codec.configure(entry.config); });
+    t.done();
+  }, 'Test that AudioDecoder.configure() rejects invalid config:' + entry.comment);
+});
+
+promise_test(t => {
+  return AudioDecoder.isConfigSupported({
+    codec: 'opus',
+    sampleRate: 48000,
+    numberOfChannels: 2,
+    // Opus header extradata.
+    description: new Uint8Array([0x4f, 0x70, 0x75, 0x73, 0x48, 0x65, 0x61, 0x64,
+        0x01, 0x02, 0x38, 0x01, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00])
+  });
+}, 'Test AudioDecoder.isConfigSupported() with a valid config');
+
 promise_test(t => {
   // AudioDecoderInit lacks required fields.
   assert_throws_js(TypeError, () => { new AudioDecoder({}); });
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
new file mode 100644
index 00000000000..89c0f9d2b29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
@@ -0,0 +1,37 @@
+import pytest
+from six import text_type
+
+from webdriver.error import NoSuchAlertException
+
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+
+def get_computed_label(session, element):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/computedlabel".format(
+            session_id=session.session_id,
+            element_id=element))
+
+
+def test_no_browsing_context(session, closed_window):
+    response = get_computed_label(session)
+    assert_error(response, "no such window")
+
+
+def test_no_user_prompt(session):
+    response = get_computed_label(session)
+    assert_error(response, "no such alert")
+
+
+@pytest.mark.parametrize("html,tag,label", [
+    ("<button>ok</button>", "button", "ok"),
+    ("<button aria-labelledby=\"one two\"></button><div id=one>ok</div><div id=two>go</div>", "button", "ok go"),
+    ("<button aria-label=foo>bar</button>", "button", "foo"),
+    ("<label><input> foo</label>", "input", "foo"),
+    ("<label for=b>foo<label><input id=b>", "input", "foo")])
+def test_get_computed_label(session, html, tag, label):
+    session.url = inline("{0}".format(tag))
+    element = session.find.css(tag, all=False)
+    result = get_computed_label(session, element.id)
+    assert_success(result, label)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py
new file mode 100644
index 00000000000..06173ee6fcb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py
@@ -0,0 +1,35 @@
+import pytest
+from six import text_type
+
+from webdriver.error import NoSuchAlertException
+
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+
+def get_computed_role(session, element):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/computedrole".format(
+            session_id=session.session_id,
+            element_id=element))
+
+
+def test_no_browsing_context(session, closed_window):
+    response = get_computed_role(session, "id")
+    assert_error(response, "no such window")
+
+
+def test_no_user_prompt(session):
+    response = get_computed_role(session, "id")
+    assert_error(response, "no such alert")
+
+
+@pytest.mark.parametrize("html,tag,expected", [
+    ("<li role=menuitem>foo", "li", "menu"),
+    ("<input role=searchbox>", "input", "searchbox"),
+    ("<img role=presentation>", "img", "presentation")])
+def test_computed_roles(session, html, tag, expected):
+    session.url = inline(html)
+    element = session.find.css(tag, all=False)
+    result = get_computed_role(session, element.id)
+    assert_success(result, expected)
diff --git a/tests/wpt/web-platform-tests/webusb/resources/manual.js b/tests/wpt/web-platform-tests/webusb/resources/manual.js
index 869ac450acf..e8dc08a8bde 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/manual.js
+++ b/tests/wpt/web-platform-tests/webusb/resources/manual.js
@@ -36,3 +36,75 @@ function manual_usb_test(func, name, properties) {
     await func(test, await getDeviceForManualTest());
   }, name, properties);
 }
+
+function manual_usb_serial_test(func, name, properties) {
+  promise_test(async (test) => {
+    const device = await getDeviceForManualTest();
+    await device.open();
+    test.add_cleanup(async () => {
+      if (device.opened) {
+        await device.close();
+      }
+    });
+
+    await device.selectConfiguration(1);
+
+    let controlInterface = undefined;
+    for (const iface of device.configuration.interfaces) {
+      const alternate = iface.alternates[0];
+      if (alternate.interfaceClass == 2 &&
+          alternate.interfaceSubclass == 2 &&
+          alternate.interfaceProtocol == 0) {
+        controlInterface = iface;
+        break;
+      }
+    }
+    assert_not_equals(controlInterface, undefined,
+                      'No control interface found.');
+
+    let dataInterface = undefined;
+    for (const iface of device.configuration.interfaces) {
+      const alternate = iface.alternates[0];
+      if (alternate.interfaceClass == 10 &&
+          alternate.interfaceSubclass == 0 &&
+          alternate.interfaceProtocol == 0) {
+        dataInterface = iface;
+        break;
+      }
+    }
+    assert_not_equals(dataInterface, undefined, 'No data interface found.');
+
+    await device.claimInterface(controlInterface.interfaceNumber);
+    await device.claimInterface(dataInterface.interfaceNumber);
+
+    let inEndpoint = undefined;
+    for (const endpoint of dataInterface.alternate.endpoints) {
+      if (endpoint.type == 'bulk' && endpoint.direction == 'in') {
+        inEndpoint = endpoint;
+        break;
+      }
+    }
+    assert_not_equals(inEndpoint, undefined, 'No IN endpoint found.');
+
+    let outEndpoint = undefined;
+    for (const endpoint of dataInterface.alternate.endpoints) {
+      if (endpoint.type == 'bulk' && endpoint.direction == 'out') {
+        outEndpoint = endpoint;
+        break;
+      }
+    }
+    assert_not_equals(outEndpoint, undefined, 'No OUT endpoint found.');
+
+    // Execute a SET_CONTROL_LINE_STATE command to let the device know the
+    // host is ready to transmit and receive data.
+    await device.controlTransferOut({
+      requestType: 'class',
+      recipient: 'interface',
+      request: 0x22,
+      value: 0x01,
+      index: controlInterface.interfaceNumber,
+    });
+
+    await func(test, device, inEndpoint, outEndpoint);
+  }, name, properties);
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html b/tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html
index bd3df7d54ea..c0fad37e209 100644
--- a/tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html
+++ b/tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html
@@ -16,6 +16,7 @@
       <pre>
 void setup() {
   Serial.begin(115200);
+  Serial.setTimeout(0);
   while (!Serial) {
     ;
   }
@@ -23,78 +24,15 @@ void setup() {
 
 void loop() {
   if (Serial.available()) {
-    Serial.write(Serial.read());
+    char buf[1024]; // Greater than the endpoint packet size.
+    int count = Serial.readBytes(buf, sizeof buf);
+    Serial.write(buf, count);
   }
 }
       </pre>
     </p>
     <script>
-      manual_usb_test(async (t, device) => {
-        await device.open();
-        t.add_cleanup(async () => {
-          if (device.opened) {
-            await device.close();
-          }
-        });
-
-        await device.selectConfiguration(1);
-
-        let controlInterface = undefined;
-        for (const iface of device.configuration.interfaces) {
-          const alternate = iface.alternates[0];
-          if (alternate.interfaceClass == 2 &&
-              alternate.interfaceSubclass == 2 &&
-              alternate.interfaceProtocol == 0) {
-            controlInterface = iface;
-            break;
-          }
-        }
-        assert_not_equals(controlInterface, undefined,
-                          'No control interface found.');
-
-        let dataInterface = undefined;
-        for (const iface of device.configuration.interfaces) {
-          const alternate = iface.alternates[0];
-          if (alternate.interfaceClass == 10 &&
-              alternate.interfaceSubclass == 0 &&
-              alternate.interfaceProtocol == 0) {
-            dataInterface = iface;
-            break;
-          }
-        }
-        assert_not_equals(dataInterface, undefined, 'No data interface found.');
-
-        await device.claimInterface(controlInterface.interfaceNumber);
-        await device.claimInterface(dataInterface.interfaceNumber);
-
-        let inEndpoint = undefined;
-        for (const endpoint of dataInterface.alternate.endpoints) {
-          if (endpoint.type == 'bulk' && endpoint.direction == 'in') {
-            inEndpoint = endpoint;
-            break;
-          }
-        }
-        assert_not_equals(inEndpoint, undefined, 'No IN endpoint found.');
-
-        let outEndpoint = undefined;
-        for (const endpoint of dataInterface.alternate.endpoints) {
-          if (endpoint.type == 'bulk' && endpoint.direction == 'out') {
-            outEndpoint = endpoint;
-            break;
-          }
-        }
-        assert_not_equals(outEndpoint, undefined, 'No OUT endpoint found.');
-
-        // Execute a SET_CONTROL_LINE_STATE command to let the device know the
-        // host is ready to transmit and receive data.
-        await device.controlTransferOut({
-          requestType: 'class',
-          recipient: 'interface',
-          request: 0x22,
-          value: 0x01,
-          index: controlInterface.interfaceNumber,
-        });
-
+      manual_usb_serial_test(async (t, device, inEndpoint, outEndpoint) => {
         // Set up two IN transfers which should complete in order.
         const transfer1 =
             device.transferIn(inEndpoint.endpointNumber, inEndpoint.packetSize);
@@ -111,13 +49,13 @@ void loop() {
         result = await transfer1;
         assert_equals(result.status, 'ok');
         assert_not_equals(result.data, null);
-        assert_equals(result.data.byteLength, 1);
+        assert_equals(result.data.byteLength, 1, 'byteLength');
         assert_equals(result.data.getUint8(0), 'a'.charCodeAt(0));
 
         // Set up a third IN transfer which will be canceled when the device is
         // closed at the end of the test.
         const transfer3 = promise_rejects_dom(
-            t, 'NetworkError',
+            t, 'AbortError',
             device.transferIn(inEndpoint.endpointNumber,
                               inEndpoint.packetSize));
 
@@ -131,12 +69,80 @@ void loop() {
         result = await transfer2;
         assert_equals(result.status, 'ok');
         assert_not_equals(result.data, null);
-        assert_equals(result.data.byteLength, 1);
+        assert_equals(result.data.byteLength, 1, 'byteLength');
         assert_equals(result.data.getUint8(0), 'b'.charCodeAt(0));
 
         await device.close();
         await transfer3;
-      }, 'Multiple IN transfers on an endpoint complete in order');
+      }, 'Multiple small IN transfers on an endpoint complete in order');
+
+      manual_usb_serial_test(async (t, device, inEndpoint, outEndpoint) => {
+        const bufferLength = outEndpoint.packetSize * 20;
+        const parallelRequests = 6;
+
+        // Keep track of the order in which transfers are submitted.
+        let enqueueSequence = 0;
+        let dequeueSequence = 0;
+        const received = new Uint8Array(bufferLength);
+        let receivedOffset = 0;
+        let done = false;
+        const transfers = [];
+
+        async function readNext(sequence) {
+          let result;
+          try {
+            result = await device.transferIn(inEndpoint.endpointNumber,
+                                             inEndpoint.packetSize);
+          } catch (e) {
+            // The last few transfers will fail when the device is closed.
+            assert_true(done);
+            assert_equals(dequeueSequence++, sequence, 'dequeueSequence done');
+            assert_equals(receivedOffset, bufferLength, 'receivedOffset');
+            assert_equals(e.name, 'AbortError');
+            return;
+          }
+
+          assert_equals(dequeueSequence++, sequence, 'dequeueSequence');
+          assert_equals(result.status, 'ok');
+          assert_not_equals(result.data, null);
+
+          const data = new Uint8Array(
+              result.data.buffer, result.data.byteOffset,
+              result.data.byteLength);
+          received.set(data, receivedOffset);
+          receivedOffset += result.data.byteLength;
+
+          // Check |done| because there might be zero-length packet completions
+          // after the data has been completely received.
+          if (!done) {
+            if (receivedOffset == bufferLength) {
+              done = true;
+              assert_array_equals(received, buffer);
+              await device.close();
+            } else {
+              await readNext(enqueueSequence++);
+            }
+          }
+        }
+
+        for (let i = 0; i < parallelRequests; ++i) {
+          transfers.push(readNext(enqueueSequence++));
+        }
+
+        // Write a large buffer to the device which will be split up into
+        // smaller packets when echoed back.
+        const buffer = new Uint8Array(bufferLength);
+        for (let i = 0; i < buffer.byteLength; ++i) {
+          buffer[i] = i;
+        }
+        let result = await device.transferOut(
+            outEndpoint.endpointNumber, buffer);
+        assert_equals(result.status, 'ok');
+        assert_equals(result.bytesWritten, buffer.byteLength);
+
+        await Promise.all(transfers);
+        assert_equals(dequeueSequence, enqueueSequence);
+      }, 'Multiple large IN transfers on an endpoint complete in order');
     </script>
   </body>
 </html>