From db5631a0861cc131ef08f44f1d54bdafbc5ac086 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sat, 17 Mar 2018 21:12:30 -0400
Subject: [PATCH] Update web-platform-tests to revision
 e87f38097902e16348d4e17f4fe3bc2d0112bff1

---
 tests/wpt/metadata/MANIFEST.json              | 2097 ++++++++++-------
 .../calc-in-font-variation-settings.html.ini  |    4 +
 .../css3-text-line-break-opclns-013.html.ini  |    3 -
 .../css3-text-line-break-opclns-048.html.ini  |    3 -
 .../css3-text-line-break-opclns-118.html.ini  |    3 -
 .../css3-text-line-break-opclns-154.html.ini  |    3 -
 .../line-break/line-break-normal-025.xht.ini  |    3 -
 .../line-break/line-break-strict-018a.xht.ini |    2 -
 .../line-break/line-break-strict-018b.xht.ini |    2 -
 .../line-breaking/line-breaking-012.html.ini  |    2 +
 .../word-break/word-break-normal-002.xht.ini  |    3 -
 tests/wpt/metadata/dom/interfaces.html.ini    |   57 +
 .../api/request/request-disturbed.html.ini    |    3 +
 .../type-argument.window.js.ini               |   22 +
 .../submit-file.sub.html.ini                  |    4 +
 .../Create-on-worker-shutdown.html.ini        |    5 +
 .../canvas/rapid-resizing.html.ini            |    5 -
 .../FileAPI/FileReader/workers.html           |   27 +
 .../web-platform-tests/IndexedDB/README.md    |    6 +-
 .../bluetooth/resources/bluetooth-helpers.js  |    1 +
 .../client-hints/accept_ch.http.html          |   33 +
 .../client-hints/accept_ch.http.html.headers  |    1 +
 .../client-hints/accept_ch.https.html         |   30 -
 .../client-hints/accept_ch.https.html.headers |    1 -
 .../client-hints/accept_ch.sub.https.html     |   32 +
 .../accept_ch.sub.https.html.headers          |    1 +
 ...eived.py => echo_client_hints_received.py} |    6 +-
 .../web-platform-tests/config.default.json    |    2 +-
 .../conformance-checkers/Makefile             |    4 +-
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 ...javascript-no-slash-malformed-novalid.html |    4 -
 .../conformance-checkers/messages.json        |   26 -
 .../conformance-checkers/tools/url.py         |    1 -
 ...ieStore_event_arguments.tenative.window.js |   65 +
 ...ookieStore_event_basic.tentative.window.js |   29 +
 ...ookieStore_event_delete.tenative.window.js |   31 +
 ...eStore_event_overwrite.tentative.window.js |   31 +
 .../cookie-store/idlharness.tentative.html    |    4 +
 .../cookie-store/idlharness_serviceworker.js  |    9 +
 .../normal-flow/unresolvable-max-height.html  |   13 +
 .../normal-flow/unresolvable-min-height.html  |   14 +
 .../gaps/column-gap-parsing-001.html          |    7 +
 .../css/css-align/gaps/gap-parsing-001.html   |    8 +
 .../gaps/grid-column-gap-parsing-001.html     |   71 +-
 .../css-align/gaps/grid-gap-parsing-001.html  |   58 +-
 .../gaps/grid-row-gap-parsing-001.html        |   71 +-
 .../css-align/gaps/row-gap-parsing-001.html   |    7 +
 .../css-font-loading/idlharness.https.html    |   30 +
 .../calc-in-font-variation-settings.html      |   19 +
 ...g-grid-container-containing-block-001.html |    2 +-
 ...positioning-grid-container-parent-001.html |    2 +-
 .../grid-paint-positioned-children-001.html   |    2 +-
 ...tioned-children-writing-modes-001-ref.html |    2 +-
 ...positioned-children-writing-modes-001.html |    2 +-
 ...sitioned-items-and-autofit-tracks-001.html |    2 +-
 ...sitioned-items-and-autofit-tracks-002.html |    2 +-
 ...sitioned-items-and-autofit-tracks-003.html |    2 +-
 ...sitioned-items-and-autofit-tracks-004.html |    2 +-
 ...sitioned-items-and-autofit-tracks-005.html |    2 +-
 ...sitioned-items-and-autofit-tracks-006.html |    2 +-
 ...sitioned-items-and-autofit-tracks-007.html |    2 +-
 .../grid-positioned-items-background-001.html |    2 +-
 ...d-positioned-items-background-rtl-001.html |    2 +-
 ...ositioned-items-content-alignment-001.html |    2 +-
 ...ioned-items-content-alignment-rtl-001.html |    2 +-
 .../grid-positioned-items-gaps-001.html       |    2 +-
 .../grid-positioned-items-gaps-rtl-001.html   |    2 +-
 ...id-positioned-items-implicit-grid-001.html |    2 +-
 ...sitioned-items-implicit-grid-line-001.html |    2 +-
 .../grid-positioned-items-padding-001.html    |    2 +-
 ...ned-items-unknown-named-grid-line-001.html |    2 +-
 ...-items-within-grid-implicit-track-001.html |    2 +-
 .../grid-sizing-positioned-items-001.html     |    2 +-
 ...should-not-create-implicit-tracks-001.html |    2 +-
 ...id-items-should-not-take-up-space-001.html |    2 +-
 .../positioned-grid-items-sizing-001-ref.html |    2 +-
 .../positioned-grid-items-sizing-001.html     |    2 +-
 .../css-grid/{ => abspos}/support/grid.css    |    0
 .../css-grid/alignment/grid-gutters-011.html  |   30 +
 .../css-grid/alignment/grid-gutters-012.html  |   31 +
 .../grid-change-fit-content-argument-001.html |    2 +-
 ...-template-columns-fit-content-001-ref.html |    2 +-
 ...grid-template-columns-fit-content-001.html |    2 +-
 ...rid-template-rows-fit-content-001-ref.html |    2 +-
 .../grid-template-rows-fit-content-001.html   |    2 +-
 .../css-grid/grid-definition/support/grid.css |  277 +++
 .../grid-items-minimum-width-001.html         |  349 +++
 .../grid-items-minimum-width-002.html         |  349 +++
 ...id-items-minimum-width-orthogonal-001.html |  349 +++
 ...id-items-minimum-width-orthogonal-002.html |  349 +++
 ...d-items-minimum-width-vertical-lr-001.html |  350 +++
 ...d-items-minimum-width-vertical-lr-002.html |  350 +++
 ...d-items-minimum-width-vertical-rl-001.html |  350 +++
 ...d-items-minimum-width-vertical-rl-002.html |  350 +++
 .../grid-minimum-size-grid-items-022.html     |    2 +-
 .../grid-minimum-size-grid-items-023.html     |    2 +-
 .../grid-minimum-size-grid-items-024.html     |    2 +-
 .../grid-minimum-size-grid-items-025.html     |    2 +-
 .../css/css-grid/grid-items/support/grid.css  |  277 +++
 ...id-container-ignores-first-letter-001.html |    2 +-
 ...grid-container-ignores-first-line-001.html |    2 +-
 .../grid-item-accepts-first-letter-001.html   |    2 +-
 .../grid-item-accepts-first-line-001.html     |    2 +-
 .../css/css-grid/grid-model/support/grid.css  |  277 +++
 .../css/css-multicol/float-and-block.html     |   10 +
 .../shadow-fallback-dynamic-001.html          |   19 +
 .../shadow-fallback-dynamic-002.html          |   19 +
 .../shadow-fallback-dynamic-003.html          |   18 +
 .../shadow-fallback-dynamic-004.html          |   20 +
 .../shadow-fallback-dynamic-005.html          |   20 +
 .../snap-to-visible-areas.html                |   69 +
 .../shape-outside-formatting-context-ref.html |   26 +
 ...-outside-formatting-context.tentative.html |   31 +
 .../css/css-tables/table-model-fixup-2.html   |   36 +-
 .../i18n/css3-text-line-break-opclns-013.html |   43 -
 .../i18n/css3-text-line-break-opclns-048.html |   43 -
 .../i18n/css3-text-line-break-opclns-118.html |   43 -
 .../i18n/css3-text-line-break-opclns-154.html |   43 -
 .../i18n/css3-text-line-break-opclns-216.html |   43 -
 .../i18n/css3-text-line-break-opclns-224.html |   43 -
 .../css3-text-line-break-opclns-013-ref.html  |   33 -
 .../css3-text-line-break-opclns-048-ref.html  |   33 -
 .../css3-text-line-break-opclns-118-ref.html  |   33 -
 .../css3-text-line-break-opclns-154-ref.html  |   33 -
 .../css3-text-line-break-opclns-216-ref.html  |   33 -
 .../css3-text-line-break-opclns-224-ref.html  |   33 -
 .../line-break/line-break-normal-025.xht      |  119 -
 .../line-break/line-break-strict-018a.xht     |  101 -
 .../line-break/line-break-strict-018b.xht     |   65 -
 .../reference/line-break-normal-025-ref.xht   |  113 -
 .../reference/line-break-strict-018a-ref.xht  |   95 -
 .../reference/line-break-strict-018b-ref.xht  |   59 -
 .../line-breaking/line-breaking-012.html      |   40 +
 .../reference/line-breaking-012-ref.html      |   17 +
 .../reference/word-break-normal-002-ref.xht   |   60 -
 .../word-break/word-break-normal-002.xht      |   68 -
 .../cssKeywordValue-invalid.html              |    6 -
 .../cssKeywordValue-value.html                |   34 +
 .../cssKeywordValue.html                      |   29 +-
 .../properties/break.html                     |   41 +
 .../properties/caption-side.html              |   21 +
 .../properties/flex-basis.html                |   29 +
 .../properties/flex-direction.html            |   23 +
 .../properties/flex-flow.html                 |   20 +
 .../properties/flex-grow.html                 |   23 +
 .../properties/flex-shrink.html               |   23 +
 .../properties/flex-wrap.html                 |   22 +
 .../the-stylepropertymap/properties/flex.html |   20 +
 .../properties/font-size.html                 |   65 +
 .../properties/isolation.html                 |   21 +
 .../properties/scroll-margin.html             |   32 +
 .../properties/unicode-bidi.html              |   25 +
 .../properties/writing-mode.html              |   24 +
 .../GetBoundingRect.html                      |    1 +
 .../wpt/web-platform-tests/css/cssom/CSS.html |    1 +
 .../css/cssom/CSSKeyframeRule.html            |    1 +
 .../css/cssom/CSSKeyframesRule.html           |    1 +
 .../css/cssom/CSSNamespaceRule.html           |    1 +
 .../css/cssom/CSSRuleList.html                |    1 +
 .../css/cssom/CSSStyleSheet.html              |    1 +
 .../css/cssom/MediaList.html                  |    1 +
 .../css/cssom/StyleSheetList.html             |    1 +
 .../cssom-fontfacerule-constructors.html      |    2 +-
 .../css/cssom/cssom-fontfacerule.html         |    2 +-
 .../css/cssom/historical.html                 |    1 +
 .../css/cssom/overflow-serialization.html     |    1 +
 ...selectorText-modification-restyle-001.html |    1 +
 ...ization-CSSDeclaration-with-important.html |    1 +
 .../css/cssom/serialize-values.html           |    1 +
 .../cssom/serialize-variable-reference.html   |    2 +
 .../css/cssom/shorthand-serialization.html    |    2 +
 .../css/cssom/stylesheet-same-origin.sub.html |    1 +
 .../css/cssom/variable-names.html             |    1 +
 .../css/support/blue32x32.ico                 |  Bin 0 -> 326 bytes
 tests/wpt/web-platform-tests/docs/_config.yml |    2 +
 .../docs/_includes/header.html                |    2 +
 .../docs/_running-tests/chrome_android.md     |   24 +-
 .../docs/assets/gh-fork-ribbon.scss           |  124 +
 .../web-platform-tests/docs/assets/main.scss  |    6 +
 .../web-platform-tests/docs/introduction.md   |    2 +-
 .../domxpath/document.tentative.html          |   20 +
 .../web-platform-tests/entries-api/README.md  |    9 +
 .../dedicated-worker/eventsource-close2.htm   |   29 +
 ...rame-policy-allowed-for-all.https.sub.html |   84 +
 ...allowed-for-all.https.sub.html.sub.headers |    1 +
 ...ame-policy-allowed-for-self.https.sub.html |   84 +
 ...llowed-for-self.https.sub.html.sub.headers |    1 +
 ...ame-policy-allowed-for-some.https.sub.html |  109 +
 ...llowed-for-some.https.sub.html.sub.headers |    1 +
 ...e-policy-disallowed-for-all.https.sub.html |   84 +
 ...allowed-for-all.https.sub.html.sub.headers |    1 +
 .../feature-policy/interfaces.any.js          |   23 +
 .../feature-policy/resources/featurepolicy.js |   30 +
 .../fetch/api/request/request-disturbed.html  |   15 +-
 ...nsor-disabled-by-feature-policy.https.html |   12 +
 .../GeolocationSensor_read.https.html         |   39 +
 .../open-features-non-integer-height.html     |    2 +-
 .../type-argument.window.js                   |   20 +
 .../collections/domstringlist-interface.html  |    4 +-
 .../domstringlist-interface.worker.js         |    4 +-
 .../collections/domstringlist.idl             |    6 -
 .../resources/file-submission.py              |    2 +
 .../form-submission-0/submit-file.sub.html    |   25 +
 .../parsing/html-integration-point.html       |   31 +
 .../infrastructure/testdriver/click.html      |   19 +
 .../interfaces/cookie-store.idl               |   47 +-
 .../interfaces/css-font-loading.idl           |   86 +
 .../wpt/web-platform-tests/interfaces/dom.idl |   14 +-
 .../interfaces/feature-policy.idl             |    7 +
 .../web-platform-tests/interfaces/hr-time.idl |   10 +-
 .../web-platform-tests/interfaces/html.idl    |    2 +-
 .../interfaces/screen-orientation.idl         |   44 +-
 tests/wpt/web-platform-tests/lint.whitelist   |   18 -
 .../fractions/frac-parameters-1.html          |    3 +-
 .../fractions/frac-parameters-2.html          |    3 +-
 .../operators/mo-axis-height-1.html           |    3 +-
 .../radicals/root-parameters-1.html           |    3 +-
 .../scripts/subsup-parameters-1.html          |    3 +-
 .../scripts/underover-parameters-1.html       |    3 +-
 .../scripts/underover-parameters-2.html       |    3 +-
 .../scripts/underover-parameters-3.html       |    3 +-
 .../scripts/underover-parameters-4.html       |    3 +-
 .../tables/table-axis-height.html             |    3 +-
 .../relations/css-styling/displaystyle-1.html |    3 +-
 .../relations/css-styling/lengths-3.html      |    3 +-
 .../MediaDevices-enumerateDevices.https.html  |   31 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../blockable/opt-in-blocks.https.html        |   40 +
 .../opt-in-blocks.https.html.headers          |    1 +
 .../allowed/allowed.https.html                |   40 +
 .../allowed/allowed.https.html.headers        |    1 +
 .../no-redirect/allowed/allowed.https.html    |   40 +
 .../allowed/allowed.https.html.headers        |    1 +
 .../blockable/opt-in-blocks.https.html        |   41 +
 .../blockable/opt-in-blocks.https.html        |   41 +
 .../no-redirect/allowed/allowed.https.html    |   41 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../blockable/no-opt-in-blocks.https.html     |   40 +
 .../allowed/allowed.https.html                |   40 +
 .../no-redirect/allowed/allowed.https.html    |   40 +
 .../mixed-content/generic/common.js           |   20 +
 .../generic/mixed-content-test-case.js        |    2 +
 .../mixed-content/spec.src.json               |    3 +-
 .../mixed-content/spec_json.js                |    2 +-
 .../payment-handler/interfaces.https.any.js   |    5 -
 ...ment-request-show-method-manual.https.html |   95 +
 .../payment-request-show-method.https.html    |   41 +-
 .../preload/download-resources.html           |    4 +-
 .../preload/link-header-on-subresource.html   |    2 +-
 .../preload/onload-event.html                 |    2 +-
 .../preload/preload-csp.sub.html              |    4 +-
 .../preload/preload-default-csp.sub.html      |    4 +-
 .../preload/preload-with-type.html            |    4 +-
 ...dummy-preloads-subresource.css.sub.headers |    2 +-
 .../preload/single-download-preload.html      |    6 +-
 .../PresentationRequest_error.https.html      |   39 +-
 .../PresentationRequest_success.https.html    |   29 +-
 .../resource_frame_initiator_type.html        |   37 -
 .../resource_initiator_types.html             |   86 +-
 .../resources/all_resource_types.htm          |   60 +-
 .../resource-timing/resources/empty.py        |    3 +
 .../resource-timing/resources/eventsource.py  |    3 +
 .../resource-timing/resources/green_frame.htm |    2 +-
 .../chromium/fake_bluetooth_chooser.mojom.js  |  822 +++++++
 .../fake_bluetooth_chooser.mojom.js.headers   |    1 +
 .../resources/chromium/web-bluetooth-test.js  |   22 +-
 .../sensors/generic-sensor-tests.js           |   41 +
 .../wpt/web-platform-tests/staticrange/OWNERS |    2 -
 .../staticrange/idlharness.html               |   31 -
 .../streams/writable-streams/aborting.js      |   27 +
 .../tools/ci/ci_stability.sh                  |   14 +-
 .../wpt/web-platform-tests/tools/ci/ci_wpt.sh |    2 +-
 .../tools/ci/ci_wptrunner_infrastructure.sh   |    8 +-
 tests/wpt/web-platform-tests/tools/ci/lib.sh  |    6 +-
 .../wpt/web-platform-tests/tools/lint/lint.py |   54 +-
 .../tools/lint/tests/test_lint.py             |   14 +-
 .../web-platform-tests/tools/serve/serve.py   |   55 +-
 .../tools/six/documentation/index.rst         |    4 +-
 .../web-platform-tests/tools/wpt/browser.py   |   89 +-
 tests/wpt/web-platform-tests/tools/wpt/run.py |    2 +-
 .../tools/wpt/tests/test_wpt.py               |   15 +-
 .../tools/wptrunner/README.rst                |    2 +-
 .../wptrunner/wptrunner/browsers/firefox.py   |    2 +-
 .../wptrunner/wptrunner/browsers/servo.py     |    2 +-
 .../wptrunner/wptrunner/browsers/webkit.py    |    2 +-
 .../tools/wptrunner/wptrunner/environment.py  |    4 +-
 .../wptrunner/wptrunner/executors/base.py     |  139 +-
 .../wptrunner/executors/executormarionette.py |  381 +--
 .../wptrunner/executors/executorselenium.py   |  298 +--
 .../wptrunner/executors/executorservo.py      |   10 +-
 .../executors/executorservodriver.py          |   28 +-
 .../wptrunner/wptrunner/executors/protocol.py |  278 +++
 .../executors/testharness_marionette.js       |   41 +-
 .../testharness_marionette_resume.js          |   46 +
 .../executors/testharness_webdriver_resume.js |    2 +
 .../tools/wptrunner/wptrunner/testrunner.py   |    7 +-
 .../wptrunner/tests/test_products.py          |    2 +-
 .../tools/wptrunner/wptrunner/wptrunner.py    |    9 +
 .../tools/wptserve/docs/stash.rst             |    2 +-
 .../tools/wptserve/wptserve/server.py         |   18 +-
 .../invoke_with_timing_attributes.html        |    4 +-
 .../measure_exceptions_navigation_timing.html |    2 +-
 ...t-value-iteration-composite-operation.html |  195 +-
 .../interfaces/Animatable/animate.html        |  141 +-
 .../interfaces/Animatable/getAnimations.html  |   16 +-
 .../interfaces/Animation/cancel.html          |    2 +-
 .../interfaces/Animation/constructor.html     |   11 +-
 .../interfaces/Animation/effect.html          |    2 +-
 .../interfaces/Animation/finished.html        |    4 +-
 .../interfaces/Animation/idlharness.html      |    4 +-
 .../getComputedTiming.html                    |    2 -
 .../AnimationEffect/updateTiming.html         |  475 ++++
 .../AnimationEffectTiming/delay.html          |   78 -
 .../AnimationEffectTiming/direction.html      |  108 -
 .../AnimationEffectTiming/duration.html       |  190 --
 .../AnimationEffectTiming/easing.html         |   96 -
 .../AnimationEffectTiming/endDelay.html       |   89 -
 .../AnimationEffectTiming/fill.html           |   30 -
 .../AnimationEffectTiming/idlharness.html     |   80 -
 .../AnimationEffectTiming/iterationStart.html |   72 -
 .../AnimationEffectTiming/iterations.html     |   96 -
 .../interfaces/Document/getAnimations.html    |    2 +-
 .../KeyframeEffect/constructor.html           |   82 +-
 .../KeyframeEffect/copy-constructor.html      |   69 +-
 .../interfaces/KeyframeEffect/idlharness.html |   81 +-
 .../KeyframeEffect/iterationComposite.html    |    3 +-
 .../processing-a-keyframes-argument-001.html  |    2 +-
 .../web-animations/resources/timing-tests.js  |   46 +
 .../web-animations/resources/timing-utils.js  |   39 +
 .../web-animations/testcommon.js              |    8 +-
 .../animation-effects/phases-and-states.html  |   10 +-
 .../animations/finishing-an-animation.html    |    2 +-
 ...ing-the-target-effect-of-an-animation.html |   12 +-
 .../updating-the-finished-state.html          |   45 +-
 ...oworkletnode-disconnected-input.https.html |  100 +
 .../processors/input-length-processor.js      |   25 +
 .../webdriver/tests/cookies/add_cookie.py     |    4 +-
 .../find_element_from_element.py              |   12 +-
 .../find_elements_from_element.py             |   14 +-
 .../webdriver/tests/support/fixtures.py       |    1 +
 .../broadcastchannel/workers.html             |   16 +
 .../webmessaging/message-channels/worker.html |   26 +
 .../websockets/Create-on-worker-shutdown.html |   31 +
 .../xhr/responsexml-document-properties.htm   |   21 +-
 381 files changed, 11610 insertions(+), 4232 deletions(-)
 create mode 100644 tests/wpt/metadata/css/css-fonts/calc-in-font-variation-settings.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-013.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-048.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-118.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-154.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/line-break/line-break-normal-025.xht.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/line-break/line-break-strict-018a.xht.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/line-break/line-break-strict-018b.xht.ini
 create mode 100644 tests/wpt/metadata/css/css-text/line-breaking/line-breaking-012.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/word-break/word-break-normal-002.xht.ini
 create mode 100644 tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/submit-file.sub.html.ini
 create mode 100644 tests/wpt/metadata/websockets/Create-on-worker-shutdown.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
 create mode 100644 tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html
 create mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
 create mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.https.html
 delete mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
 rename tests/wpt/web-platform-tests/client-hints/{echo_device_memory_header_received.py => echo_client_hints_received.py} (56%)
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html
 delete mode 100644 tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html
 create mode 100644 tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.window.js
 create mode 100644 tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.window.js
 create mode 100644 tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.tenative.window.js
 create mode 100644 tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.tentative.window.js
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html
 rename tests/wpt/web-platform-tests/css/css-grid/{ => abspos}/support/grid.css (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-013.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-048.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-118.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-154.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-216.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-224.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-025.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018a.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018b.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-025-ref.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018a-ref.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018b-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-002-ref.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-002.xht
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html
 rename tests/wpt/web-platform-tests/css/{cssom => cssom-view}/GetBoundingRect.html (87%)
 create mode 100644 tests/wpt/web-platform-tests/css/support/blue32x32.ico
 create mode 100644 tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss
 create mode 100644 tests/wpt/web-platform-tests/domxpath/document.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/entries-api/README.md
 create mode 100644 tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/feature-policy/interfaces.any.js
 create mode 100644 tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js
 delete mode 100644 tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.idl
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html
 create mode 100644 tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/click.html
 create mode 100644 tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
 create mode 100644 tests/wpt/web-platform-tests/interfaces/feature-policy.idl
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
 create mode 100644 tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
 create mode 100644 tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html
 delete mode 100644 tests/wpt/web-platform-tests/resource-timing/resource_frame_initiator_type.html
 create mode 100644 tests/wpt/web-platform-tests/resource-timing/resources/empty.py
 create mode 100644 tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py
 create mode 100644 tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
 create mode 100644 tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/staticrange/OWNERS
 delete mode 100644 tests/wpt/web-platform-tests/staticrange/idlharness.html
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js
 rename tests/wpt/web-platform-tests/web-animations/interfaces/{AnimationEffectTiming => AnimationEffect}/getComputedTiming.html (99%)
 create mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/delay.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/direction.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/duration.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/easing.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/endDelay.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/fill.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/idlharness.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
 delete mode 100644 tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterations.html
 create mode 100644 tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js
 create mode 100644 tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js
 create mode 100644 tests/wpt/web-platform-tests/webmessaging/message-channels/worker.html
 create mode 100644 tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.html

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f35dc00fca7..2d3beb57b27 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -10429,12 +10429,6 @@
      {}
     ]
    ],
-   "css/css-text/word-break/word-break-normal-002.xht": [
-    [
-     "/css/css-text/word-break/word-break-normal-002.xht",
-     {}
-    ]
-   ],
    "css/css-transitions/transition-delay-000.html": [
     [
      "/css/css-transitions/transition-delay-000.html",
@@ -14881,6 +14875,12 @@
      {}
     ]
    ],
+   "payment-request/payment-request-show-method-manual.https.html": [
+    [
+     "/payment-request/payment-request-show-method-manual.https.html",
+     {}
+    ]
+   ],
    "payment-request/payment-response/complete-method-manual.https.html": [
     [
      "/payment-request/payment-response/complete-method-manual.https.html",
@@ -115811,6 +115811,30 @@
      {}
     ]
    ],
+   "css/css-grid/alignment/grid-gutters-011.html": [
+    [
+     "/css/css-grid/alignment/grid-gutters-011.html",
+     [
+      [
+       "/css/css-grid/reference/grid-different-gutters-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-grid/alignment/grid-gutters-012.html": [
+    [
+     "/css/css-grid/alignment/grid-gutters-012.html",
+     [
+      [
+       "/css/css-grid/reference/grid-different-gutters-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html": [
     [
      "/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html",
@@ -119723,6 +119747,18 @@
      {}
     ]
    ],
+   "css/css-multicol/float-and-block.html": [
+    [
+     "/css/css-multicol/float-and-block.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-multicol/multicol-basic-001.html": [
     [
      "/css/css-multicol/multicol-basic-001.html",
@@ -125571,6 +125607,66 @@
      {}
     ]
    ],
+   "css/css-scoping/shadow-fallback-dynamic-001.html": [
+    [
+     "/css/css-scoping/shadow-fallback-dynamic-001.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-scoping/shadow-fallback-dynamic-002.html": [
+    [
+     "/css/css-scoping/shadow-fallback-dynamic-002.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-scoping/shadow-fallback-dynamic-003.html": [
+    [
+     "/css/css-scoping/shadow-fallback-dynamic-003.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-scoping/shadow-fallback-dynamic-004.html": [
+    [
+     "/css/css-scoping/shadow-fallback-dynamic-004.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-scoping/shadow-fallback-dynamic-005.html": [
+    [
+     "/css/css-scoping/shadow-fallback-dynamic-005.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-scoping/slotted-with-pseudo-element.html": [
     [
      "/css/css-scoping/slotted-with-pseudo-element.html",
@@ -125583,6 +125679,18 @@
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html": [
+    [
+     "/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html": [
     [
      "/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html",
@@ -130599,18 +130707,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-013.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-013.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-014.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-014.html",
@@ -131019,18 +131115,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-048.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-048.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-049.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-049.html",
@@ -131451,18 +131535,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-118.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-118.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-119.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-119.html",
@@ -131883,18 +131955,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-154.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-154.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-155.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-155.html",
@@ -132291,18 +132351,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-216.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-216.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-217.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-217.html",
@@ -132387,18 +132435,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/css3-text-line-break-opclns-224.html": [
-    [
-     "/css/css-text/i18n/css3-text-line-break-opclns-224.html",
-     [
-      [
-       "/css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/i18n/css3-text-line-break-opclns-225.html": [
     [
      "/css/css-text/i18n/css3-text-line-break-opclns-225.html",
@@ -132531,18 +132567,6 @@
      {}
     ]
    ],
-   "css/css-text/line-break/line-break-normal-025.xht": [
-    [
-     "/css/css-text/line-break/line-break-normal-025.xht",
-     [
-      [
-       "/css/css-text/line-break/reference/line-break-normal-025-ref.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/line-break/line-break-strict-011.xht": [
     [
      "/css/css-text/line-break/line-break-strict-011.xht",
@@ -132651,30 +132675,6 @@
      {}
     ]
    ],
-   "css/css-text/line-break/line-break-strict-018a.xht": [
-    [
-     "/css/css-text/line-break/line-break-strict-018a.xht",
-     [
-      [
-       "/css/css-text/line-break/reference/line-break-strict-018a-ref.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-text/line-break/line-break-strict-018b.xht": [
-    [
-     "/css/css-text/line-break/line-break-strict-018b.xht",
-     [
-      [
-       "/css/css-text/line-break/reference/line-break-strict-018b-ref.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-text/line-breaking/line-breaking-001.html": [
     [
      "/css/css-text/line-breaking/line-breaking-001.html",
@@ -132807,6 +132807,18 @@
      {}
     ]
    ],
+   "css/css-text/line-breaking/line-breaking-012.html": [
+    [
+     "/css/css-text/line-breaking/line-breaking-012.html",
+     [
+      [
+       "/css/css-text/line-breaking/reference/line-breaking-012-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-text/line-breaking/line-breaking-ic-001.html": [
     [
      "/css/css-text/line-breaking/line-breaking-ic-001.html",
@@ -190340,12 +190352,17 @@
      {}
     ]
    ],
-   "client-hints/accept_ch.https.html.headers": [
+   "client-hints/accept_ch.http.html.headers": [
     [
      {}
     ]
    ],
-   "client-hints/echo_device_memory_header_received.py": [
+   "client-hints/accept_ch.sub.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "client-hints/echo_client_hints_received.py": [
     [
      {}
     ]
@@ -199710,11 +199727,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -200090,11 +200102,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -200455,11 +200462,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -201115,11 +201117,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html": [
     [
      {}
@@ -201585,11 +201582,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -201945,11 +201937,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -202315,11 +202302,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -203330,11 +203312,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -203690,11 +203667,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -204130,11 +204102,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -204480,11 +204447,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -204855,11 +204817,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -205195,11 +205152,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -205535,11 +205487,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -205915,11 +205862,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": [
     [
      {}
@@ -206255,11 +206197,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -207145,11 +207082,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -207525,11 +207457,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -208920,11 +208847,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -209300,11 +209222,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -209665,11 +209582,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -210140,11 +210052,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -210515,11 +210422,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -210845,11 +210747,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -211445,11 +211342,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html": [
     [
      {}
@@ -211810,11 +211702,6 @@
      {}
     ]
    ],
-   "conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html": [
-    [
-     {}
-    ]
-   ],
    "conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html": [
     [
      {}
@@ -247620,6 +247507,11 @@
      {}
     ]
    ],
+   "css/css-grid/abspos/support/grid.css": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid/alignment/support/100x100-green.png": [
     [
      {}
@@ -247640,6 +247532,11 @@
      {}
     ]
    ],
+   "css/css-grid/grid-definition/support/grid.css": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid/grid-definition/support/testing-utils.js": [
     [
      {}
@@ -247685,6 +247582,16 @@
      {}
     ]
    ],
+   "css/css-grid/grid-items/support/grid.css": [
+    [
+     {}
+    ]
+   ],
+   "css/css-grid/grid-model/support/grid.css": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid/reference/display-grid-ref.html": [
     [
      {}
@@ -247775,11 +247682,6 @@
      {}
     ]
    ],
-   "css/css-grid/support/grid.css": [
-    [
-     {}
-    ]
-   ],
    "css/css-grid/test-plan/index.html": [
     [
      {}
@@ -250880,6 +250782,11 @@
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html": [
     [
      {}
@@ -253250,11 +253157,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html": [
     [
      {}
@@ -253425,11 +253327,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html": [
     [
      {}
@@ -253605,11 +253502,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html": [
     [
      {}
@@ -253785,11 +253677,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html": [
     [
      {}
@@ -253955,11 +253842,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html": [
     [
      {}
@@ -253995,11 +253877,6 @@
      {}
     ]
    ],
-   "css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html": [
     [
      {}
@@ -254155,11 +254032,6 @@
      {}
     ]
    ],
-   "css/css-text/line-break/reference/line-break-normal-025-ref.xht": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/line-break/reference/line-break-strict-011-ref.xht": [
     [
      {}
@@ -254205,21 +254077,16 @@
      {}
     ]
    ],
-   "css/css-text/line-break/reference/line-break-strict-018a-ref.xht": [
-    [
-     {}
-    ]
-   ],
-   "css/css-text/line-break/reference/line-break-strict-018b-ref.xht": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/line-breaking/reference/line-breaking-001-ref.html": [
     [
      {}
     ]
    ],
+   "css/css-text/line-breaking/reference/line-breaking-012-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html": [
     [
      {}
@@ -255180,11 +255047,6 @@
      {}
     ]
    ],
-   "css/css-text/word-break/reference/word-break-normal-002-ref.xht": [
-    [
-     {}
-    ]
-   ],
    "css/css-text/word-break/reference/word-break-normal-ar-ref-000.html": [
     [
      {}
@@ -264230,6 +264092,11 @@
      {}
     ]
    ],
+   "css/support/blue32x32.ico": [
+    [
+     {}
+    ]
+   ],
    "css/support/c-red.css": [
     [
      {}
@@ -268965,6 +268832,11 @@
      {}
     ]
    ],
+   "docs/assets/gh-fork-ribbon.scss": [
+    [
+     {}
+    ]
+   ],
    "docs/assets/main.scss": [
     [
      {}
@@ -271020,6 +270892,11 @@
      {}
     ]
    ],
+   "entries-api/README.md": [
+    [
+     {}
+    ]
+   ],
    "entries-api/support.js": [
     [
      {}
@@ -271185,6 +271062,26 @@
      {}
     ]
    ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.sub.headers": [
     [
      {}
@@ -279840,11 +279737,6 @@
      {}
     ]
    ],
-   "html/infrastructure/common-dom-interfaces/collections/domstringlist.idl": [
-    [
-     {}
-    ]
-   ],
    "html/infrastructure/common-dom-interfaces/domstringmap/.gitkeep": [
     [
      {}
@@ -282395,6 +282287,11 @@
      {}
     ]
    ],
+   "html/semantics/forms/form-submission-0/resources/file-submission.py": [
+    [
+     {}
+    ]
+   ],
    "html/semantics/forms/introduction-1/.gitkeep": [
     [
      {}
@@ -285155,6 +285052,11 @@
      {}
     ]
    ],
+   "interfaces/css-font-loading.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/css-typed-om.idl": [
     [
      {}
@@ -285195,6 +285097,11 @@
      {}
     ]
    ],
+   "interfaces/feature-policy.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/fullscreen.idl": [
     [
      {}
@@ -286185,6 +286092,46 @@
      {}
     ]
    ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
+    [
+     {}
+    ]
+   ],
    "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
@@ -290110,11 +290057,21 @@
      {}
     ]
    ],
+   "resource-timing/resources/empty.py": [
+    [
+     {}
+    ]
+   ],
    "resource-timing/resources/empty_script.js": [
     [
      {}
     ]
    ],
+   "resource-timing/resources/eventsource.py": [
+    [
+     {}
+    ]
+   ],
    "resource-timing/resources/fake_responses.html": [
     [
      {}
@@ -292855,11 +292812,6 @@
      {}
     ]
    ],
-   "staticrange/OWNERS": [
-    [
-     {}
-    ]
-   ],
    "storage/OWNERS": [
     [
      {}
@@ -294430,6 +294382,16 @@
      {}
     ]
    ],
+   "web-animations/resources/timing-tests.js": [
+    [
+     {}
+    ]
+   ],
+   "web-animations/resources/timing-utils.js": [
+    [
+     {}
+    ]
+   ],
    "web-animations/resources/xhr-doc.py": [
     [
      {}
@@ -294620,6 +294582,11 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js": [
+    [
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js": [
     [
      {}
@@ -303258,6 +303225,12 @@
      {}
     ]
    ],
+   "FileAPI/FileReader/workers.html": [
+    [
+     "/FileAPI/FileReader/workers.html",
+     {}
+    ]
+   ],
    "FileAPI/FileReaderSync.worker.js": [
     [
      "/FileAPI/FileReaderSync.worker.html",
@@ -308064,9 +308037,15 @@
      {}
     ]
    ],
-   "client-hints/accept_ch.https.html": [
+   "client-hints/accept_ch.http.html": [
     [
-     "/client-hints/accept_ch.https.html",
+     "/client-hints/accept_ch.http.html",
+     {}
+    ]
+   ],
+   "client-hints/accept_ch.sub.https.html": [
+    [
+     "/client-hints/accept_ch.sub.https.html",
      {}
     ]
    ],
@@ -310492,6 +310471,30 @@
      {}
     ]
    ],
+   "cookie-store/cookieStore_event_arguments.tenative.window.js": [
+    [
+     "/cookie-store/cookieStore_event_arguments.tenative.window.html",
+     {}
+    ]
+   ],
+   "cookie-store/cookieStore_event_basic.tentative.window.js": [
+    [
+     "/cookie-store/cookieStore_event_basic.tentative.window.html",
+     {}
+    ]
+   ],
+   "cookie-store/cookieStore_event_delete.tenative.window.js": [
+    [
+     "/cookie-store/cookieStore_event_delete.tenative.window.html",
+     {}
+    ]
+   ],
+   "cookie-store/cookieStore_event_overwrite.tentative.window.js": [
+    [
+     "/cookie-store/cookieStore_event_overwrite.tentative.window.html",
+     {}
+    ]
+   ],
    "cookie-store/cookieStore_getAll_arguments.tentative.window.js": [
     [
      "/cookie-store/cookieStore_getAll_arguments.tentative.window.html",
@@ -311186,6 +311189,18 @@
      {}
     ]
    ],
+   "css/CSS2/normal-flow/unresolvable-max-height.html": [
+    [
+     "/css/CSS2/normal-flow/unresolvable-max-height.html",
+     {}
+    ]
+   ],
+   "css/CSS2/normal-flow/unresolvable-min-height.html": [
+    [
+     "/css/CSS2/normal-flow/unresolvable-min-height.html",
+     {}
+    ]
+   ],
    "css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html": [
     [
      "/css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html",
@@ -312306,6 +312321,18 @@
      {}
     ]
    ],
+   "css/css-font-loading/idlharness.https.html": [
+    [
+     "/css/css-font-loading/idlharness.https.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/calc-in-font-variation-settings.html": [
+    [
+     "/css/css-fonts/calc-in-font-variation-settings.html",
+     {}
+    ]
+   ],
    "css/css-fonts/font-display/font-display-failure-fallback.html": [
     [
      "/css/css-fonts/font-display/font-display-failure-fallback.html",
@@ -313494,6 +313521,54 @@
      {}
     ]
    ],
+   "css/css-grid/grid-items/grid-items-minimum-width-001.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-001.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-002.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-002.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html",
+     {}
+    ]
+   ],
+   "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html": [
+    [
+     "/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html",
+     {}
+    ]
+   ],
    "css/css-grid/grid-items/grid-minimum-size-grid-items-021.html": [
     [
      "/css/css-grid/grid-items/grid-minimum-size-grid-items-021.html",
@@ -314034,6 +314109,12 @@
      {}
     ]
    ],
+   "css/css-scroll-snap/snap-to-visible-areas.html": [
+    [
+     "/css/css-scroll-snap/snap-to-visible-areas.html",
+     {}
+    ]
+   ],
    "css/css-shapes/basic-shape-circle-ellipse-serialization.html": [
     [
      "/css/css-shapes/basic-shape-circle-ellipse-serialization.html",
@@ -316434,6 +316515,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html": [
+    [
+     "/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html": [
     [
      "/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html",
@@ -316938,6 +317025,18 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/break.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/break.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/caption-side.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/caption-side.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/caret-color.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/caret-color.html",
@@ -316980,12 +317079,60 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-basis.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-direction.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-flow.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-grow.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/the-stylepropertymap/properties/flex.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/flex.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/float.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/float.html",
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/font-size.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/font-size.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/font-style.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/font-style.html",
@@ -317004,6 +317151,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/isolation.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/isolation.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/left.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/left.html",
@@ -317100,6 +317253,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html",
@@ -317166,6 +317325,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/the-stylepropertymap/properties/vertical-align.html": [
     [
      "/css/css-typed-om/the-stylepropertymap/properties/vertical-align.html",
@@ -317190,6 +317355,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/the-stylepropertymap/properties/writing-mode.html": [
+    [
+     "/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html",
+     {}
+    ]
+   ],
    "css/css-ui/box-sizing-027.html": [
     [
      "/css/css-ui/box-sizing-027.html",
@@ -317934,6 +318105,12 @@
      {}
     ]
    ],
+   "css/cssom-view/GetBoundingRect.html": [
+    [
+     "/css/cssom-view/GetBoundingRect.html",
+     {}
+    ]
+   ],
    "css/cssom-view/HTMLBody-ScrollArea_quirksmode.html": [
     [
      "/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html",
@@ -318294,12 +318471,6 @@
      {}
     ]
    ],
-   "css/cssom/GetBoundingRect.html": [
-    [
-     "/css/cssom/GetBoundingRect.html",
-     {}
-    ]
-   ],
    "css/cssom/MediaList.html": [
     [
      "/css/cssom/MediaList.html",
@@ -321616,6 +321787,12 @@
      {}
     ]
    ],
+   "domxpath/document.tentative.html": [
+    [
+     "/domxpath/document.tentative.html",
+     {}
+    ]
+   ],
    "domxpath/evaluator-constructor.html": [
     [
      "/domxpath/evaluator-constructor.html",
@@ -323538,6 +323715,12 @@
      {}
     ]
    ],
+   "eventsource/dedicated-worker/eventsource-close2.htm": [
+    [
+     "/eventsource/dedicated-worker/eventsource-close2.htm",
+     {}
+    ]
+   ],
    "eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm": [
     [
      "/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm",
@@ -323950,6 +324133,30 @@
      {}
     ]
    ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html": [
+    [
+     "/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html",
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html": [
+    [
+     "/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html",
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html": [
+    [
+     "/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html",
+     {}
+    ]
+   ],
+   "feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html": [
+    [
+     "/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html",
+     {}
+    ]
+   ],
    "feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html": [
     [
      "/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html",
@@ -323992,6 +324199,16 @@
      {}
     ]
    ],
+   "feature-policy/interfaces.any.js": [
+    [
+     "/feature-policy/interfaces.any.html",
+     {}
+    ],
+    [
+     "/feature-policy/interfaces.any.worker.html",
+     {}
+    ]
+   ],
    "feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html": [
     [
      "/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html",
@@ -325398,6 +325615,12 @@
      {}
     ]
    ],
+   "geolocation-sensor/GeolocationSensor_read.https.html": [
+    [
+     "/geolocation-sensor/GeolocationSensor_read.https.html",
+     {}
+    ]
+   ],
    "geolocation-sensor/idlharness.https.html": [
     [
      "/geolocation-sensor/idlharness.https.html",
@@ -328216,6 +328439,12 @@
      {}
     ]
    ],
+   "html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js": [
+    [
+     "/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.html",
+     {}
+    ]
+   ],
    "html/dom/elements/elements-in-the-dom/historical.html": [
     [
      "/html/dom/elements/elements-in-the-dom/historical.html",
@@ -332542,6 +332771,12 @@
      }
     ]
    ],
+   "html/semantics/forms/form-submission-0/submit-file.sub.html": [
+    [
+     "/html/semantics/forms/form-submission-0/submit-file.sub.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/form-submission-0/url-encoded.html": [
     [
      "/html/semantics/forms/form-submission-0/url-encoded.html",
@@ -335840,6 +336075,12 @@
      {}
     ]
    ],
+   "html/syntax/parsing/html-integration-point.html": [
+    [
+     "/html/syntax/parsing/html-integration-point.html",
+     {}
+    ]
+   ],
    "html/syntax/parsing/html5lib_adoption01.html": [
     [
      "/html/syntax/parsing/html5lib_adoption01.html?run_type=uri",
@@ -337834,6 +338075,14 @@
      {}
     ]
    ],
+   "infrastructure/testdriver/click.html": [
+    [
+     "/infrastructure/testdriver/click.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "innerText/getter.html": [
     [
      "/innerText/getter.html",
@@ -339120,6 +339369,120 @@
      {}
     ]
    ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+    [
+     "/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+    [
+     "/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
+     {}
+    ]
+   ],
+   "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+    [
+     "/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
+     {}
+    ]
+   ],
    "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
      "/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
@@ -358702,12 +359065,6 @@
      {}
     ]
    ],
-   "resource-timing/resource_frame_initiator_type.html": [
-    [
-     "/resource-timing/resource_frame_initiator_type.html",
-     {}
-    ]
-   ],
    "resource-timing/resource_ignore_data_url.html": [
     [
      "/resource-timing/resource_ignore_data_url.html",
@@ -361042,12 +361399,6 @@
      {}
     ]
    ],
-   "staticrange/idlharness.html": [
-    [
-     "/staticrange/idlharness.html",
-     {}
-    ]
-   ],
    "storage/estimate-indexeddb-worker.https.html": [
     [
      "/storage/estimate-indexeddb-worker.https.html",
@@ -363676,63 +364027,15 @@
      {}
     ]
    ],
-   "web-animations/interfaces/AnimationEffectTiming/delay.html": [
+   "web-animations/interfaces/AnimationEffect/getComputedTiming.html": [
     [
-     "/web-animations/interfaces/AnimationEffectTiming/delay.html",
+     "/web-animations/interfaces/AnimationEffect/getComputedTiming.html",
      {}
     ]
    ],
-   "web-animations/interfaces/AnimationEffectTiming/direction.html": [
+   "web-animations/interfaces/AnimationEffect/updateTiming.html": [
     [
-     "/web-animations/interfaces/AnimationEffectTiming/direction.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/duration.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/duration.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/easing.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/easing.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/endDelay.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/endDelay.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/fill.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/fill.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/idlharness.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/idlharness.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/iterationStart.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/iterationStart.html",
-     {}
-    ]
-   ],
-   "web-animations/interfaces/AnimationEffectTiming/iterations.html": [
-    [
-     "/web-animations/interfaces/AnimationEffectTiming/iterations.html",
+     "/web-animations/interfaces/AnimationEffect/updateTiming.html",
      {}
     ]
    ],
@@ -364162,6 +364465,12 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html": [
+    [
+     "/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html": [
     [
      "/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html",
@@ -364846,6 +365155,12 @@
      {}
     ]
    ],
+   "webmessaging/message-channels/worker.html": [
+    [
+     "/webmessaging/message-channels/worker.html",
+     {}
+    ]
+   ],
    "webmessaging/messageerror.html": [
     [
      "/webmessaging/messageerror.html",
@@ -365844,6 +366159,12 @@
      {}
     ]
    ],
+   "websockets/Create-on-worker-shutdown.html": [
+    [
+     "/websockets/Create-on-worker-shutdown.html",
+     {}
+    ]
+   ],
    "websockets/Create-protocol-with-space.htm": [
     [
      "/websockets/Create-protocol-with-space.htm",
@@ -390664,11 +390985,11 @@
    "support"
   ],
   "./config.default.json": [
-   "73b96319b21810d51a230d475b5d5fe4e1181a69",
+   "939f06a73458155a62c9d81f198ac0194ad26234",
    "support"
   ],
   "./lint.whitelist": [
-   "82fc9107178a6f9aef6c978ad51afe2370c92de1",
+   "b35324fd499dcb7ba0a9deedc794bb13ee62e175",
    "support"
   ],
   "./serve.py": [
@@ -394815,6 +395136,10 @@
    "d352d5c6b5d1f2ada419d51bcfd9ecd9100bf892",
    "manual"
   ],
+  "FileAPI/FileReader/workers.html": [
+   "d7894a0abb064411d4811d8cfb9c3ce65f99babd",
+   "testharness"
+  ],
   "FileAPI/FileReaderSync.worker.js": [
    "19741fbd0498bf9135408ceb6128221cbeb4e2f3",
    "testharness"
@@ -395088,7 +395413,7 @@
    "support"
   ],
   "IndexedDB/README.md": [
-   "fb36fa93165978667176adeba74f97a90e871ff2",
+   "794f80755fc065930cb311d82f84bdaadceea423",
    "support"
   ],
   "IndexedDB/abort-in-initial-upgradeneeded.html": [
@@ -400916,7 +401241,7 @@
    "testharness"
   ],
   "bluetooth/resources/bluetooth-helpers.js": [
-   "1944dc57df774ad737179dd22fb3cc9de842bc21",
+   "9d2b233c511627f6a4fe93bdaf16ba28c4a6ead9",
    "support"
   ],
   "bluetooth/resources/health-thermometer-iframe.html": [
@@ -401403,16 +401728,24 @@
    "10f5f9d409ef513edb129e0e8522aa5f74d51ce8",
    "support"
   ],
-  "client-hints/accept_ch.https.html": [
-   "b54ae9b17399e0fe4472fedbf1badd67d28e68f3",
+  "client-hints/accept_ch.http.html": [
+   "e2181077e6d378a288d4944aee8c76939aa896fe",
    "testharness"
   ],
-  "client-hints/accept_ch.https.html.headers": [
-   "bf59baf9a030d117964df414efc11ddb07e7a7fa",
+  "client-hints/accept_ch.http.html.headers": [
+   "25cd8622db940411b0e8eb39921e6086916e4f36",
    "support"
   ],
-  "client-hints/echo_device_memory_header_received.py": [
-   "defa16c455bebc2589c058d0d888326d667e317a",
+  "client-hints/accept_ch.sub.https.html": [
+   "4e3f60751fbbc8f58bbf6fb7eadd1f334c9789ad",
+   "testharness"
+  ],
+  "client-hints/accept_ch.sub.https.html.headers": [
+   "25cd8622db940411b0e8eb39921e6086916e4f36",
+   "support"
+  ],
+  "client-hints/echo_client_hints_received.py": [
+   "3d3b57376cbacbd2118fe4fe07abad5bd9ad95fd",
    "support"
   ],
   "clipboard-apis/OWNERS": [
@@ -401740,7 +402073,7 @@
    "reftest"
   ],
   "conformance-checkers/Makefile": [
-   "bf1ac606bd1b1d4bfa8eca28a04c0d0f3c3fb374",
+   "7b6e2ee9ec808bd43d03b9f0a8054f3ac21bc583",
    "support"
   ],
   "conformance-checkers/OWNERS": [
@@ -409007,10 +409340,6 @@
    "a2963489b57d411e3a297dce5f3176288bef06c2",
    "support"
   ],
-  "conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": [
-   "c87cc7f94192dac5bdb293e786dda21ab7670211",
-   "support"
-  ],
   "conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html": [
    "7f8a3a727c8a39a69999abccf4439a48fcef9ddf",
    "support"
@@ -409311,10 +409640,6 @@
    "9d7d9c3a256a060e1f3ad9697b99dabaf5a5ef11",
    "support"
   ],
-  "conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": [
-   "b9a58f9796a69bd1ab373ce51fac310581ef92a8",
-   "support"
-  ],
   "conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html": [
    "87f0fd69b35a61b401430d4ab2a476eb8001e95d",
    "support"
@@ -409603,10 +409928,6 @@
    "835aa1cd0874aad929cd10f4864ae9f4bc41c41e",
    "support"
   ],
-  "conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "f761d7545a155e8c20921b8f937d1d9c6f80b944",
-   "support"
-  ],
   "conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html": [
    "53c39d1e68e7f8b879b2ce8e71c4a7846ba0581a",
    "support"
@@ -410131,10 +410452,6 @@
    "ca4a49eb486e35fe308a178a685cb10f56f10215",
    "support"
   ],
-  "conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": [
-   "4d3cc617092ee37b57cd3c946a915fcc0215b675",
-   "support"
-  ],
   "conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html": [
    "ebe5c0c797e4885a1692bdd9d137d7985912358c",
    "support"
@@ -410507,10 +410824,6 @@
    "58c526075ccedfe2d8742e05381adbf4c9e7b6b3",
    "support"
   ],
-  "conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-   "4683c04027bb7589dbc30768a6cabca3ec7caa1b",
-   "support"
-  ],
   "conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": [
    "209fdc83ff0641a4e8aa0b487ba66f80fe15a82c",
    "support"
@@ -410795,10 +411108,6 @@
    "3baf86a15eb7ec00fdf0d3ad854548ee0ed5c9c1",
    "support"
   ],
-  "conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-   "f270c23de82d826adb21f5b41e4ce1d7febfb36a",
-   "support"
-  ],
   "conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html": [
    "8716f9879d555aa1e2ad0451884d590d3ecc6a6e",
    "support"
@@ -411091,10 +411400,6 @@
    "4cb9b05260ec2edc707fbba9dc6772485384bc9d",
    "support"
   ],
-  "conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-   "7acb90736a95397641fe096cc573492dc2d28c55",
-   "support"
-  ],
   "conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html": [
    "d2c8653bebb76c5e6e397aa0ec784848bef5236b",
    "support"
@@ -411903,10 +412208,6 @@
    "c3eea4347d2d2a4f369ec7995fab75ca40e5d756",
    "support"
   ],
-  "conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "8d8874cd4f5403f23ad664fa312d8833fd7d2c1a",
-   "support"
-  ],
   "conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html": [
    "24d3fe99fa511f0bab3dfbf8241cb43cc9596df2",
    "support"
@@ -412191,10 +412492,6 @@
    "4d009d273b624d6f8d8f84c9fe08212c7fabed32",
    "support"
   ],
-  "conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": [
-   "de57ad06c88bbe92dd0e0c5b73f69e74005ed6cd",
-   "support"
-  ],
   "conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html": [
    "ba378c03b1e9bf7656f6240794344b8af3880644",
    "support"
@@ -412543,10 +412840,6 @@
    "048b16b426b57dc073d6e817fef48644f866bac6",
    "support"
   ],
-  "conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "453195be13968e1c453584082629fe47a552653b",
-   "support"
-  ],
   "conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html": [
    "988d5b2eb69b99e6c8cd19795cfcb981a691d615",
    "support"
@@ -412823,10 +413116,6 @@
    "7e75b47d4ed363c6151bc252a52728635800c71b",
    "support"
   ],
-  "conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "fbe1c6587f12681950476788d82ebaef146e6ba3",
-   "support"
-  ],
   "conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html": [
    "f37ba8bc9ed67e02aa235df4adcc3387f5dc3a27",
    "support"
@@ -413123,10 +413412,6 @@
    "96a34e382d5c0bafd923e70b8a22798ef141219c",
    "support"
   ],
-  "conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-   "9849da633ac7420e6dc75445017365c15a95c1f0",
-   "support"
-  ],
   "conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": [
    "61da5770aca2619a89f345bf07845f22d7ca441f",
    "support"
@@ -413395,10 +413680,6 @@
    "90c89887f4cf6214c1685a3d89d0405e0f2cf1d3",
    "support"
   ],
-  "conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "cc0da975515645e662203e8570143235e2ee964b",
-   "support"
-  ],
   "conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": [
    "92ead4e2773635bf02b30ca7b6527298a7da5450",
    "support"
@@ -413667,10 +413948,6 @@
    "b97b06db654cd0048cd3bca78fb3d543b7dc46c8",
    "support"
   ],
-  "conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": [
-   "4d396fd2ada0a3fd94d0da270262c72a27a495f7",
-   "support"
-  ],
   "conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": [
    "5c3b36c97cc3f6e14b303b4af9fd3b2c1f41f937",
    "support"
@@ -413971,10 +414248,6 @@
    "627ace37c30d5ce0261fa3925362b3ec356b6701",
    "support"
   ],
-  "conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": [
-   "9d1a09cb48b68257ab565dda544374feddacc44a",
-   "support"
-  ],
   "conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": [
    "a205b8b90a5c6aade8a94e5f9cd7bfefc3c238cd",
    "support"
@@ -414243,10 +414516,6 @@
    "1af0523c38bd8c2924beaf8a855bee797ffc6c99",
    "support"
   ],
-  "conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-   "c7b990aebe7e0a340900065a74e2d2748309870f",
-   "support"
-  ],
   "conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html": [
    "cd1a396812e899c053b9a40ac7cea9046bfc9285",
    "support"
@@ -414955,10 +415224,6 @@
    "93a9d1e31fbacf3d0db10a6e247cbd18972a444e",
    "support"
   ],
-  "conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": [
-   "acee5c4161f13b51f0c62ec0c6154c19580e364a",
-   "support"
-  ],
   "conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html": [
    "3b09fdd690693db2a2e2cf2486f7ff8962d8dd10",
    "support"
@@ -415259,10 +415524,6 @@
    "3672a10a251c54dcffa08f33c6346b8144a603ce",
    "support"
   ],
-  "conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": [
-   "aa8af8d16eef341597be000fc3c88255e88347c5",
-   "support"
-  ],
   "conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html": [
    "59707c995c0acda1b03d7770db6d430e398bc9fc",
    "support"
@@ -416375,10 +416636,6 @@
    "ca9a67f72f95fc3df95a5e4daa7c9b56c1195961",
    "support"
   ],
-  "conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": [
-   "1385fc623e6ecd83265c89ae234a622d3a78bb0f",
-   "support"
-  ],
   "conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html": [
    "d642f69189547e6c583a85401c73cf7fac8c1f37",
    "support"
@@ -416679,10 +416936,6 @@
    "5420be717fcf3b698a31b61ee572cbb5c5626959",
    "support"
   ],
-  "conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "216bde5c8c3e31e123f36cf3d562e01a5ee25c2e",
-   "support"
-  ],
   "conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html": [
    "501df179f07045489391ffa97dc26a0afc67f121",
    "support"
@@ -416971,10 +417224,6 @@
    "ab50203cbb60e427d03349092d5676a37d3f9967",
    "support"
   ],
-  "conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "dbc19620a8adc82a31ac1540fb5fc3ebc289253c",
-   "support"
-  ],
   "conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html": [
    "988c1a4b6e0ca0e709476ee418e7a5163ec7b58f",
    "support"
@@ -417351,10 +417600,6 @@
    "9799b8bd9f02ac6607767bd1f4919cb145a5ca09",
    "support"
   ],
-  "conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "1f3dbaa12e18e41072df534ef0a43af1e948a097",
-   "support"
-  ],
   "conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html": [
    "bfbca1de6ea75e1fbb8a0d324f4725ddadad0834",
    "support"
@@ -417651,10 +417896,6 @@
    "ebbf02085d434ec93298875a02ec07df686c8f1a",
    "support"
   ],
-  "conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": [
-   "d150e2f20153cb91e20f18c0731fdedcf7c44549",
-   "support"
-  ],
   "conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html": [
    "445fb8294bc82e58ef3f74bb0b199903eb53ad99",
    "support"
@@ -417915,10 +418156,6 @@
    "c347b1ea86c63f06ec5c0ffa182995e342d9ff56",
    "support"
   ],
-  "conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": [
-   "a4acc813af290b89a5ea8fcba50ab2ad7ab93583",
-   "support"
-  ],
   "conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html": [
    "c03e307794a2f9c1748a26ba44c32ca7a3bb5e51",
    "support"
@@ -418395,10 +418632,6 @@
    "8270105a32ee5f4856fd8887bf5edd17fc1934d4",
    "support"
   ],
-  "conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": [
-   "05744d8949afa1d0017fe81279ebbc8201b86323",
-   "support"
-  ],
   "conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html": [
    "3f53bb96ae1ad88296c7523edc6d2454b65750d3",
    "support"
@@ -418687,10 +418920,6 @@
    "5ff91cfc94ba9ea2d4754193ae5d8a9d9bf26212",
    "support"
   ],
-  "conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html": [
-   "3ae8f056d8167d4e5d3a10864a22155fcbeb5184",
-   "support"
-  ],
   "conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html": [
    "9251707c34f0cc6fafc2c01cc21426f58cd537ff",
    "support"
@@ -418920,7 +419149,7 @@
    "support"
   ],
   "conformance-checkers/messages.json": [
-   "39450ae5f07277b008e39e04b162736ec5baa2d1",
+   "ba6a1cf2867273360e8c9b7bb70da15bca4e15a7",
    "support"
   ],
   "conformance-checkers/tools/build-svg-tests.py": [
@@ -418940,7 +419169,7 @@
    "support"
   ],
   "conformance-checkers/tools/url.py": [
-   "550d8d52d0f6986cb6692c67cfcb951f438d672b",
+   "ee47cdb8f49f00b4bb9d27c85749b4e3e48271a1",
    "support"
   ],
   "conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml": [
@@ -421783,6 +422012,22 @@
    "f33ce9a975c759ce6da8a5caa371ca026dd537c4",
    "testharness"
   ],
+  "cookie-store/cookieStore_event_arguments.tenative.window.js": [
+   "a61074b6062928c29a83e0f7d456fdce9e3a3d47",
+   "testharness"
+  ],
+  "cookie-store/cookieStore_event_basic.tentative.window.js": [
+   "33faf57882e558a54d6cbf181141e03f1b3cd871",
+   "testharness"
+  ],
+  "cookie-store/cookieStore_event_delete.tenative.window.js": [
+   "3fa86e521919eac1f89ff00f449f8c01500e170e",
+   "testharness"
+  ],
+  "cookie-store/cookieStore_event_overwrite.tentative.window.js": [
+   "f7f3989aaaa0003693c043c582f0c78ecd1bbad0",
+   "testharness"
+  ],
   "cookie-store/cookieStore_getAll_arguments.tentative.window.js": [
    "cf818fe92c16dfe42f0ac778f665094533d8ab10",
    "testharness"
@@ -421916,11 +422161,11 @@
    "testharness"
   ],
   "cookie-store/idlharness.tentative.html": [
-   "551813353483102be5004ac6ddc325ced659f9eb",
+   "24a4e59e8d3c0a481c4b448bd3fb677f30d0208f",
    "testharness"
   ],
   "cookie-store/idlharness_serviceworker.js": [
-   "b274b66237c0d83e9b8e770f6cf13fedd9a39b8f",
+   "aceb00f593b0447853fa70c8c971902cf02a164b",
    "support"
   ],
   "cookie-store/idlharness_serviceworker.tentative.https.html": [
@@ -456139,6 +456384,14 @@
    "62aae8605308e22c641111007fdc8709507d021d",
    "reftest"
   ],
+  "css/CSS2/normal-flow/unresolvable-max-height.html": [
+   "66e736acb2edc0bd737807abf4e2ea3e9a16965d",
+   "testharness"
+  ],
+  "css/CSS2/normal-flow/unresolvable-min-height.html": [
+   "02d5f978e4688af271ced6c90956bfc3cc995967",
+   "testharness"
+  ],
   "css/CSS2/normal-flow/width-001.xht": [
    "c43946e15b0dd2a0635f86f7227b112d878f6c17",
    "reftest"
@@ -481988,7 +482241,7 @@
    "testharness"
   ],
   "css/css-align/gaps/column-gap-parsing-001.html": [
-   "d0b1255896cde1a3b3f2539c8533fdf65dd77f94",
+   "7dfb3da10a936539b53bd7692e8514cfe2142a88",
    "testharness"
   ],
   "css/css-align/gaps/gap-animation-001.html": [
@@ -482008,19 +482261,19 @@
    "testharness"
   ],
   "css/css-align/gaps/gap-parsing-001.html": [
-   "bd3a5bb6b7e4605e6f1a44f232d34c5e7d6342af",
+   "7eb55e0a8b04384aebfbb5a47922c5b33f93270c",
    "testharness"
   ],
   "css/css-align/gaps/grid-column-gap-parsing-001.html": [
-   "13ce1945b50ed1c4d40f837cac8777b6b8a90066",
+   "6faca8cad74d38f301d9e3c210ae577d6d7355b5",
    "testharness"
   ],
   "css/css-align/gaps/grid-gap-parsing-001.html": [
-   "441feb52cc17178d4486f92d10a1c132600788a3",
+   "0bc6b1cdca28b009b52b5e8b11bf97b44d7df71e",
    "testharness"
   ],
   "css/css-align/gaps/grid-row-gap-parsing-001.html": [
-   "7302a4efd2ea5eccf65ec269175e6c15cc1771b4",
+   "07f8d219fb1457a1a035587f4f0bda7278a913a8",
    "testharness"
   ],
   "css/css-align/gaps/row-gap-animation-001.html": [
@@ -482036,7 +482289,7 @@
    "testharness"
   ],
   "css/css-align/gaps/row-gap-parsing-001.html": [
-   "46a9930dd28a133d1df2c9209b35716093457d5c",
+   "d8cecf4e1b558cb45fee82804a6407b0204b889f",
    "testharness"
   ],
   "css/css-align/reference/ttwf-reftest-alignContent-ref.html": [
@@ -491863,6 +492116,10 @@
    "ad355c3d5220c1b938182241a8e8abe030ace699",
    "testharness"
   ],
+  "css/css-font-loading/idlharness.https.html": [
+   "00399ffcb0ff8000e79ab4aeefdb90cabdb0fd4d",
+   "testharness"
+  ],
   "css/css-fonts/OWNERS": [
    "4c9aabb4fac2a558b0828b50e2b06e01e43dd4b4",
    "support"
@@ -491879,6 +492136,10 @@
    "9232ad7768f5bea41d87469113b210b3c663750e",
    "reftest"
   ],
+  "css/css-fonts/calc-in-font-variation-settings.html": [
+   "ebd68854330dd96a6cfa31c273d9b6810442497d",
+   "testharness"
+  ],
   "css/css-fonts/first-available-font-001-ref.html": [
    "7f6bdc4dcb91cdf976631216a72ec0557234a6c2",
    "support"
@@ -499196,11 +499457,11 @@
    "testharness"
   ],
   "css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html": [
-   "f35bf44f588c631cf85021df55d34b5726ceff03",
+   "308d1e747e91bd4d3cbeab33f53e549d380fa716",
    "testharness"
   ],
   "css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html": [
-   "4f65457310c6f1127c10821159a37b89caf26abd",
+   "8623dfe31fc392230376d52382baff1e527d84eb",
    "testharness"
   ],
   "css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html": [
@@ -499212,15 +499473,15 @@
    "support"
   ],
   "css/css-grid/abspos/grid-paint-positioned-children-001.html": [
-   "1093709bd8e0cbbbbdc02032e1e4771cd9ab53e3",
+   "c79700e65dccba02c03ef54c6b1ab65b9f8bc19d",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html": [
-   "8baf87330e4005ddb664f5fc71c972e4e1c00f40",
+   "27b26b1a72d83b1b870b11194ce42f6a329b885c",
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-children-writing-modes-001.html": [
-   "45d1fbeb11504621afa26f82ff0819d4c8659962",
+   "2d123622147a051ee3a3727ea3d029b2922973b1",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html": [
@@ -499228,31 +499489,31 @@
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html": [
-   "b15d1db43efd2b8f15aab17dbbcf3afc262baa76",
+   "4f909aa983223a1a8b103b6e3adc014513dbb6eb",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html": [
-   "6efd2dfea5027aca510f7a92e8cec16b3fddef2d",
+   "9c66af91c308c50dfdb9d811357b2241a5665412",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html": [
-   "d485183a7ea0bfcf92503a3e420ae68470593995",
+   "c3ba40cd174cb2a2588898e6643ca2a489a27c25",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html": [
-   "aacc2daef0aae211a8ffa433ff6684d037afd4c8",
+   "60cd2f1b1a78e0be1d08ed04433e8db765dd1f90",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html": [
-   "fc2cfee0c523129d8cb0bbee1685786a72031e84",
+   "2ba2d79cbee6c6e388c98245ccd96da9a4f186e5",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html": [
-   "7408735464c2da7fa7916ee5a739518866e5b7a2",
+   "d78e6df343046ae4361fddac1a5c38a1d18de5a1",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html": [
-   "4c50565bb7adf5074f57da937954c3e95ee00d7a",
+   "5f21384b56ed7e51c55896249e6a8dc69c8c15f5",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-001-ref.html": [
@@ -499260,7 +499521,7 @@
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-001.html": [
-   "1776e1042cf1712a86906e6e8b56faf9d80bb143",
+   "f4b76880ffd08a2879354d63862533532e0acb68",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html": [
@@ -499268,47 +499529,47 @@
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-rtl-001.html": [
-   "581116474bdd4214f803dd7c6375104308c245e8",
+   "90fdc98fa243436d0dd1c83fcacfbbafe756f69f",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-content-alignment-001.html": [
-   "d9f5abb41f8fb479c37f0d364b9cd73cb9008829",
+   "53bba04085d038dfb81d1f9323915a24e1bf477e",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html": [
-   "81cd5622a02ae3bdccd609d6e409241b9ba92117",
+   "fcce72ee35dd8d3fb7ee6be0b6f44bf025abf5a1",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-001.html": [
-   "29cc4d5bb2a27e59907b6f2e1c32fe260cd3f4c8",
+   "59ad78731845efdee151a7db5f963484505e9b49",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html": [
-   "662bd6d9451786ba0da556c3049e7747f2d9d3e7",
+   "618bf5f6b8ca90359e9df147f201ad4ba5d84e8e",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html": [
-   "dfeb40d25bf666ce73fda44e3cc5ad152cc55116",
+   "2666a4caa94fb56a17cc197f67a8572185b01514",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html": [
-   "4e687882f7721dae22c1a65789fe1cfbfcfa86e2",
+   "1b1dee594c037e5ee8966331e8fc2d60b4e847d9",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-padding-001.html": [
-   "9f1dfe2b066d9df4bbce276a16849de8779d8b6e",
+   "6cfe2450ba28b501f1421c04c274976f63ee3494",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html": [
-   "92fa645b99f912e38c55d7a8f6a8c7983e0960d8",
+   "4ad027f1a382a9414ce0d34826aa877d9915d458",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html": [
-   "1a198448681696a8fed8c8240af0d069b34a50ad",
+   "cc16a7b4ffc4da30a2dc47b4bb627c40b611d425",
    "testharness"
   ],
   "css/css-grid/abspos/grid-sizing-positioned-items-001.html": [
-   "a626f8ac567d7577d7f0a8b27c7104fda7bb7d86",
+   "80f385933b5380bb0e476db4f089b6064195c535",
    "testharness"
   ],
   "css/css-grid/abspos/orthogonal-positioned-grid-items-001-ref.html": [
@@ -499552,21 +499813,25 @@
    "reftest"
   ],
   "css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html": [
-   "7f5640648062fe8b02e98b67d48c1af1914cdab7",
+   "6fc9fc8a452476ae5234e67d87b06aee99b32194",
    "testharness"
   ],
   "css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html": [
-   "8f048f2cfc368d45263fac24ab8e64ef6db0a163",
+   "02ea3621a3e3189181de74c7e1393db58d499181",
    "testharness"
   ],
   "css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html": [
-   "de3401d0edd3dbb428066d5fa85f5235d083aa18",
+   "5b07f605970df1d5de7e3e44e4cac3d8c7450198",
    "support"
   ],
   "css/css-grid/abspos/positioned-grid-items-sizing-001.html": [
-   "053c2ad3fe2edfd36dc8743c01cf098af91c026c",
+   "831ab1249db84ddc90344f2c9fa38bbf8b5dd403",
    "reftest"
   ],
+  "css/css-grid/abspos/support/grid.css": [
+   "6bb300b8baebf700481ea162fb7b41913fcca29c",
+   "support"
+  ],
   "css/css-grid/alignment/grid-alignment-implies-size-change-001.html": [
    "6a98b19084f09099a83cd1e150dcc99e58967596",
    "testharness"
@@ -500027,6 +500292,14 @@
    "5ed8d7a44153cd4833f893fe53849a1e63d1a583",
    "reftest"
   ],
+  "css/css-grid/alignment/grid-gutters-011.html": [
+   "30bb574c966324ac5377ef8f9250df4f959b9b9f",
+   "reftest"
+  ],
+  "css/css-grid/alignment/grid-gutters-012.html": [
+   "a29614ba012488fbcd5cb53694ec483f8548077d",
+   "reftest"
+  ],
   "css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html": [
    "2c431631005167b724c5dcdbe0405c583d82eef6",
    "testharness"
@@ -500472,7 +500745,7 @@
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-change-fit-content-argument-001.html": [
-   "409d4b815307264b17581975f0f121f40946d932",
+   "d00e8651be933262d7f64d22f6e8ce68d23d44eb",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html": [
@@ -500536,11 +500809,11 @@
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html": [
-   "5f2f68b7cf046593760e6668a3d7fca58bae263e",
+   "f97320fd878e74ef93435ceeaf8117acde1c0e00",
    "support"
   ],
   "css/css-grid/grid-definition/grid-template-columns-fit-content-001.html": [
-   "adffbd4b734ae719675cb5bee7fd6bc3fbde5d5b",
+   "f0b39f517dbf4ceb7649c99863ca3cbb44549446",
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html": [
@@ -500548,13 +500821,17 @@
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html": [
-   "0599be38ec7525b925d2c42dad8f6c09efff1612",
+   "fe5c6aad4b42792b63e609c9f17a1d26918e68cc",
    "support"
   ],
   "css/css-grid/grid-definition/grid-template-rows-fit-content-001.html": [
-   "a6ea0c0330b667d86c54933875e5cfda9d3f2162",
+   "57659c467b0abc12fc953edd6e96a07d2f15786e",
    "reftest"
   ],
+  "css/css-grid/grid-definition/support/grid.css": [
+   "6bb300b8baebf700481ea162fb7b41913fcca29c",
+   "support"
+  ],
   "css/css-grid/grid-definition/support/testing-utils.js": [
    "7d6dc5106777942ad83e6bc570368af113f32d5f",
    "support"
@@ -500703,6 +500980,38 @@
    "d36bce8f5be4f39442a884386ea08062c873b73d",
    "reftest"
   ],
+  "css/css-grid/grid-items/grid-items-minimum-width-001.html": [
+   "8eb22226f25e529fdfa1e904760dc9d9572cb8c5",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-002.html": [
+   "46d62c774bdfa47a0aa11692a5b42ba032d3c35a",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html": [
+   "012848f739cb0ac5aaf53de9f6137d87e52dac57",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html": [
+   "e366eed5aa25cdcc88510dc70b55cfe1ebd410d4",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html": [
+   "ad2a7bfe6c02682b9d8907234df2f28c7c6e825d",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html": [
+   "5ef51897c6b890ac9508917bfcb5187406e0420b",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html": [
+   "0295b15da5707dcd4b44cd95c66edbd19c08c1b8",
+   "testharness"
+  ],
+  "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html": [
+   "3d9ee014d1341bae70de86de585658f7432f76ef",
+   "testharness"
+  ],
   "css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html": [
    "33080559b7f451958ea4785075bf6c8e4d8902eb",
    "support"
@@ -500808,19 +501117,19 @@
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-022.html": [
-   "7a5be2e6b0adbbf048efb0cb19c35be913729ba8",
+   "2baacdd3bf98a6084105e70168dbe276579b226f",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-023.html": [
-   "cc51bc269d23ae345c91f91368b5a57d99a4606e",
+   "30f45639bea629c3db5a616a408eb6a0e5eb5f81",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-024.html": [
-   "5eb13653b1d9fe889cd6bb8423e47eed207ac69d",
+   "36c73749ac60f7589928e9b96a2722946de3e63c",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-025.html": [
-   "15a29d967b7e543edeebd6bb37a597741b79bf50",
+   "4b0da168ad2dc39fb9e057d39e566bd4dadc9553",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-order-property-auto-placement-001.html": [
@@ -500935,6 +501244,10 @@
    "928556fc1f503c821581032a2288a08f8aa07021",
    "support"
   ],
+  "css/css-grid/grid-items/support/grid.css": [
+   "6bb300b8baebf700481ea162fb7b41913fcca29c",
+   "support"
+  ],
   "css/css-grid/grid-layout-properties.html": [
    "d30ee96245cf3d25bffc64347a4ee60bfb2b2049",
    "testharness"
@@ -500956,11 +501269,11 @@
    "testharness"
   ],
   "css/css-grid/grid-model/grid-container-ignores-first-letter-001.html": [
-   "e46492228ce6fdf83d9661c06db745e9c6689bb4",
+   "157c7945bc8f6e020f3e123789489269f318d91e",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-container-ignores-first-line-001.html": [
-   "8e8895681b8f7e8f5d416faedf5b081f7fc42243",
+   "aec98e4e7bf245637903a1f06d2e5d5519b8da66",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-display-grid-001.html": [
@@ -501048,11 +501361,11 @@
    "reftest"
   ],
   "css/css-grid/grid-model/grid-item-accepts-first-letter-001.html": [
-   "bc3aa0022584b2dc6253aeb1bbca50b6b7c05f54",
+   "0ab0d1b9446d4ccaeba6778bdc65ef7d4adbd6a1",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-item-accepts-first-line-001.html": [
-   "0af2d39207188e1398e69f1e2d81848ba1bee2ee",
+   "9025d7543cfff53833f783d19b3f56333ac5fef3",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-margins-no-collapse-001.html": [
@@ -501071,6 +501384,10 @@
    "adfa657da1bb65a313894a8b5010a62d7c629c34",
    "reftest"
   ],
+  "css/css-grid/grid-model/support/grid.css": [
+   "6bb300b8baebf700481ea162fb7b41913fcca29c",
+   "support"
+  ],
   "css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html": [
    "85a397623ccb6b2ced1450af19f0eaf3a2f6df22",
    "reftest"
@@ -501187,10 +501504,6 @@
    "feb53485e24aeaf9a5f27be5e42cc4a6fc5b8df0",
    "support"
   ],
-  "css/css-grid/support/grid.css": [
-   "6bb300b8baebf700481ea162fb7b41913fcca29c",
-   "support"
-  ],
   "css/css-grid/test-plan/index.html": [
    "e633dc7584fbc7bfe99177aa5dd9fbd107a2d3f5",
    "support"
@@ -502555,6 +502868,10 @@
    "43a6f9e055b908a42b5811d6ce5e48acf8c9ed08",
    "testharness"
   ],
+  "css/css-multicol/float-and-block.html": [
+   "435614e6d5dcdbd8325687f70014bea0e3dea5f7",
+   "reftest"
+  ],
   "css/css-multicol/multicol-basic-001.html": [
    "7cb568d75ea3fec9046ec69770fe59b8539beb02",
    "reftest"
@@ -507115,6 +507432,26 @@
    "46913ea7e47811b11be898de5c3bd0a330ea6637",
    "testharness"
   ],
+  "css/css-scoping/shadow-fallback-dynamic-001.html": [
+   "062c99df18077a0205d0170d641b1d1e61199657",
+   "reftest"
+  ],
+  "css/css-scoping/shadow-fallback-dynamic-002.html": [
+   "2f66c8bca48c2ce5c9e82c5d67b152e2d143f4c6",
+   "reftest"
+  ],
+  "css/css-scoping/shadow-fallback-dynamic-003.html": [
+   "f054b0974277fbee38a96a26559c9a15400266db",
+   "reftest"
+  ],
+  "css/css-scoping/shadow-fallback-dynamic-004.html": [
+   "fc33527eaaa7711ecb2c7cd9523e793bce2503f2",
+   "reftest"
+  ],
+  "css/css-scoping/shadow-fallback-dynamic-005.html": [
+   "46d78b6d6931505bbc4bfc2f83e2bd0bac0d3472",
+   "reftest"
+  ],
   "css/css-scoping/slotted-invalidation.html": [
    "c500e1ceba1b293d45df5f66fd89d4a5d9ceb952",
    "testharness"
@@ -507227,6 +507564,10 @@
    "51f08f58135901b332ff43d15fbdc8d0a22f962c",
    "manual"
   ],
+  "css/css-scroll-snap/snap-to-visible-areas.html": [
+   "dfaf8675bec557c9f2178ad48b29c803f94056b5",
+   "testharness"
+  ],
   "css/css-shapes/OWNERS": [
    "d26aa70436055346420fd8bae6fd174daf090124",
    "support"
@@ -507331,6 +507672,14 @@
    "e5b0425ea113fc8f550639aba9e85adb626fc6c1",
    "testharness"
   ],
+  "css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html": [
+   "aaae2c3210f797109604e85016d25467d3aa5f47",
+   "support"
+  ],
+  "css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html": [
+   "2f33cb292183209b60437955122248438b46d209",
+   "reftest"
+  ],
   "css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html": [
    "b732edbc1d0920b2bb6ae2c5e7f25ec8ea15d0e0",
    "support"
@@ -508976,7 +509325,7 @@
    "reftest"
   ],
   "css/css-tables/table-model-fixup-2.html": [
-   "19e3577e862601a0cf00dd4644017218c363f0db",
+   "57f45e21a6f9f51154f872c724856d41681857e7",
    "testharness"
   ],
   "css/css-tables/table-model-fixup.html": [
@@ -511063,10 +511412,6 @@
    "8d5809ae7986bdc493e290cc31068b478a7f4d18",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-013.html": [
-   "def397265dafefa00bed7ef9b122667867244ee6",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-014.html": [
    "22e41aff080c6dcc577660d36142aef3230c3feb",
    "reftest"
@@ -511203,10 +511548,6 @@
    "a2dd7fd232c02b5edb2c9dc372bd3c4e2ef9864d",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-048.html": [
-   "b54e6fe470f6bccfa0802d99e2e56b093fd6b834",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-049.html": [
    "fe9971b88c54ad8c06adff6eb2d674e1ffbe8e77",
    "reftest"
@@ -511347,10 +511688,6 @@
    "aaa7d66b89731d200b1f4b7091dda82c469929e3",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-118.html": [
-   "2be0fd76f62c127556a749d8b159c7c29b603628",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-119.html": [
    "0f093970f64ea84b1246ea4d2c5d8e60667bdafe",
    "reftest"
@@ -511491,10 +511828,6 @@
    "29f3c50088569d88a654234d89ad4370165f89e3",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-154.html": [
-   "3ad85f1ae1907eb7d84fca3e72d00cf8030adbfc",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-155.html": [
    "a7761d9e1602484a87506326ea69043f675a6b89",
    "reftest"
@@ -511627,10 +511960,6 @@
    "559f33d4579d496a16877f4ce02578347dbf74c1",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-216.html": [
-   "a4bd3e721b66e12ec309e87649f97b7e0fbdebf9",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-217.html": [
    "88de4809077f221e3f12f8a2d3b4d3d05625c27c",
    "reftest"
@@ -511659,10 +511988,6 @@
    "8dabbc687db8e345f813add7637b021b222030fc",
    "reftest"
   ],
-  "css/css-text/i18n/css3-text-line-break-opclns-224.html": [
-   "7918d0d8ad4661fa7f7068eb0b3d0e5db647c295",
-   "reftest"
-  ],
   "css/css-text/i18n/css3-text-line-break-opclns-225.html": [
    "4baee0c9306bd759257c53af174dfde8be54b5ee",
    "reftest"
@@ -512699,10 +513024,6 @@
    "dc4cc7e9c23a9d36c674cd0822d22b3d6119f154",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html": [
-   "e80305b0df39b2df3bdc1f4876eb4433e6babcd6",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html": [
    "d4ac1cada77f7287da48ade3857e5f68670ba98d",
    "support"
@@ -512839,10 +513160,6 @@
    "4baf979c65a0ffa4a83e65e7fdfe5f457517593f",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html": [
-   "07db3b91c4798e502c9f8ee2b931d8d0d0f461ce",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html": [
    "b612c3d8bb714d1b951f963d50e8275d1a0f27a2",
    "support"
@@ -512983,10 +513300,6 @@
    "83eaef84e9d0e3f58905b9a6f7268018e4014194",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html": [
-   "df62ed8942fdb2776c0a01d9765b71a4167300e5",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html": [
    "0140d6fce18604a51b1087c9cd1107b0b15b4b90",
    "support"
@@ -513127,10 +513440,6 @@
    "4dda7948a8ea442ca2c7e4b46b831cf3ac1fabc9",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html": [
-   "cd266d86aa2de24d72f14f39ea675c18abaec31e",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html": [
    "b311bf9cfddc1217dd1dc5a96199ca8d8d786e82",
    "support"
@@ -513263,10 +513572,6 @@
    "e9cf46fd6dfa7fb82431b243d897c81c283acd1d",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html": [
-   "fbdfa9d7795fc6294e3807bc913668f4501eb8f9",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html": [
    "9a4bb4d06e18c429ac3edab4ac263c77d08aa625",
    "support"
@@ -513295,10 +513600,6 @@
    "3d18208ca74d7809712f1e80d81e2dcb771f585e",
    "support"
   ],
-  "css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html": [
-   "d5c3459ae7a3f98a76a969384b7377ad85800dcc",
-   "support"
-  ],
   "css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html": [
    "acea6f0656160271223ba2513b84a89b50a1c643",
    "support"
@@ -513431,10 +513732,6 @@
    "634018ab5c30e499c6eed93465cfb7d02e2d3f02",
    "reftest"
   ],
-  "css/css-text/line-break/line-break-normal-025.xht": [
-   "5a41b63c46c0e0e5fbadd007177d7414fe0ac8b7",
-   "reftest"
-  ],
   "css/css-text/line-break/line-break-strict-011.xht": [
    "deef4c827b5323ca7be4ff758b36f2a99316d5a6",
    "reftest"
@@ -513471,14 +513768,6 @@
    "f9c1ce1b514450757796500b3c53ee6e8f84e842",
    "reftest"
   ],
-  "css/css-text/line-break/line-break-strict-018a.xht": [
-   "c262806975c9049cae9aaec4d564d1d6d52866e0",
-   "reftest"
-  ],
-  "css/css-text/line-break/line-break-strict-018b.xht": [
-   "14de59c749d0ac55a755ce4a30ffbecfb89fced8",
-   "reftest"
-  ],
   "css/css-text/line-break/reference/line-break-anywhere-001-ref.html": [
    "6224337b8fabfa02acd3e742a65d2c7905043648",
    "support"
@@ -513507,10 +513796,6 @@
    "51fbacefed3e99ba0d2ed0f3e962d53bc441808f",
    "support"
   ],
-  "css/css-text/line-break/reference/line-break-normal-025-ref.xht": [
-   "505f2648f4170c7f16187cbee9409c5debc1b8ef",
-   "support"
-  ],
   "css/css-text/line-break/reference/line-break-strict-011-ref.xht": [
    "801a813b828a2a36c67c4d3b14807cfa88a96748",
    "support"
@@ -513547,14 +513832,6 @@
    "b7666d3779f515011a3f35267e3416af80e643e3",
    "support"
   ],
-  "css/css-text/line-break/reference/line-break-strict-018a-ref.xht": [
-   "28382a5ee66ba23081d0c3562508d7c9a057804d",
-   "support"
-  ],
-  "css/css-text/line-break/reference/line-break-strict-018b-ref.xht": [
-   "087ae59ceba531e62b44b8eff861a0ad9ecaa192",
-   "support"
-  ],
   "css/css-text/line-breaking/line-breaking-001.html": [
    "3eb24937c6a4d0fa50c98373bec24eb6b9575401",
    "reftest"
@@ -513599,6 +513876,10 @@
    "acb72d2a4c3d5b74e63652ea19c3ed13cf1755ea",
    "reftest"
   ],
+  "css/css-text/line-breaking/line-breaking-012.html": [
+   "e9faec31d9058bb61a9e41ba62b1f57082ae3ee2",
+   "reftest"
+  ],
   "css/css-text/line-breaking/line-breaking-ic-001.html": [
    "1ae52aede1788270943bb03bb44d1c391a65a0b3",
    "reftest"
@@ -513615,6 +513896,10 @@
    "06870b5369af27006026689d97b057f7816b4c3c",
    "support"
   ],
+  "css/css-text/line-breaking/reference/line-breaking-012-ref.html": [
+   "dad351b104faeae8bc8d16632c7e57d01a0fdab7",
+   "support"
+  ],
   "css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html": [
    "7757ffc4116743ff6f98649310bf8b1bdc7027c9",
    "support"
@@ -515247,10 +515532,6 @@
    "2c693ccf4d431a5fcbc55a1184f550b152b1c498",
    "support"
   ],
-  "css/css-text/word-break/reference/word-break-normal-002-ref.xht": [
-   "d3f4b15b3f769ccad81d4839c4c35aa93077fc04",
-   "support"
-  ],
   "css/css-text/word-break/reference/word-break-normal-ar-ref-000.html": [
    "3022f73bbcdeb8abbc14a1081a515273dba07f9c",
    "support"
@@ -515395,10 +515676,6 @@
    "c24f0f91da19e34b3fe594e8139190b6dde59ed4",
    "reftest"
   ],
-  "css/css-text/word-break/word-break-normal-002.xht": [
-   "f1fd11fb63896e439b9970d448861de78a986882",
-   "manual"
-  ],
   "css/css-text/word-break/word-break-normal-ar-000.html": [
    "32204f818ee4de698be8499f33aadd2adda840d6",
    "reftest"
@@ -521548,11 +521825,15 @@
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html": [
-   "63600cc74e62ecbaf98bf786de17362764ec947e",
+   "b20c888c2ecc5dc7f87a2fa7114141a86a63598d",
+   "testharness"
+  ],
+  "css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html": [
+   "55f20761cbbe3dc27c718621d3e4d57eae041e8a",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html": [
-   "236520d8ac6199066d1e082b9860f2381ff61be6",
+   "d2ab852da57ca24e9675fd670a0bf3546063fa69",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/cssMatrixComponent.tentative.html": [
@@ -521891,6 +522172,14 @@
    "6fb5b014ffbbe4fe9c0019cea618a001fefdbedd",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/break.html": [
+   "d23705e018072f14ceb36d364df671f7fd6a6617",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/caption-side.html": [
+   "fc24cf6f0e6612646b6d8b0229ed31c2de97d763",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/caret-color.html": [
    "d4139aeff755abe89ee1e04fcd34ccfba4efe91c",
    "testharness"
@@ -521919,10 +522208,42 @@
    "d7424e7fb7c27cfa31fb0e40ee9045129ed96c03",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-basis.html": [
+   "87f3eed7306a43a312c95fd8b525fcd5d3e167cc",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-direction.html": [
+   "a27187c16080fe2daacd1c0a99657773a2b8c2d0",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-flow.html": [
+   "7cc29cb60930ad904ac6a90ed6fad5673b84ed81",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-grow.html": [
+   "7882699c2414306523501d253115198622a18cc9",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html": [
+   "8025e8905f2547ebdad41159c1872e6c9d868458",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html": [
+   "1f57e275b4c9d195e9f82ead41410f0954fdff86",
+   "testharness"
+  ],
+  "css/css-typed-om/the-stylepropertymap/properties/flex.html": [
+   "3bfc9c981b2131ed480f5d0bc2b90f76743e2b28",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/float.html": [
    "1dfca0045c2b57f36d5165139087301ffe54c63a",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/font-size.html": [
+   "bb31e5cb88492bece2c54ff106d01e789e3f08a6",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/font-style.html": [
    "c4a42872dca602b71f021799d29e404cfa7ed90e",
    "testharness"
@@ -521935,6 +522256,10 @@
    "36b8677eb45f8555da4381e1644624df2f2060e0",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/isolation.html": [
+   "883b36434d3e3d8fee25f0ae0fee9884b5ceef44",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/left.html": [
    "354512fcb071a863f11305f36cf3605ceef733b8",
    "testharness"
@@ -522003,6 +522328,10 @@
    "68a2611eaf9eecb7393c2b0db0f4378ebe285f22",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html": [
+   "7d4636be3e35639b915917412465b443241e95b1",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html": [
    "d37d336e4695e5055706a7822572b81b943fdbd4",
    "testharness"
@@ -522047,6 +522376,10 @@
    "b735f3ff6dba561cf2e35a8a85a8e2b93c0edc61",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html": [
+   "b676714807b4fcdfd5ba7555f7c2ee3d1d9590d2",
+   "testharness"
+  ],
   "css/css-typed-om/the-stylepropertymap/properties/vertical-align.html": [
    "41ae6fd66b5a0e6f3b5f154d839362a4921712cc",
    "testharness"
@@ -522063,6 +522396,10 @@
    "d429f7a88012179ef3d604b79b3db4aaba0ca426",
    "testharness"
   ],
+  "css/css-typed-om/the-stylepropertymap/properties/writing-mode.html": [
+   "3867e6c80011aaccb4b18efa37dea27d62dcf428",
+   "testharness"
+  ],
   "css/css-ui/OWNERS": [
    "beeb8a77d396e48731fd1e69a922b6e2c84c2caa",
    "support"
@@ -531571,6 +531908,10 @@
    "020d13088ba7b4b58ecb80bef3656a5a415b03ea",
    "testharness"
   ],
+  "css/cssom-view/GetBoundingRect.html": [
+   "5017a0f369c71e3b952ba2fc555ec08f00e4359d",
+   "testharness"
+  ],
   "css/cssom-view/HTMLBody-ScrollArea_quirksmode.html": [
    "6de6ee944522c61bc45335df91db210fd066b4f3",
    "testharness"
@@ -532008,23 +532349,23 @@
    "testharness"
   ],
   "css/cssom/CSS.html": [
-   "2c55d573bbd90f5ca3e564131ae697b547e4a43c",
+   "fd9fd5a23066558960ea933a8dab6dec0039c649",
    "testharness"
   ],
   "css/cssom/CSSKeyframeRule.html": [
-   "0246cf2511a18c247db1eabefec8b3590127d3ee",
+   "1a8e3e0ce0ab0d147efd0ae321a22441471db4ab",
    "testharness"
   ],
   "css/cssom/CSSKeyframesRule.html": [
-   "bca997a63c1389ef6d14aac2f32ab770fbd15ec4",
+   "0d79c71fa08843fd830e06ffbff0ee1c5f6664d3",
    "testharness"
   ],
   "css/cssom/CSSNamespaceRule.html": [
-   "701b19bdfa480a5e0997492094657e32ae11ea48",
+   "d12ac6dccba47c4fbe6cce03bb44e51b850fb07a",
    "testharness"
   ],
   "css/cssom/CSSRuleList.html": [
-   "8d8b435c2398c7a9de5fd57584240e24b45b80bc",
+   "4d0b19a6e29ae7a721574e36b47985233ddc8bae",
    "testharness"
   ],
   "css/cssom/CSSStyleRule.html": [
@@ -532032,15 +532373,11 @@
    "testharness"
   ],
   "css/cssom/CSSStyleSheet.html": [
-   "f0d47464da9d30e70733f09af78f3e9f982c4406",
-   "testharness"
-  ],
-  "css/cssom/GetBoundingRect.html": [
-   "7e5a8b25753ac970c2d192376c9dd93943b3dbb5",
+   "a69dbd728c19d1df95dd00f2750e0919893ce61d",
    "testharness"
   ],
   "css/cssom/MediaList.html": [
-   "0357bff95fc870624d13ad3bf61cdfff5b2ad1cf",
+   "f3581dd2627cf4933c05f4cc61db1820f7587452",
    "testharness"
   ],
   "css/cssom/MediaList2.xhtml": [
@@ -532052,7 +532389,7 @@
    "support"
   ],
   "css/cssom/StyleSheetList.html": [
-   "3a0e6f64f70f863d679e537c4bfb76aaa0d3598a",
+   "0a1cd8ed56ac3a5b1a9556835d94fb80325199bf",
    "testharness"
   ],
   "css/cssom/computed-style-001.html": [
@@ -532096,11 +532433,11 @@
    "testharness"
   ],
   "css/cssom/cssom-fontfacerule-constructors.html": [
-   "c064661df74571d374f49a693f3263fcf138e670",
+   "4e368aa75d3840d7f819fd531c91417fd2dad63c",
    "testharness"
   ],
   "css/cssom/cssom-fontfacerule.html": [
-   "ca5e2f162a4a0dd02f3c46e72b9e43e1b61d621a",
+   "b26c0a9584822f4e97d4e2f28507aa6e82a5fbd0",
    "testharness"
   ],
   "css/cssom/cssom-ruleTypeAndOrder.html": [
@@ -532136,7 +532473,7 @@
    "testharness"
   ],
   "css/cssom/historical.html": [
-   "2c78218b89efb9bdf60cf708920be142051347c7",
+   "02b135e62439d775d7e8de7ca94c831a8d00e077",
    "testharness"
   ],
   "css/cssom/index-001.html": [
@@ -532200,7 +532537,7 @@
    "testharness"
   ],
   "css/cssom/overflow-serialization.html": [
-   "199039706289f577652b968706fc1251398acd1c",
+   "48ca70f4c20da103276e1b053ca0e4613fcc2819",
    "testharness"
   ],
   "css/cssom/selectorSerialize.html": [
@@ -532212,7 +532549,7 @@
    "support"
   ],
   "css/cssom/selectorText-modification-restyle-001.html": [
-   "ac5a5414dd849151c3ca6348c90c0f4e80a09b75",
+   "0391a09ae16f9e353bab57df65ba35d4372a6548",
    "reftest"
   ],
   "css/cssom/selectorText-modification-restyle-002.html": [
@@ -532220,7 +532557,7 @@
    "testharness"
   ],
   "css/cssom/serialization-CSSDeclaration-with-important.html": [
-   "ecc8b95fb2d71cacee271f4fea2fc16f35cdba57",
+   "ed17519b642e6e61fc9e01ef72098d5e31dbd291",
    "testharness"
   ],
   "css/cssom/serialize-namespaced-type-selectors.html": [
@@ -532228,11 +532565,11 @@
    "testharness"
   ],
   "css/cssom/serialize-values.html": [
-   "dfc69e37002cf8babc654182892c1e75f3845b58",
+   "53c094e381ba06f111ab8b379debaa6becb40802",
    "testharness"
   ],
   "css/cssom/serialize-variable-reference.html": [
-   "5e83f084efc82184c3052a40bb4a061fd4a1336f",
+   "85a25fcb99fe433e3f71bc1b6fec92815da2704d",
    "testharness"
   ],
   "css/cssom/setproperty-null-undefined.html": [
@@ -532240,7 +532577,7 @@
    "testharness"
   ],
   "css/cssom/shorthand-serialization.html": [
-   "bd514834dbd48c267c16a4329af6fec7f6cbc081",
+   "0240668113cb5c280dcb76d8eabfa28d0ed9cb52",
    "testharness"
   ],
   "css/cssom/style-sheet-interfaces-001.html": [
@@ -532264,7 +532601,7 @@
    "support"
   ],
   "css/cssom/stylesheet-same-origin.sub.html": [
-   "c8112887da9ee152a9ebe64988fd29cb2c27b9ba",
+   "cab23bdf8b92c8194cc71b1a8ce34155f89f42cf",
    "testharness"
   ],
   "css/cssom/support/1x1-green.png": [
@@ -532464,7 +532801,7 @@
    "testharness"
   ],
   "css/cssom/variable-names.html": [
-   "5ab67b9e86fd700a556d153898c2896448cc1759",
+   "0da19a40542ea2eb282bf04e6ea65d15490fc097",
    "testharness"
   ],
   "css/filter-effects/OWNERS": [
@@ -535295,6 +535632,10 @@
    "eb78a4d12f35b4249051826ea000c53d04df80b7",
    "support"
   ],
+  "css/support/blue32x32.ico": [
+   "a968207eb33ff204ef5af90af452e6c53f5cde76",
+   "support"
+  ],
   "css/support/c-red.css": [
    "dc288b7aa49b57e0abf803741e78582ba5ceffdb",
    "support"
@@ -544364,7 +544705,7 @@
    "support"
   ],
   "docs/_config.yml": [
-   "55b531a735fbcfb21fab226717b140ba4b3f5486",
+   "2d80d0533330473caf490dfa1145ca76b5f42141",
    "support"
   ],
   "docs/_includes/footer.html": [
@@ -544376,7 +544717,7 @@
    "support"
   ],
   "docs/_includes/header.html": [
-   "e0306c4de5f406a7b5198d6d729ea1e14c2d91cf",
+   "faa044875fe2a159030203db9400ea18ed385da8",
    "support"
   ],
   "docs/_includes/svg/octicons/LICENSE": [
@@ -544412,7 +544753,7 @@
    "support"
   ],
   "docs/_running-tests/chrome_android.md": [
-   "d23a2e3446dc5f5ec4a744416fc6a5a559f18e6b",
+   "082b7697eed61caefcc0a280cba6cee24ff12e7d",
    "support"
   ],
   "docs/_running-tests/index.md": [
@@ -544523,8 +544864,12 @@
    "429836f3ca93ff4896eb5d942a09e7eafad1fb02",
    "support"
   ],
+  "docs/assets/gh-fork-ribbon.scss": [
+   "03c18f74b15f335c3be32b4410bcad9ea9b77fb9",
+   "support"
+  ],
   "docs/assets/main.scss": [
-   "a0f4501b19a64a73c1037e2843a49060c4659bc9",
+   "94b8f9e5bd6785428b2ccc8e6605449de8014bc0",
    "support"
   ],
   "docs/assets/menu.js": [
@@ -544564,7 +544909,7 @@
    "support"
   ],
   "docs/introduction.md": [
-   "8b5def1fe676bd3c47a54933d08f8e43b634a31d",
+   "ea9a85d79dbf66598ee05da17d34f9e786a3ce78",
    "support"
   ],
   "dom/OWNERS": [
@@ -546227,6 +546572,10 @@
    "a4e24143c2ef4b9a8fe64a0a07bd30594025f90e",
    "support"
   ],
+  "domxpath/document.tentative.html": [
+   "c1b93714b14b822c55d3f784e0520d91c6cc46c4",
+   "testharness"
+  ],
   "domxpath/evaluator-constructor.html": [
    "4842d40e22e25ee72536946d785a3cd03bc6a11d",
    "testharness"
@@ -548675,6 +549024,10 @@
    "892d667b4e54cc48435f07f8a2f443b8b67f33b7",
    "support"
   ],
+  "entries-api/README.md": [
+   "9fad3adb14acfb8c14cc320a8d704c4291d01c40",
+   "support"
+  ],
   "entries-api/errors-manual.html": [
    "baf8ef0435c4da686a5ed5e728a22fee317c2548",
    "manual"
@@ -548787,6 +549140,10 @@
    "700107771158b22fa280f30a5a52d1aac617ff6e",
    "testharness"
   ],
+  "eventsource/dedicated-worker/eventsource-close2.htm": [
+   "dc79b53506150f4877a36c6c0d54ccebeecf87ba",
+   "testharness"
+  ],
   "eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm": [
    "9614ac5ce1967bbbcae6a1cc8d64465579f6410d",
    "testharness"
@@ -549139,6 +549496,38 @@
    "2ae1da8e026e63625a6168b842303cc156963ced",
    "support"
   ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html": [
+   "a48c092204750e00c9aa167a9ef9d2d239445d22",
+   "testharness"
+  ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers": [
+   "bfcf350d87faae8e6cf4b2beb9fee84957cac449",
+   "support"
+  ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html": [
+   "7a68af16b8cb8292185997cefdfeb3be295813a7",
+   "testharness"
+  ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers": [
+   "ea3519ed0612b18268c0df22a1c9472e404c2573",
+   "support"
+  ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html": [
+   "a1304e1954b23cde1d017a242bad05e2d3039a6e",
+   "testharness"
+  ],
+  "feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers": [
+   "035bf4abe912636d5bd070eb20d573cf9c464565",
+   "support"
+  ],
+  "feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html": [
+   "aa8ef0a6f90986121f597231f5ae75b8d4b65368",
+   "testharness"
+  ],
+  "feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers": [
+   "f20475f628a5f4a3067b8682019054e3f31c703a",
+   "support"
+  ],
   "feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html": [
    "4d27ea669ef4362242db87a5abda1589b985bf20",
    "testharness"
@@ -549195,6 +549584,10 @@
    "f20475f628a5f4a3067b8682019054e3f31c703a",
    "support"
   ],
+  "feature-policy/interfaces.any.js": [
+   "57e4d58d5b12e63832c1c620b271b0124469d728",
+   "testharness"
+  ],
   "feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html": [
    "22d155755cd7aaff8a1c40c597468066f01eb13b",
    "testharness"
@@ -549292,7 +549685,7 @@
    "support"
   ],
   "feature-policy/resources/featurepolicy.js": [
-   "f6bb46c7ababec6a7902b1ed2b00a7803e0a7e1d",
+   "87607362a81716400d9fee10958893e7a785f74e",
    "support"
   ],
   "feature-policy/resources/picture-in-picture.js": [
@@ -549968,7 +550361,7 @@
    "testharness"
   ],
   "fetch/api/request/request-disturbed.html": [
-   "47a1771e5ce32b63cf4b378a87c5d53ee486c246",
+   "62d53aaa3cefd7f76f315ab3f3aa1cd5d5a4e4a0",
    "testharness"
   ],
   "fetch/api/request/request-error.html": [
@@ -551432,7 +551825,7 @@
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html": [
-   "5c9b0421e10e87ce540ae89304cb06189521db28",
+   "b85d614841994226c2cab7fdf88e03620e453457",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers": [
@@ -551475,6 +551868,10 @@
    "8c5a4e48439ff0620d6267b127a5d49f85657896",
    "manual"
   ],
+  "geolocation-sensor/GeolocationSensor_read.https.html": [
+   "5a61a677b26c1c25cb46da2baa16e3a6783febee",
+   "testharness"
+  ],
   "geolocation-sensor/OWNERS": [
    "fabf35173a8bd10c7e5ffe348dd92532199ab51a",
    "support"
@@ -553856,7 +554253,7 @@
    "testharness"
   ],
   "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html": [
-   "caaede75e5c16cc78023ce410f48e37e612cffbb",
+   "6da68164fdba8986d4dd217ad48198f675e83165",
    "testharness"
   ],
   "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html": [
@@ -555223,6 +555620,10 @@
    "a2a5acc9dfe53c7482eeaa4be3a4819238f8e120",
    "testharness"
   ],
+  "html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js": [
+   "0f0020e1d7d8050892ef146d687178cfe8eedcd2",
+   "testharness"
+  ],
   "html/dom/elements-embedded.js": [
    "99489e3a8ac2be0d7dcfb22f7f45c30b00511358",
    "support"
@@ -560336,21 +560737,17 @@
    "support"
   ],
   "html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html": [
-   "ca8af91733f0b0704409e26f17d4a14977ce14f7",
+   "8e594aef8d0201565c770ec7c01e13a5f4b8042d",
    "testharness"
   ],
   "html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js": [
-   "2e35f55a86d31d98e69ad1013c18ab1ff9d9be02",
+   "4effaa2678d2f99954e222ef9a743bffb029431e",
    "testharness"
   ],
   "html/infrastructure/common-dom-interfaces/collections/domstringlist.html": [
    "b51c104271ba1cc404de0d68fd004b4e4ecb0d8c",
    "testharness"
   ],
-  "html/infrastructure/common-dom-interfaces/collections/domstringlist.idl": [
-   "3b23d2861e3e3037ef3364781394d1b3e8371bae",
-   "support"
-  ],
   "html/infrastructure/common-dom-interfaces/collections/historical.html": [
    "a5d4598e215e1e9322538b646a0541ba64687c3d",
    "testharness"
@@ -565583,6 +565980,10 @@
    "92c8c30e186f0a94a962bb5c4be7acf0860b943e",
    "testharness"
   ],
+  "html/semantics/forms/form-submission-0/resources/file-submission.py": [
+   "902650776538707a501367bac3f224f8feb89514",
+   "support"
+  ],
   "html/semantics/forms/form-submission-0/submission-checks.window.js": [
    "c13ed40ca2a1988368564cb5c9dbcabee4306ceb",
    "testharness"
@@ -565591,6 +565992,10 @@
    "f73376af978f2fb89dcbd6e9092f113d90c7a3d6",
    "testharness"
   ],
+  "html/semantics/forms/form-submission-0/submit-file.sub.html": [
+   "3a32d9a2218c9a77045b88b3ca1b1eab46e9adf0",
+   "testharness"
+  ],
   "html/semantics/forms/form-submission-0/url-encoded.html": [
    "04568ab3b18733d4773a5020fdf0c22bdca3b210",
    "testharness"
@@ -569691,6 +570096,10 @@
    "78e72ad26b9df9b3f32f1cf00acb6eb051dc86c5",
    "support"
   ],
+  "html/syntax/parsing/html-integration-point.html": [
+   "cd2686abb45f08150a13c887959fa0e8e26753a5",
+   "testharness"
+  ],
   "html/syntax/parsing/html5lib_adoption01.html": [
    "90f39dae58f37f2f8d786a617fcc5804e6235ae0",
    "testharness"
@@ -571083,6 +571492,10 @@
    "1a291b68cdf6edcfc28a2ff22e294e8e8ebc0c42",
    "reftest"
   ],
+  "infrastructure/testdriver/click.html": [
+   "afb1a08faa639bdd1ee4387069d76803c5e38d54",
+   "testharness"
+  ],
   "innerText/getter-tests.js": [
    "e5ec1c1fd4777a1a1c25720047a955ec04c0d014",
    "support"
@@ -571164,7 +571577,11 @@
    "support"
   ],
   "interfaces/cookie-store.idl": [
-   "5284cfc7bbb5282d670c59ef7baaa39e166bebe9",
+   "0d74ef8e7681fddddfb786b75075a1dd0ddb9147",
+   "support"
+  ],
+  "interfaces/css-font-loading.idl": [
+   "a0d53cc4e88f38cce9fd45759963e5da9a6f3dc3",
    "support"
   ],
   "interfaces/css-typed-om.idl": [
@@ -571184,7 +571601,7 @@
    "support"
   ],
   "interfaces/dom.idl": [
-   "2d65a8029a80cfc97398d18f911f1ae65067e765",
+   "f5881beeeaa7e990e9b889182989d6d0fb0ba8a3",
    "support"
   ],
   "interfaces/encoding.idl": [
@@ -571199,6 +571616,10 @@
    "6bb93df3e14e49931f54eead37a009649e035bd1",
    "support"
   ],
+  "interfaces/feature-policy.idl": [
+   "cba4a18b5a6b69c467067dc4a7ac7449f39be6a1",
+   "support"
+  ],
   "interfaces/fullscreen.idl": [
    "fda57b55aabdc54d674851851451c6c69c514ed1",
    "support"
@@ -571220,11 +571641,11 @@
    "support"
   ],
   "interfaces/hr-time.idl": [
-   "61bd84c720a00b5dfaff8a98ace54cb476a4ed18",
+   "db4f313176e4fdfb8efd78545079da42cbb0729b",
    "support"
   ],
   "interfaces/html.idl": [
-   "84ed07588763a87bffbe191bf440e820f9d130ec",
+   "b2b35732b54cbe3406493a6c121363eccceb4f5c",
    "support"
   ],
   "interfaces/magnetometer.idl": [
@@ -571256,7 +571677,7 @@
    "support"
   ],
   "interfaces/screen-orientation.idl": [
-   "b280c2a72795d4abd55a361a0afd8adce70562dc",
+   "ace5a4ae79933cdfd7ecf5c3801e93f0636fe57b",
    "support"
   ],
   "interfaces/selection-api.idl": [
@@ -571652,19 +572073,19 @@
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-1.html": [
-   "21ffc564f5bf999df38e265c104ddc3cc767ece3",
+   "043847a6c09fc388420383c1ce2c992369af299f",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-2.html": [
-   "17502e5c3311cb262d4d47657f71211292a1d4b0",
+   "5fa05dd23cc431661ca7460781191670d54f5340",
    "testharness"
   ],
   "mathml/presentation-markup/operators/mo-axis-height-1.html": [
-   "282c85bc036793c96972a348c8cced5b87d3f078",
+   "678286269101ccc22a3944c7f3fda1be95360be9",
    "testharness"
   ],
   "mathml/presentation-markup/radicals/root-parameters-1.html": [
-   "58293790346b6f6b5ad59de9637f136aad206d20",
+   "03787fde52972882808119b175331e671dbb477d",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-1.html": [
@@ -571688,7 +572109,7 @@
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-parameters-1.html": [
-   "59ca4d1cc0b773f1e57b9cc1fb45ccab6a97dd5b",
+   "a9198166947a3d181d21d2597d167d3962c67f6e",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-1.html": [
@@ -571696,19 +572117,19 @@
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-1.html": [
-   "0bd971f6288d6a198a0d3edcd5777943e4898296",
+   "8da018d0029c885f8d6caf4d8ae6517430e385c5",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-2.html": [
-   "19c54c65a72706e1d7f2a00fc998f4ffa3a8990c",
+   "56c694b6be115dc3241f9efe3e95ff8efc854896",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-3.html": [
-   "97bc8e457eada46d22e8c73f69c6854d4d2ebf44",
+   "a597bbccde38b2273fa552be0b7bbca8372beaf1",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-4.html": [
-   "609c7ff70d3c5509ca08197e38a3a1208faa093b",
+   "2a0978f31bae3934a18c34865a2193cc2d906bfb",
    "testharness"
   ],
   "mathml/presentation-markup/spaces/space-1.html": [
@@ -571724,7 +572145,7 @@
    "reftest"
   ],
   "mathml/presentation-markup/tables/table-axis-height.html": [
-   "0019b8c73ac46a41c078f722b854f5d4b179f9a2",
+   "e19346c7b5514aeb048a18ae6cb80e9f3fb76c3a",
    "testharness"
   ],
   "mathml/relations/css-styling/color-1-ref.html": [
@@ -571744,7 +572165,7 @@
    "reftest"
   ],
   "mathml/relations/css-styling/displaystyle-1.html": [
-   "ec33c536a756cf8870acaf029257f126284c7130",
+   "16a7750938d2cf3b33e502365fcd9a25e51ed2a9",
    "testharness"
   ],
   "mathml/relations/css-styling/lengths-1-ref.html": [
@@ -571764,7 +572185,7 @@
    "reftest"
   ],
   "mathml/relations/css-styling/lengths-3.html": [
-   "206d9a369266e8639f290545c86df7cd6ab9ebea",
+   "2723869ffc2e841ed40676283fd0b818240dd111",
    "testharness"
   ],
   "mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html": [
@@ -572712,7 +573133,7 @@
    "testharness"
   ],
   "mediacapture-streams/MediaDevices-enumerateDevices.https.html": [
-   "1fb376d675c685d5de76fef0e840e440de3e3268",
+   "892229b737d157845d9b2e24170f3bc820b10036",
    "testharness"
   ],
   "mediacapture-streams/MediaDevices-getUserMedia.https.html": [
@@ -572975,6 +573396,114 @@
    "bf977afe3f0b5daa0e899dff1d55241352125531",
    "testharness"
   ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "9a7a66a2fd1f04a410548b0691fa6bd07767e2ca",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "be6392b34d8a7c5e1c257d6894ed192be567a75c",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "ec9fb7ca5ee63c2c94ec1c599fda84847488ea31",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "838fb9e5d6c0a976f1978ff711f71b4b830fbd9c",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "7d20e9e36d2288e2f52984c50531bba7eeec4c59",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "c93ac7834ab5a560f476c93523430070520675fd",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "8b95b2cf6fcdb8294ddd0eb16f999c3d312c4d49",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "d83bc79c2125bd20e741ed6ed2322a3c73e38842",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
+  ],
+  "mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "7244ccaed934c8892da287d89fe4418b485bcb29",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "04cd47a9a5cb974525428323f1e81218f911df79",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "7386bac3932ac650ce1d729091ffe5ab7bd09942",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "1780dbdb75192b26622c7849488a058a5f2d310c",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "ab083ef45668b3ceffa689c81546bee4786121ab",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "7f9cd64a146504b2fc4d60f3c28ac4bee1fb51d9",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "ee88f8fcf9442d1a887e0f998af0d065151ab1d1",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "40880807f157570f164238eb86dc2b3a6f6e0efc",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "94b5f5df01cde9577971f202fc28c7054c125861",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "19709011c5d1aa274bcd4a3472db7dabc280034a",
+   "testharness"
+  ],
+  "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "85f56860a2f9bf88854ab1f732fa3e7b15995dc6",
+   "testharness"
+  ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
    "1b368a53bec1da5921224e4fd3ae3db4d11014d3",
    "testharness"
@@ -573084,7 +573613,7 @@
    "testharness"
   ],
   "mixed-content/generic/common.js": [
-   "7eb02bdb367f618dd7848de2c64c83bb915d3bd2",
+   "eb29cec6e5a930521b9526ea46c6a1d747c23a79",
    "support"
   ],
   "mixed-content/generic/expect.py": [
@@ -573092,7 +573621,7 @@
    "support"
   ],
   "mixed-content/generic/mixed-content-test-case.js": [
-   "55980afcecb041ee23942c18b222b20eb8c5bea4",
+   "b09fc28dbbdfe1d5b7d9d06dfd5610d4572f8912",
    "support"
   ],
   "mixed-content/generic/sanity-checker.js": [
@@ -573804,11 +574333,11 @@
    "testharness"
   ],
   "mixed-content/spec.src.json": [
-   "1e46012ca5e1f0892e6c80572fa28c5358596c57",
+   "bdd9ba1d38e8bb484c91651bb2592ae9a688befc",
    "support"
   ],
   "mixed-content/spec_json.js": [
-   "f3b78849f97e307c39f81cf9cebb01b367c91b79",
+   "817c54f14d3dabb0c8b21325b9824a8d0f439bb0",
    "support"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
@@ -580836,7 +581365,7 @@
    "testharness"
   ],
   "payment-handler/interfaces.https.any.js": [
-   "7910e8fa96dabaf03f1806c6faad94a640e4726c",
+   "66f067e3988546afc0796dcbc276b04b5a5615fc",
    "testharness"
   ],
   "payment-handler/manifest.json": [
@@ -581039,8 +581568,12 @@
    "27ecc7e10e50bf2df07f84a15972c3b913ebf32f",
    "testharness"
   ],
+  "payment-request/payment-request-show-method-manual.https.html": [
+   "1df34a1d4ae403ef4853af6850a3f2e9521703f7",
+   "manual"
+  ],
   "payment-request/payment-request-show-method.https.html": [
-   "1e4c792de7013839c713555a0a295bcbb9597094",
+   "676d99be4ce55ab42061921255657c3ab4e458ac",
    "testharness"
   ],
   "payment-request/payment-response/complete-method-manual.https.html": [
@@ -581632,7 +582165,7 @@
    "testharness"
   ],
   "preload/download-resources.html": [
-   "f4894d37e5687cdadf8aa6879cf233b8af4e84da",
+   "a8af59b5a58b04bfda533a314c9822b13b5c379b",
    "testharness"
   ],
   "preload/dynamic-adding-preload-nonce.html": [
@@ -581648,7 +582181,7 @@
    "testharness"
   ],
   "preload/link-header-on-subresource.html": [
-   "ea2f018b648d77b13b8010b4ebe63cdc5f846603",
+   "e324d7511f139f6d08c1535adfe75df579ebf747",
    "testharness"
   ],
   "preload/link-header-preload-delay-onload.html": [
@@ -581692,19 +582225,19 @@
    "testharness"
   ],
   "preload/onload-event.html": [
-   "a02dd91451d598684a91575e8b09bda81c90e43f",
+   "2b8bd3c576b4d264d30dd664a5057fbfb1fa3fd5",
    "testharness"
   ],
   "preload/preload-csp.sub.html": [
-   "6b883cf98ebedfffbc66ab01db8736b3a978ba3b",
+   "a363e5f2447bbbcef709216d1b0bbfeec003d588",
    "testharness"
   ],
   "preload/preload-default-csp.sub.html": [
-   "5dc342bc568e96a53d5d8c0259a4f3c32a9a6ae5",
+   "8b22c83cb91255a74078c643d92078695bcd4cea",
    "testharness"
   ],
   "preload/preload-with-type.html": [
-   "ede6cb60bc1fff4f5b7740f66f039c88adb23f6f",
+   "5592d7d0d7495b04753d09f7e01d34358b03e22e",
    "testharness"
   ],
   "preload/reflected-as-value.html": [
@@ -581724,7 +582257,7 @@
    "support"
   ],
   "preload/resources/dummy-preloads-subresource.css.sub.headers": [
-   "74cf2e94b49905203c42c7e701bd2308997347ea",
+   "99175c5e06059af0e13bb3a7d40e5ed9e4a447fc",
    "support"
   ],
   "preload/resources/dummy.css": [
@@ -581812,7 +582345,7 @@
    "testharness"
   ],
   "preload/single-download-preload.html": [
-   "2b7af8e911957d6b49246a17ceb284b97981241e",
+   "7c11c149daba797eb7ddae3254d6166e3057e66a",
    "testharness"
   ],
   "presentation-api/OWNERS": [
@@ -581848,7 +582381,7 @@
    "manual"
   ],
   "presentation-api/controlling-ua/PresentationRequest_error.https.html": [
-   "8d8a2a77b5735cfe4dc6d0eeb3c5bdf7f13c4148",
+   "c1156f81c778b871e741d55eed332e441c0cda1d",
    "testharness"
   ],
   "presentation-api/controlling-ua/PresentationRequest_mixedcontent.https.html": [
@@ -581872,7 +582405,7 @@
    "testharness"
   ],
   "presentation-api/controlling-ua/PresentationRequest_success.https.html": [
-   "74cc007c2472f11bdc08410f870f270e8e4b0f4a",
+   "91cc64f165493d46bf3e9f0a303c9794bff78854",
    "testharness"
   ],
   "presentation-api/controlling-ua/common.js": [
@@ -589763,10 +590296,6 @@
    "a6cd75583f6363a83b18f1bc77d89821de344ff7",
    "testharness"
   ],
-  "resource-timing/resource_frame_initiator_type.html": [
-   "dcea1111a2c9a40a1d3de7246a5295e84dcf08b5",
-   "testharness"
-  ],
   "resource-timing/resource_ignore_data_url.html": [
    "f8513b4ae7cc26c07cea1c16d872e0594f05041c",
    "testharness"
@@ -589776,7 +590305,7 @@
    "testharness"
   ],
   "resource-timing/resource_initiator_types.html": [
-   "70ab5e0b5d8d684fc420e9242a273e948edbb1ba",
+   "11ad45e383c110eee2496c481abbff9642f6e6ee",
    "testharness"
   ],
   "resource-timing/resource_memory_cached.sub.html": [
@@ -589832,7 +590361,7 @@
    "support"
   ],
   "resource-timing/resources/all_resource_types.htm": [
-   "c7f698888c64e5b750fac45e22dbb85e5979b3c5",
+   "63a40f0ab7e27536448a7624bb632332c9d0aae4",
    "support"
   ],
   "resource-timing/resources/blank_page_green.htm": [
@@ -589847,10 +590376,18 @@
    "51e0050cf1bdeb051d0d7ab6f23a7a2173cb40db",
    "support"
   ],
+  "resource-timing/resources/empty.py": [
+   "3638ba60904616a2bf551fef1fb81b08db9e172f",
+   "support"
+  ],
   "resource-timing/resources/empty_script.js": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "resource-timing/resources/eventsource.py": [
+   "e53940d9844b03cd06b425530e2e23e20aa31bdb",
+   "support"
+  ],
   "resource-timing/resources/fake_responses.html": [
    "c942abc1e8c1672935ffc8ce34821891345bacb9",
    "support"
@@ -589860,7 +590397,7 @@
    "support"
   ],
   "resource-timing/resources/green_frame.htm": [
-   "08f8ca19b61ab0ac68014d5b406a952669fbe104",
+   "710159d2dcfce2cdc2f98449ec7a516fdc739079",
    "support"
   ],
   "resource-timing/resources/gzip_xml.py": [
@@ -590268,7 +590805,7 @@
    "support"
   ],
   "sensors/generic-sensor-tests.js": [
-   "383a4f839c4a74b5b4d2a6cff9c83a61bc5aee04",
+   "6364f1838215eaafd91b86690039da41d4c19cd1",
    "support"
   ],
   "sensors/idlharness.https.html": [
@@ -593695,14 +594232,6 @@
    "45bfdcce349e2cb28611520b006c060347fdf58d",
    "testharness"
   ],
-  "staticrange/OWNERS": [
-   "290c71b49f1147778f51898e114db808b4568549",
-   "support"
-  ],
-  "staticrange/idlharness.html": [
-   "16f30a68d97edf19c5255328fd1460ac54a4c025",
-   "testharness"
-  ],
   "storage/OWNERS": [
    "2c585ecaee5e62118d3cb98c98e12d959ebcbd50",
    "support"
@@ -594600,7 +595129,7 @@
    "testharness"
   ],
   "streams/writable-streams/aborting.js": [
-   "f10c4d9ffb59d4480fd069a9ea70ec41f5b71754",
+   "24615519115cde901b8cac1a19c23cd0d9244a17",
    "support"
   ],
   "streams/writable-streams/aborting.serviceworker.https.html": [
@@ -598520,7 +599049,7 @@
    "testharness"
   ],
   "user-timing/invoke_with_timing_attributes.html": [
-   "c946c734573a3e8598389ae854c1d9792e96440c",
+   "05283be9a7230ba0c4af09fb5dac98d828bfaf2e",
    "testharness"
   ],
   "user-timing/invoke_with_timing_attributes.worker.js": [
@@ -598544,7 +599073,7 @@
    "testharness"
   ],
   "user-timing/measure_exceptions_navigation_timing.html": [
-   "e557969014be8b0ed1870e288e7f06f4b2a149a4",
+   "ed9d9be01e740d282ec94379bfd78aca07b56325",
    "testharness"
   ],
   "user-timing/measure_navigation_timing.html": [
@@ -599852,7 +600381,7 @@
    "testharness"
   ],
   "web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html": [
-   "bda186b311457e58c48ca5cf4619f485a41f8e2d",
+   "2c424570af86e1a4541d4f0a67c7693cfcac8abc",
    "testharness"
   ],
   "web-animations/animation-model/keyframe-effects/effect-value-overlapping-keyframes.html": [
@@ -599868,27 +600397,27 @@
    "testharness"
   ],
   "web-animations/interfaces/Animatable/animate.html": [
-   "8d76a26de47494600da40e756a26de61329ff3aa",
+   "4cd816ad368f1dae077f601022f9b57d9cb931ae",
    "testharness"
   ],
   "web-animations/interfaces/Animatable/getAnimations.html": [
-   "9c03f9a6410dc8463a3e3acb3b6e38c26d79b097",
+   "a11049c78d2ca16a9df9d0f21b3a3d0fd35e29f3",
    "testharness"
   ],
   "web-animations/interfaces/Animation/cancel.html": [
-   "38d509e24fa224fc8b937e4a63dd1c404e72b466",
+   "105313dffbe7953ca6b413e860ba8b47e316e0b7",
    "testharness"
   ],
   "web-animations/interfaces/Animation/constructor.html": [
-   "f4dc4fdca61255557ed346412e134745bce1a3ed",
+   "75e8dd9d9d3c96a87cec1abc2c1373537c6e0f77",
    "testharness"
   ],
   "web-animations/interfaces/Animation/effect.html": [
-   "4445fc8bd2120fb1e212dfc6a1fcf786a531ee6f",
+   "db36e79cf6839cda7d6940f21afe2f56d4d9a115",
    "testharness"
   ],
   "web-animations/interfaces/Animation/finished.html": [
-   "ffcba3379db7094455a7798e4d5972d8e52caec5",
+   "a944518bdd0151534f0172ac58034ac613a70249",
    "testharness"
   ],
   "web-animations/interfaces/Animation/id.html": [
@@ -599896,7 +600425,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Animation/idlharness.html": [
-   "d61aa2d95ea31809a275183408e822c8c1eec87d",
+   "b049999bb0512bfa0c3eb8b60176eb9213d663f7",
    "testharness"
   ],
   "web-animations/interfaces/Animation/oncancel.html": [
@@ -599927,44 +600456,12 @@
    "01f669542434f03d37e9f148a4f3135fe3122d46",
    "testharness"
   ],
-  "web-animations/interfaces/AnimationEffectTiming/delay.html": [
-   "4de5b0a692d645961de27df67efa8257adb0a031",
+  "web-animations/interfaces/AnimationEffect/getComputedTiming.html": [
+   "e0d4ba4c0f1a5da4d126c501eca733e00adbef1a",
    "testharness"
   ],
-  "web-animations/interfaces/AnimationEffectTiming/direction.html": [
-   "642207ce454fb816cc47d14fbe29f65d92ddf6ed",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/duration.html": [
-   "14abe09cb19080585a315115e387b85784c7d862",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/easing.html": [
-   "b3ad4c78c9bce0e17db0ce780cd1260de1ce7cb0",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/endDelay.html": [
-   "a8609f22672b092178c2391d7ba7ef804112bef4",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/fill.html": [
-   "1cef601cde33eea3b591a0826ad52f379bb31d0d",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html": [
-   "020e9faaae05de5a25829a05558ea72672b04f63",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/idlharness.html": [
-   "aa9823e5a06c76921b49aa5f5e61fd1dedfac3af",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/iterationStart.html": [
-   "393b37098ab470e75b1254b53875901e705d8d1b",
-   "testharness"
-  ],
-  "web-animations/interfaces/AnimationEffectTiming/iterations.html": [
-   "1e8bb46b5a1eef496edda32b16c856baa16e9b30",
+  "web-animations/interfaces/AnimationEffect/updateTiming.html": [
+   "5daa5580c2d34e992f3560bf5b85419498b6c5ee",
    "testharness"
   ],
   "web-animations/interfaces/AnimationPlaybackEvent/constructor.html": [
@@ -599976,7 +600473,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Document/getAnimations.html": [
-   "12fdbce3e75f5a7d7771d9337089255ef73f9712",
+   "7fbd5eed47955fdaeccd329f82f0884b86654784",
    "testharness"
   ],
   "web-animations/interfaces/Document/timeline.html": [
@@ -599996,23 +600493,23 @@
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/constructor.html": [
-   "2f6449cbf2b47ae457efb23fb52b8fd1709837ac",
+   "38ff2a4b64e7318fa96eb867aae7f25bed53e67b",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/copy-constructor.html": [
-   "6ef462ddc696269f132d596188ffd5e8da1e1164",
+   "0e3d893d7b8e438b279f087846df596256ccbe84",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/idlharness.html": [
-   "f05c9bd1cdee77ff6be143b0eb4f982c7218908b",
+   "ffe493133d4029820f8b27389a15157706b738e8",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/iterationComposite.html": [
-   "65cd746596a6770d1101b030769712be433bf6f3",
+   "c5ce17faeb355f1e9efae516d6272a88c46daa1f",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html": [
-   "f54c7c0da5728f88f37a067761af7ad815fea005",
+   "ca5efb8556aff617bef957be315ea2fd01e756d8",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html": [
@@ -600043,12 +600540,20 @@
    "08da0c81847809328bda0d6e0581711f7838916e",
    "support"
   ],
+  "web-animations/resources/timing-tests.js": [
+   "2da06d9e7ace5947141165284697c4ea9be5b9d5",
+   "support"
+  ],
+  "web-animations/resources/timing-utils.js": [
+   "e0918d83187c0fbdadaebb14be72c6f34f8dfc03",
+   "support"
+  ],
   "web-animations/resources/xhr-doc.py": [
    "de68c45fc1d38a49946f9046f34031e9278a1531",
    "support"
   ],
   "web-animations/testcommon.js": [
-   "6f3e85e7ae7786ad9ff3aaec8c6343642d2510c5",
+   "8f593cc9211bcc0f8f99579e8a3475528f837969",
    "support"
   ],
   "web-animations/timing-model/animation-effects/active-time.html": [
@@ -600064,7 +600569,7 @@
    "testharness"
   ],
   "web-animations/timing-model/animation-effects/phases-and-states.html": [
-   "3edd2c4bdd8409c2c12f08bc998dd8d532e0fd7d",
+   "b8cc580e3e8d17961ffff4b693857f6c333dd57f",
    "testharness"
   ],
   "web-animations/timing-model/animation-effects/simple-iteration-progress.html": [
@@ -600076,7 +600581,7 @@
    "testharness"
   ],
   "web-animations/timing-model/animations/finishing-an-animation.html": [
-   "4c1cf823a81e72541abcafaa08950cf87424ae55",
+   "afe654435332e798b3771b6ec6ca13bcca99e421",
    "testharness"
   ],
   "web-animations/timing-model/animations/pausing-an-animation.html": [
@@ -600112,7 +600617,7 @@
    "testharness"
   ],
   "web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html": [
-   "5575a251b9c265d98471e758b3cf9b218e381cba",
+   "f4e50b805229e0170bff67530b694ee5d6dd1f1a",
    "testharness"
   ],
   "web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html": [
@@ -600124,7 +600629,7 @@
    "testharness"
   ],
   "web-animations/timing-model/animations/updating-the-finished-state.html": [
-   "59e7ed8e4eac5c9edf2526ef748b22e1877b7016",
+   "8eea7caf9f0bf8b9a87b5a6574a28b378054c8db",
    "testharness"
   ],
   "web-animations/timing-model/time-transformations/transformed-progress.html": [
@@ -600495,6 +601000,10 @@
    "99284ab790c09dd7a23a6fa5022e8b08b9e3947d",
    "testharness"
   ],
+  "webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html": [
+   "bf3ebb3a403b24078b7e8c2ff7073dcbc486bb27",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html": [
    "a1cd969fe32a5aca7cd90d0d0955132fd1660b9c",
    "testharness"
@@ -600519,6 +601028,10 @@
    "1561b9eede1ee15126fdd9674a6d9d63194b66c2",
    "support"
   ],
+  "webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js": [
+   "bd6e7a669a2c445ecfd3de4dd6b48a4d84b214cc",
+   "support"
+  ],
   "webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js": [
    "80b817db4e8d3f49e4f5fe6e97f8e687d16f3159",
    "support"
@@ -600996,7 +601509,7 @@
    "wdspec"
   ],
   "webdriver/tests/cookies/add_cookie.py": [
-   "dcf93071762ea0a0cde253dcd5a54eace26619af",
+   "c87dc51111c10bbc29339ba0d1be85fb35ee6d6f",
    "wdspec"
   ],
   "webdriver/tests/cookies/delete_cookie.py": [
@@ -601036,7 +601549,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_retrieval/find_element_from_element.py": [
-   "34f356f2579391289edb31adf5b4d4eb88ffc643",
+   "fa64a4164762861097f11252e8526261038ae1c5",
    "wdspec"
   ],
   "webdriver/tests/element_retrieval/find_elements.py": [
@@ -601044,7 +601557,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-   "b062b9f044268f0d9e092def81afae1277a91cd8",
+   "90be4b09a41b8ba00529a78983fbd64cdb3453ef",
    "wdspec"
   ],
   "webdriver/tests/element_retrieval/get_active_element.py": [
@@ -601204,7 +601717,7 @@
    "support"
   ],
   "webdriver/tests/support/fixtures.py": [
-   "cfae7bac775181b96107346746f0e5b17b4e2eed",
+   "f564352a1d24e685cfe96c5b6f1b986b0dedadfe",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
@@ -601372,7 +601885,7 @@
    "testharness"
   ],
   "webmessaging/broadcastchannel/workers.html": [
-   "c060739cf485439c5648a49c131353f161c24a0c",
+   "ef608ad90a3dfbcdbf3cbb0b51ee8cacfb3a3a65",
    "testharness"
   ],
   "webmessaging/event.data.sub.htm": [
@@ -601423,6 +601936,10 @@
    "19fc5d2f7e0f30e9d35a8606c3fb05b537ea3a82",
    "testharness"
   ],
+  "webmessaging/message-channels/worker.html": [
+   "9c6e11c2a0d5cdbca5682c7be5a23f081f419e0f",
+   "testharness"
+  ],
   "webmessaging/messageerror.html": [
    "92c5359ad64394cb2d30402204968d49227c5daf",
    "testharness"
@@ -602171,6 +602688,10 @@
    "f556c52a5ba7370dfd94f57331d606b147b0932f",
    "testharness"
   ],
+  "websockets/Create-on-worker-shutdown.html": [
+   "e710493c0cd84630a1c853ada23c37908bece9cb",
+   "testharness"
+  ],
   "websockets/Create-protocol-with-space.htm": [
    "923fd2681d86812d63347f995f91747ebec18a44",
    "testharness"
@@ -608640,7 +609161,7 @@
    "testharness"
   ],
   "xhr/responsexml-document-properties.htm": [
-   "3171001d9f35e2524a575d02c581c2cbe813f973",
+   "432b8327dbb09533bb64e8dabf72754d85c25e4f",
    "testharness"
   ],
   "xhr/responsexml-get-twice.htm": [
diff --git a/tests/wpt/metadata/css/css-fonts/calc-in-font-variation-settings.html.ini b/tests/wpt/metadata/css/css-fonts/calc-in-font-variation-settings.html.ini
new file mode 100644
index 00000000000..a1fdcbd2b19
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/calc-in-font-variation-settings.html.ini
@@ -0,0 +1,4 @@
+[calc-in-font-variation-settings.html]
+  [calc() in font-variation-settings]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-013.html.ini b/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-013.html.ini
deleted file mode 100644
index 85e6bf04a53..00000000000
--- a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-013.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css3-text-line-break-opclns-013.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-048.html.ini b/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-048.html.ini
deleted file mode 100644
index 8e23244fd5d..00000000000
--- a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-048.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css3-text-line-break-opclns-048.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-118.html.ini b/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-118.html.ini
deleted file mode 100644
index 6d35f440551..00000000000
--- a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-118.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css3-text-line-break-opclns-118.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-154.html.ini b/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-154.html.ini
deleted file mode 100644
index f83c4887e81..00000000000
--- a/tests/wpt/metadata/css/css-text/i18n/css3-text-line-break-opclns-154.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css3-text-line-break-opclns-154.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-025.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-025.xht.ini
deleted file mode 100644
index 156e95be920..00000000000
--- a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-025.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[line-break-normal-025.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018a.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018a.xht.ini
deleted file mode 100644
index 8e7e8001eed..00000000000
--- a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-018a.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018b.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018b.xht.ini
deleted file mode 100644
index e98130a0672..00000000000
--- a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-018b.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-012.html.ini b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-012.html.ini
new file mode 100644
index 00000000000..6fd167de2a7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-012.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-012.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-normal-002.xht.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-normal-002.xht.ini
deleted file mode 100644
index 5670f4380e8..00000000000
--- a/tests/wpt/metadata/css/css-text/word-break/word-break-normal-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-break-normal-002.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/dom/interfaces.html.ini b/tests/wpt/metadata/dom/interfaces.html.ini
index 41e5ae4d90e..a1bd285b66b 100644
--- a/tests/wpt/metadata/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/dom/interfaces.html.ini
@@ -864,3 +864,60 @@
   [CDATASection interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [AbstractRange interface: existence and properties of interface object]
+    expected: FAIL
+
+  [AbstractRange interface object length]
+    expected: FAIL
+
+  [AbstractRange interface object name]
+    expected: FAIL
+
+  [AbstractRange interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [AbstractRange interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [AbstractRange interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [AbstractRange interface: attribute startContainer]
+    expected: FAIL
+
+  [AbstractRange interface: attribute startOffset]
+    expected: FAIL
+
+  [AbstractRange interface: attribute endContainer]
+    expected: FAIL
+
+  [AbstractRange interface: attribute endOffset]
+    expected: FAIL
+
+  [AbstractRange interface: attribute collapsed]
+    expected: FAIL
+
+  [StaticRange interface: existence and properties of interface object]
+    expected: FAIL
+
+  [StaticRange interface object length]
+    expected: FAIL
+
+  [StaticRange interface object name]
+    expected: FAIL
+
+  [StaticRange interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [StaticRange interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [StaticRange interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Range interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Range interface: existence and properties of interface prototype object]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini b/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
index 446edf226de..15cf180a2a8 100644
--- a/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
@@ -21,3 +21,6 @@
   [Input request used for creating new request became disturbed even if body is not used]
     expected: FAIL
 
+  [Check creating a new request with a new body from a disturbed request]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js.ini b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js.ini
new file mode 100644
index 00000000000..2b0d48b437e
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js.ini
@@ -0,0 +1,22 @@
+[type-argument.window.html]
+  [document.open() with type set to: NOBODY (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: @ FD ; (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: it does not matter, you see \x0c (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: text/plain (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: text/xml (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: application/octet-stream (type argument is supposed to be ignored)]
+    expected: FAIL
+
+  [document.open() with type set to: \x00 (type argument is supposed to be ignored)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/submit-file.sub.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/submit-file.sub.html.ini
new file mode 100644
index 00000000000..a2d487c0e97
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/submit-file.sub.html.ini
@@ -0,0 +1,4 @@
+[submit-file.sub.html]
+  [Posting a File]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/Create-on-worker-shutdown.html.ini b/tests/wpt/metadata/websockets/Create-on-worker-shutdown.html.ini
new file mode 100644
index 00000000000..64c1b5de121
--- /dev/null
+++ b/tests/wpt/metadata/websockets/Create-on-worker-shutdown.html.ini
@@ -0,0 +1,5 @@
+[Create-on-worker-shutdown.html]
+  expected: TIMEOUT
+  [WebSocket created after a worker self.close()]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
deleted file mode 100644
index 1e2567027d8..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[rapid-resizing.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html b/tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html
new file mode 100644
index 00000000000..1b6dcfce0b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+async_test(t => {
+  function workerCode() {
+    close();
+    var blob = new Blob([123]);
+    var fr = new FileReader();
+    fr.readAsText(blob);
+    fr.abort()
+    fr.readAsArrayBuffer(blob);
+    postMessage(true);
+  }
+
+  var workerBlob = new Blob([workerCode.toSource() + ";workerCode();"], {type:"application/javascript"});
+
+  var w = new Worker(URL.createObjectURL(workerBlob));
+  w.onmessage = function(e) {
+    assert_true(e.data, "FileReader created during worker shutdown.");
+    t.done();
+  }
+}, 'FileReader created after a worker self.close()');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/IndexedDB/README.md b/tests/wpt/web-platform-tests/IndexedDB/README.md
index 6b636d5f1a4..18f067b18b2 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/README.md
+++ b/tests/wpt/web-platform-tests/IndexedDB/README.md
@@ -1,8 +1,8 @@
 This directory contains the Indexed Database API test suite.
 
-To run the tests in this test suite within a browser, go to: <http://w3c-test.org/IndexedDB/>.
+To run the tests in this test suite within a browser, go to: <https://w3c-test.org/IndexedDB/>.
 
-The latest Editor's Draft of Indexed Database API is: <http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html>.
+The latest Editor's Draft of Indexed Database API is: <https://w3c.github.io/IndexedDB/>.
 
-The latest W3C Technical Report of Indexed Database API is: <http://www.w3.org/TR/IndexedDB/>.
+The latest W3C Technical Report of Indexed Database API is: <https://www.w3.org/TR/IndexedDB/>.
 
diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-helpers.js b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-helpers.js
index 56357043ba7..7b23742fc4c 100644
--- a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-helpers.js
+++ b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-helpers.js
@@ -42,6 +42,7 @@ function performChromiumSetup() {
     `${prefix}/mojo_layouttest_test.mojom.js`,
     `${prefix}/uuid.mojom.js`,
     `${prefix}/fake_bluetooth.mojom.js`,
+    `${prefix}/fake_bluetooth_chooser.mojom.js`,
     `${prefix}/web-bluetooth-test.js`,
   ].concat(extra))
       // Call setBluetoothFakeAdapter() to clean up any fake adapters left over
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
new file mode 100644
index 00000000000..447dd2861c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
@@ -0,0 +1,33 @@
+<html>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+
+// When the response for the HTML file contains "Accept-CH" in the response
+// headers, then the browser should not attach the specified client hints in
+// the HTTP request headers if the response was delivered by an insecure HTTP
+// server. Test this functionality by fetching an XHR from this page hosted on
+// an insecure HTTP server. The response headers for this page include
+// "Accept-CH: device-memory, dpr, viewport-width".
+//
+// echo_client_hints_received.py includes "device-memory-received",
+// "dpr-received" and "viewport-width-received" in the response headers
+// depending on the set of client hints it receives in the request headers.
+
+  promise_test(t => {
+  return fetch("/client-hints/echo_client_hints_received.py").then(r => {
+    assert_equals(r.status, 200)
+    // Verify that the browser does not include client hints in the headers
+    // when fetching the XHR from an insecure HTTP server.
+    assert_false(r.headers.has("device-memory-received"));
+    assert_false(r.headers.has("dpr-received"));
+    assert_false(r.headers.has("viewport-width-received"));
+  });
+}, "Accept-CH header test");
+
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
new file mode 100644
index 00000000000..38f4f33be8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
@@ -0,0 +1 @@
+Accept-CH: device-memory, dpr, viewport-width
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html b/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html
deleted file mode 100644
index c0f0581dedb..00000000000
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script>
-
-// If the response for the HTML file contains "Accept-CH: device-memory" in
-// the response headers, then the browser should attach device-memory client
-// hint in the HTTP request headers. Test this functionality by fetching an
-// XHR from this page. The response headers for this page include
-// "Accept-CH: device-memory".
-//
-// echo_device_memory_header_received.py includes "device-memory-received" in
-// the response headers only if the request included "device-memory" in the
-// headers.
-
-  promise_test(t => {
-  return fetch("/client-hints/echo_device_memory_header_received.py").then(r => {
-    assert_equals(r.status, 200)
-    // Verify that the browser included "device-memory" in the headers when
-    // fetching the XHR.
-    assert_true(r.headers.has("device-memory-received"));
-  });
-}, "Accept-CH header test");
-
-</script>
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html.headers b/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html.headers
deleted file mode 100644
index 401e1af283c..00000000000
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: device-memory
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
new file mode 100644
index 00000000000..68263267bd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
@@ -0,0 +1,32 @@
+<html>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+
+// If the response for the HTML file contains "Accept-CH" in the response
+// headers, then the browser should attach the specified client hints in the
+// HTTP request headers. Test this functionality by fetching an
+// XHR from this page. The response headers for this page include
+// "Accept-CH: device-memory, dpr, viewport-width".
+//
+// echo_client_hints_received.py includes "device-memory-received",
+// "dpr-received" and "viewport-width-received" in the response headers
+// depending on the set of client hints it receives in the request headers.
+
+  promise_test(t => {
+  return fetch("https://{{domains[]}}:{{ports[https][0]}}/client-hints/echo_client_hints_received.py", {"mode": "no-cors"}).then(r => {
+    assert_equals(r.status, 200)
+    // Verify that the browser includes client hints in the headers when
+    // fetching the XHR.
+    assert_true(r.headers.has("device-memory-received"), "device-memory-received");
+    assert_true(r.headers.has("dpr-received"), "dpr-received");
+    assert_true(r.headers.has("viewport-width-received"), "viewport-width-received");
+  });
+}, "Accept-CH header test");
+
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
new file mode 100644
index 00000000000..38f4f33be8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
@@ -0,0 +1 @@
+Accept-CH: device-memory, dpr, viewport-width
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/echo_device_memory_header_received.py b/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
similarity index 56%
rename from tests/wpt/web-platform-tests/client-hints/echo_device_memory_header_received.py
rename to tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
index 0ab4368cf0b..a787fed1658 100644
--- a/tests/wpt/web-platform-tests/client-hints/echo_device_memory_header_received.py
+++ b/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
@@ -5,4 +5,8 @@ def main(request, response):
     """
 
     if "device-memory" in request.headers:
-            response.headers.set("device-memory-received", "true")
\ No newline at end of file
+            response.headers.set("device-memory-received", "true")
+    if "dpr" in request.headers:
+            response.headers.set("dpr-received", "true")
+    if "viewport-width" in request.headers:
+            response.headers.set("viewport-width-received", "true")
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/config.default.json b/tests/wpt/web-platform-tests/config.default.json
index 6c49b77de1c..c8bbe14ce44 100644
--- a/tests/wpt/web-platform-tests/config.default.json
+++ b/tests/wpt/web-platform-tests/config.default.json
@@ -8,7 +8,7 @@
           "wss":["auto"]},
  "check_subdomains": true,
  "log_level":"debug",
- "bind_hostname": true,
+ "bind_address": true,
  "ssl": {"type": "pregenerated",
          "encrypt_after_connect": false,
          "openssl": {
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/Makefile b/tests/wpt/web-platform-tests/conformance-checkers/Makefile
index 161c8db7d57..879b023c6ea 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/Makefile
+++ b/tests/wpt/web-platform-tests/conformance-checkers/Makefile
@@ -7,7 +7,7 @@ EXPAND=expand
 EXPANDFLAGS=
 GIT=git
 GITFLAGS=
-PYTHON=python
+PYTHON=python3
 PYTHONFLAGS=
 VNU_TEST_REPO=git@github.com:validator/tests.git
 ITS_REPO=git@github.com:w3c/its-2.0-testsuite-inputdata.git
@@ -24,7 +24,7 @@ README.md: index.html
 	    | $(EXPAND) $(EXPANDFLAGS) > $@
 
 messages.json: .FORCE
-	$(PYTHON) $(PYTHONFLAGS) -mjson.tool $@ > $@.tmp
+	$(PYTHON) $(PYTHONFLAGS) -mjson.tool --sort-keys $@ > $@.tmp
 	mv $@.tmp $@
 
 push:
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index e818ba76b54..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid href: scheme-javascript-no-slash-malformed</title>
-<a href="javascript:example.com/"></a>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index bb12e65f532..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid href: scheme-javascript-no-slash-malformed</title>
-<map name=foo><area href="javascript:example.com/" alt></map>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 7d37b16afcb..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<audio src="javascript:example.com/"></audio>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 16b4187b80d..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid href: scheme-javascript-no-slash-malformed</title>
-<base href="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 71df3f36e1d..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid cite: scheme-javascript-no-slash-malformed</title>
-<blockquote cite="javascript:example.com/"></blockquote>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 74c1cbc8872..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid formaction: scheme-javascript-no-slash-malformed</title>
-<button formaction="javascript:example.com/"></button>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 4328b02e9b3..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid cite: scheme-javascript-no-slash-malformed</title>
-<del cite="javascript:example.com/"></del>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 52aff9fb792..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<embed src="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index bc66953ab7d..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid action: scheme-javascript-no-slash-malformed</title>
-<form action="javascript:example.com/"></form>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 6424e83c0f0..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<iframe src="javascript:example.com/"></iframe>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 00a8c885719..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<img src="javascript:example.com/" alt>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 727da488fc7..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid formaction: scheme-javascript-no-slash-malformed</title>
-<input type=image alt="foo" formaction="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index f22ebf50226..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<input type=image alt="foo" src="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index fe2c0ce719c..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid formaction: scheme-javascript-no-slash-malformed</title>
-<input type=submit formaction="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 73c7e6adf4d..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid value attribute: scheme-javascript-no-slash-malformed</title>
-<input type=url value="javascript:example.com/">
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 267f1131ace..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid cite: scheme-javascript-no-slash-malformed</title>
-<ins cite="javascript:example.com/"></ins>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 6cf49ca2367..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid href: scheme-javascript-no-slash-malformed</title>
-<link href="javascript:example.com/" rel=help>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index aa277965975..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid data: scheme-javascript-no-slash-malformed</title>
-<object data="javascript:example.com/"></object>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index a142b0040b2..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid cite: scheme-javascript-no-slash-malformed</title>
-<q cite="javascript:example.com/"></q>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 6e85d80fee4..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<script src="javascript:example.com/"></script>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 6516b42310d..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<video><source src="javascript:example.com/"></video>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 13a633d3708..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<video><track src="javascript:example.com/"></video>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index af5c83dd2d6..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid poster: scheme-javascript-no-slash-malformed</title>
-<video poster="javascript:example.com/"></video>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index adc7a878982..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid src: scheme-javascript-no-slash-malformed</title>
-<video src="javascript:example.com/"></video>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 3bf1c6516a5..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid itemid: scheme-javascript-no-slash-malformed</title>
-<div itemid="javascript:example.com/" itemtype="http://foo" itemscope></div>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html
deleted file mode 100644
index 5110c6d35b2..00000000000
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>invalid itemtype: scheme-javascript-no-slash-malformed</title>
-<div itemtype="javascript:example.com/" itemscope></div>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/messages.json b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
index fc85b29fd1d..73e1d6910fc 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/messages.json
+++ b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
@@ -144,7 +144,6 @@
     "html/elements/a/href/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Unexpected token.",
     "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -214,7 +213,6 @@
     "html/elements/area/href/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Unexpected token.",
     "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -284,7 +282,6 @@
     "html/elements/audio/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Unexpected token.",
     "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -350,7 +347,6 @@
     "html/elements/base/href/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Unexpected token.",
     "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -416,7 +412,6 @@
     "html/elements/blockquote/cite/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Unexpected token.",
     "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -485,7 +480,6 @@
     "html/elements/button/formaction/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Unexpected token.",
     "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -553,7 +547,6 @@
     "html/elements/del/cite/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Unexpected token.",
     "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -749,7 +742,6 @@
     "html/elements/embed/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Unexpected token.",
     "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -820,7 +812,6 @@
     "html/elements/form/action/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Unexpected token.",
     "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -898,7 +889,6 @@
     "html/elements/iframe/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Unexpected token.",
     "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -966,7 +956,6 @@
     "html/elements/img/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Unexpected token.",
     "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1038,7 +1027,6 @@
     "html/elements/input/type-image-formaction/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Unexpected token.",
     "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1105,7 +1093,6 @@
     "html/elements/input/type-image-src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Unexpected token.",
     "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1172,7 +1159,6 @@
     "html/elements/input/type-submit-formaction/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Unexpected token.",
     "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1246,7 +1232,6 @@
     "html/elements/input/type-url-value/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
-    "html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Unexpected token.",
     "html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": "Bad value \u201c//foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c//foo/bar\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
@@ -1312,7 +1297,6 @@
     "html/elements/ins/cite/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Unexpected token.",
     "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1485,7 +1469,6 @@
     "html/elements/link/href/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Unexpected token.",
     "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1554,7 +1537,6 @@
     "html/elements/object/data/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Unexpected token.",
     "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1822,7 +1804,6 @@
     "html/elements/q/cite/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Unexpected token.",
     "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1894,7 +1875,6 @@
     "html/elements/script/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Unexpected token.",
     "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -1962,7 +1942,6 @@
     "html/elements/source/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Unexpected token.",
     "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -2049,7 +2028,6 @@
     "html/elements/track/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Unexpected token.",
     "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -2119,7 +2097,6 @@
     "html/elements/video/poster/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Unexpected token.",
     "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -2184,7 +2161,6 @@
     "html/elements/video/src/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Unexpected token.",
     "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -2272,7 +2248,6 @@
     "html/microdata/itemid/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
-    "html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Unexpected token.",
     "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
     "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
@@ -2344,7 +2319,6 @@
     "html/microdata/itemtype/scheme-http-single-slash-novalid.html": "Bad value \u201chttp:/example.com/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/microdata/itemtype/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/microdata/itemtype/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Expected a slash (\"/\").",
-    "html/microdata/itemtype/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Unexpected token.",
     "html/microdata/itemtype/scheme-schemeless-relative-novalid.html": "Bad value \u201c//foo/bar\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c//foo/bar\u201d is not an absolute URL.",
     "html/microdata/itemtype/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/tools/url.py b/tests/wpt/web-platform-tests/conformance-checkers/tools/url.py
index 1f59c025209..df31eab22af 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/tools/url.py
+++ b/tests/wpt/web-platform-tests/conformance-checkers/tools/url.py
@@ -17,7 +17,6 @@ invalid = {
     "scheme-data-single-slash": "data:/example.com/",
     "scheme-ftp-no-slash": "ftp:example.com/",
     "scheme-https-no-slash": "https:example.com/",
-    "scheme-javascript-no-slash-malformed": "javascript:example.com/",
     "userinfo-password-bad-chars": "http://&a:foo(b]c@d:2/",
     "userinfo-username-contains-at-sign": "http://::@c@d:2",
     "userinfo-backslash": "http://a\\b:c\\d@foo.com",
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.window.js
new file mode 100644
index 00000000000..bcb698eeb0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.window.js
@@ -0,0 +1,65 @@
+'use strict';
+
+test(() => {
+  const event = new CookieChangeEvent('change');
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 0);
+  assert_equals(event.deleted.length, 0);
+}, 'CookieChangeEvent construction with default arguments');
+
+test(() => {
+  const event = new CookieChangeEvent('change', {
+    changed: [
+      { name: 'changed-name1', value: 'changed-value1' },
+      { name: 'changed-name2', value: 'changed-value2' },
+    ],
+  });
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 2);
+  assert_equals(event.changed[0].name, 'changed-name1');
+  assert_equals(event.changed[0].value, 'changed-value1');
+  assert_equals(event.changed[1].name, 'changed-name2');
+  assert_equals(event.changed[1].value, 'changed-value2');
+  assert_equals(event.deleted.length, 0);
+}, 'CookieChangeEvent construction with changed cookie list');
+
+test(() => {
+  const event = new CookieChangeEvent('change', {
+    deleted: [
+      { name: 'deleted-name1', value: 'deleted-value1' },
+      { name: 'deleted-name2', value: 'deleted-value2' },
+    ],
+  });
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 0);
+  assert_equals(event.deleted.length, 2);
+  assert_equals(event.deleted[0].name, 'deleted-name1');
+  assert_equals(event.deleted[0].value, 'deleted-value1');
+  assert_equals(event.deleted[1].name, 'deleted-name2');
+  assert_equals(event.deleted[1].value, 'deleted-value2');
+}, 'CookieChangeEvent construction with deleted cookie list');
+
+test(() => {
+  const event = new CookieChangeEvent('change', {
+    changed: [
+      { name: 'changed-name1', value: 'changed-value1' },
+      { name: 'changed-name2', value: 'changed-value2' },
+    ],
+    deleted: [
+      { name: 'deleted-name1', value: 'deleted-value1' },
+    ],
+  });
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 2);
+  assert_equals(event.changed[0].name, 'changed-name1');
+  assert_equals(event.changed[0].value, 'changed-value1');
+  assert_equals(event.changed[1].name, 'changed-name2');
+  assert_equals(event.changed[1].value, 'changed-value2');
+  assert_equals(event.deleted.length, 1);
+  assert_equals(event.deleted[0].name, 'deleted-name1');
+  assert_equals(event.deleted[0].value, 'deleted-value1');
+}, 'CookieChangeEvent construction with changed and deleted cookie lists');
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.window.js
new file mode 100644
index 00000000000..306fc1e5d00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.window.js
@@ -0,0 +1,29 @@
+'use strict';
+
+// Workaround because add_cleanup doesn't support async functions yet.
+// See https://github.com/w3c/web-platform-tests/issues/6075
+async function async_cleanup(cleanup_function) {
+  try {
+    await cleanup_function();
+  } catch (e) {
+    // Errors in cleanup functions shouldn't result in test failures.
+  }
+}
+
+promise_test(async testCase => {
+  const eventPromise = new Promise((resolve) => {
+    cookieStore.onchange = resolve;
+  });
+
+  await cookieStore.set('cookie-name', 'cookie-value');
+
+  const event = await eventPromise;
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'cookie-value');
+  assert_equals(event.deleted.length, 0);
+
+  await async_cleanup(() => cookieStore.delete('cookie-name'));
+}, 'cookieStore fires change event for cookie set by cookieStore.set()');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.tenative.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.tenative.window.js
new file mode 100644
index 00000000000..de544491c56
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.tenative.window.js
@@ -0,0 +1,31 @@
+'use strict';
+
+// Workaround because add_cleanup doesn't support async functions yet.
+// See https://github.com/w3c/web-platform-tests/issues/6075
+async function async_cleanup(cleanup_function) {
+  try {
+    await cleanup_function();
+  } catch (e) {
+    // Errors in cleanup functions shouldn't result in test failures.
+  }
+}
+
+promise_test(async testCase => {
+  await cookieStore.set('cookie-name', 'cookie-value');
+
+  const eventPromise = new Promise((resolve) => {
+    cookieStore.onchange = resolve;
+  });
+  await cookieStore.delete('cookie-name');
+  const event = await eventPromise;
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.deleted.length, 1);
+  assert_equals(event.deleted[0].name, 'cookie-name');
+  assert_equals(
+      event.deleted[0].value, undefined,
+      'Cookie change events for deletions should not have cookie values');
+  assert_equals(event.changed.length, 0);
+
+  await async_cleanup(() => cookieStore.delete('cookie-name'));
+}, 'cookieStore fires change event for cookie deleted by cookieStore.delete()');
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.tentative.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.tentative.window.js
new file mode 100644
index 00000000000..8e8c9c1dd7b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.tentative.window.js
@@ -0,0 +1,31 @@
+'use strict';
+
+// Workaround because add_cleanup doesn't support async functions yet.
+// See https://github.com/w3c/web-platform-tests/issues/6075
+async function async_cleanup(cleanup_function) {
+  try {
+    await cleanup_function();
+  } catch (e) {
+    // Errors in cleanup functions shouldn't result in test failures.
+  }
+}
+
+promise_test(async testCase => {
+  await cookieStore.set('cookie-name', 'cookie-value');
+
+  const eventPromise = new Promise((resolve) => {
+    cookieStore.onchange = resolve;
+  });
+
+  await cookieStore.set('cookie-name', 'new-cookie-value');
+
+  const event = await eventPromise;
+  assert_true(event instanceof CookieChangeEvent);
+  assert_equals(event.type, 'change');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'new-cookie-value');
+  assert_equals(event.deleted.length, 0);
+
+  await async_cleanup(() => cookieStore.delete('cookie-name'));
+}, 'cookieStore fires change event for cookie overwritten by cookieStore.set()');
diff --git a/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html b/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
index 00dc29d7d49..648d567a9e9 100644
--- a/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
+++ b/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
@@ -21,6 +21,9 @@ promise_test(async t => {
   idl_array.add_untested_idls('interface LinkStyle {};');
   idl_array.add_untested_idls(html);
 
+  idl_array.add_untested_idls('interface Event {};');
+  idl_array.add_untested_idls('dictionary EventInit {};');
+  idl_array.add_untested_idls('interface EventTarget {};');
   idl_array.add_untested_idls(
     `[Global=ServiceWorker, Exposed=ServiceWorker]
      interface ServiceWorkerGlobalScope {};`);
@@ -29,6 +32,7 @@ promise_test(async t => {
 
   idl_array.add_objects({
     CookieStore: [self.cookieStore],
+    CookieChangeEvent: [new CookieChangeEvent('change')],
   });
   idl_array.test();
 }, 'Interface test');
diff --git a/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js b/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
index aa2e79a9de7..e2e838dc7e6 100644
--- a/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
+++ b/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
@@ -13,6 +13,14 @@ promise_test(async t => {
 
   const idl_array = new IdlArray();
 
+  idl_array.add_untested_idls(
+    `[Global=Event, Exposed=ServiceWorker]
+     interface Event {};`);
+  idl_array.add_untested_idls('dictionary EventHandler {};');
+  idl_array.add_untested_idls('dictionary EventInit {};');
+  idl_array.add_untested_idls(
+    `[Global=EventTarget, Exposed=ServiceWorker]
+     interface EventTarget {};`);
   idl_array.add_untested_idls(
     `[Global=ServiceWorker, Exposed=ServiceWorker]
      interface ServiceWorkerGlobalScope {};`);
@@ -24,6 +32,7 @@ promise_test(async t => {
 
   idl_array.add_objects({
     CookieStore: [self.cookieStore],
+    CookieChangeEvent: [new CookieChangeEvent('change')],
   });
   idl_array.test();
 }, 'Interface test');
diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html
new file mode 100644
index 00000000000..8a2fbb28ac9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Unresolvable percentage min-height</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#min-max-heights" title="10.7 Minimum and maximum heights: 'min-height' and 'max-height'">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<div id="container" style="width:100px; height:30000px; max-height:100%;" data-expected-height="30000">
+  <div style="height:12345px;"></div>
+</div>
+<script>
+  checkLayout("#container");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html
new file mode 100644
index 00000000000..5201eddb211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Unresolvable percentage min-height</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#min-max-heights" title="10.7 Minimum and maximum heights: 'min-height' and 'max-height'">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<p>There should be a blue square below.</p>
+<div id="container" style="width:100px; max-height:100px; min-height:100%; background:blue;" data-expected-height="100">
+  <div style="height:300px;"></div>
+</div>
+<script>
+  checkLayout("#container");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html
index f0bcea4d98d..a0a92a911e2 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html
@@ -11,6 +11,7 @@
   #columnGapVw { column-gap: 2vw; }
   #columnGapPercent { column-gap: 15%; }
   #columnGapCalc { column-gap: calc(10px + 4px); }
+  #columnGapCalcFixedPercent { column-gap: calc(5px + 10%); }
   .columnGapInitial { column-gap: initial; }
   .columnGapInherit { column-gap: inherit; }
 
@@ -31,6 +32,7 @@
   <div id="columnGapVw"></div>
   <div id="columnGapPercent"></div>
   <div id="columnGapCalc"></div>
+  <div id="columnGapCalcFixedPercent"></div>
   <div id="columnGapInitial" class="columnGapInitial"></div>
   <div class="columnGapPx">
     <div id="columnGapInitialPx" class="columnGapInitial"></div>
@@ -81,6 +83,11 @@
         var target = document.getElementById("columnGapCalc");
         assert_equals(getComputedStyle(target).columnGap, "14px");
       }, "column-gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("columnGapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).columnGap, "calc(5px + 10%)");
+      }, "column-gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("columnGapInitial");
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html
index 48856128184..0a2a9bda7c6 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html
@@ -16,6 +16,7 @@
   #gapPercent { gap: 15%; }
   #gapPercentTwo { gap: 15% 10%; }
   #gapCalc { gap: calc(10px + 4px); }
+  #gapCalcFixedPercent { gap: calc(5px + 10%); }
   #gapCalcTwo { gap: calc(10px + 4px) calc(20px - 8px); }
   .gapInitial { gap: initial; }
   .gapInherit { gap: inherit; }
@@ -44,6 +45,7 @@
   <div id="gapPercent"></div>
   <div id="gapPercentTwo"></div>
   <div id="gapCalc"></div>
+  <div id="gapCalcFixedPercent"></div>
   <div id="gapCalcTwo"></div>
   <div id="gapInitial" class="gapInitial"></div>
   <div class="gapPx">
@@ -135,6 +137,12 @@
         assert_equals(getComputedStyle(target).rowGap, "14px");
         assert_equals(getComputedStyle(target).columnGap, "14px");
       }, "gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("gapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).rowGap, "calc(5px + 10%)");
+        assert_equals(getComputedStyle(target).columnGap, "calc(5px + 10%)");
+      }, "gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("gapCalcTwo");
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html
index a552463950c..66d81998b66 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html
@@ -1,26 +1,27 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Box Alignment Test: column-gap parsing</title>
+<title>CSS Box Alignment Test: grid-column-gap parsing</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-legacy">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
-  .columnGapPx { column-gap: 12px; }
-  #columnGapEm { column-gap: 2em; font: 10px/1 Monospace; }
-  #columnGapVw { column-gap: 2vw; }
-  #columnGapPercent { column-gap: 15%; }
-  #columnGapCalc { column-gap: calc(10px + 4px); }
-  .columnGapInitial { column-gap: initial; }
-  .columnGapInherit { column-gap: inherit; }
+  .columnGapPx { grid-column-gap: 12px; }
+  #columnGapEm { grid-column-gap: 2em; font: 10px/1 Monospace; }
+  #columnGapVw { grid-column-gap: 2vw; }
+  #columnGapPercent { grid-column-gap: 15%; }
+  #columnGapCalc { grid-column-gap: calc(10px + 4px); }
+  #columnGapCalcFixedPercent { grid-column-gap: calc(5px + 10%); }
+  .columnGapInitial { grid-column-gap: initial; }
+  .columnGapInherit { grid-column-gap: inherit; }
 
-  #invalidColumnGapNegative { column-gap: -10px; }
-  #invalidColumnGapMaxContent { column-gap: max-content; }
-  #invalidColumnGapNone { column-gap: none; }
-  #invalidColumnGapMultiple { column-gap: 10px 1px; }
-  #invalidColumnGapAngle { column-gap: 3rad; }
-  #invalidColumnGapResolution { column-gap: 2dpi; }
-  #invalidColumnGapTime { column-gap: 200ms; }
+  #invalidColumnGapNegative { grid-column-gap: -10px; }
+  #invalidColumnGapMaxContent { grid-column-gap: max-content; }
+  #invalidColumnGapNone { grid-column-gap: none; }
+  #invalidColumnGapMultiple { grid-column-gap: 10px 1px; }
+  #invalidColumnGapAngle { grid-column-gap: 3rad; }
+  #invalidColumnGapResolution { grid-column-gap: 2dpi; }
+  #invalidColumnGapTime { grid-column-gap: 200ms; }
 </style>
 <body>
   <div id="log"></div>
@@ -31,6 +32,7 @@
   <div id="columnGapVw"></div>
   <div id="columnGapPercent"></div>
   <div id="columnGapCalc"></div>
+  <div id="columnGapCalcFixedPercent"></div>
   <div id="columnGapInitial" class="columnGapInitial"></div>
   <div class="columnGapPx">
     <div id="columnGapInitialPx" class="columnGapInitial"></div>
@@ -53,91 +55,96 @@
       function(){
         var target = document.getElementById("default");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Default column-gap is 'normal'");
+      }, "Default grid-column-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("columnGapPx");
         assert_equals(getComputedStyle(target).columnGap, "12px");
-      }, "column-gap accepts pixels");
+      }, "grid-column-gap accepts pixels");
     test(
       function(){
         var target = document.getElementById("columnGapEm");
         assert_equals(getComputedStyle(target).columnGap, "20px");
-      }, "column-gap accepts em");
+      }, "grid-column-gap accepts em");
     test(
       function(){
         var target = document.getElementById("columnGapVw");
         // The columnGap size would depend on the viewport width, so to make the test pass
         // in any window size we just check it's not "normal".
         assert_not_equals(getComputedStyle(target).columnGap, "normal");
-      }, "column-gap accepts vw");
+      }, "grid-column-gap accepts vw");
     test(
       function(){
         var target = document.getElementById("columnGapPercent");
         assert_equals(getComputedStyle(target).columnGap, "15%");
-      }, "column-gap accepts percentage");
+      }, "grid-column-gap accepts percentage");
     test(
       function(){
         var target = document.getElementById("columnGapCalc");
         assert_equals(getComputedStyle(target).columnGap, "14px");
-      }, "column-gap accepts calc()");
+      }, "grid-column-gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("columnGapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).columnGap, "calc(5px + 10%)");
+      }, "grid-column-gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("columnGapInitial");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial column-gap is 'normal'");
+      }, "Initial grid-column-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("columnGapInitialPx");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial column-gap is 'normal' 2");
+      }, "Initial grid-column-gap is 'normal' 2");
     test(
       function(){
         var target = document.getElementById("columnGapInherit");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial inherited column-gap is 'normal'");
+      }, "Initial inherited grid-column-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("columnGapInheritPx");
         assert_equals(getComputedStyle(target).columnGap, "12px");
-      }, "column-gap is inheritable");
+      }, "grid-column-gap is inheritable");
 
 
     test(
       function(){
         var target = document.getElementById("invalidColumnGapNegative");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Negative column-gap is invalid");
+      }, "Negative grid-column-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapMaxContent");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "'max-content' column-gap is invalid");
+      }, "'max-content' grid-column-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapNone");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "'none' column-gap is invalid");
+      }, "'none' grid-column-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapMultiple");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "column-gap with multiple values is invalid");
+      }, "grid-column-gap with multiple values is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapAngle");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Angle column-gap is invalid");
+      }, "Angle grid-column-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapResolution");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Resolution column-gap is invalid");
+      }, "Resolution grid-column-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidColumnGapTime");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Time column-gap is invalid");
+      }, "Time grid-column-gap is invalid");
   </script>
 </body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html
index 614b23a7a4f..aa43f772996 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html
@@ -16,6 +16,7 @@
   #gapPercent { grid-gap: 15%; }
   #gapPercentTwo { grid-gap: 15% 10%; }
   #gapCalc { grid-gap: calc(10px + 4px); }
+  #gapCalcFixedPercent { grid-gap: calc(5px + 10%); }
   #gapCalcTwo { grid-gap: calc(10px + 4px) calc(20px - 8px); }
   .gapInitial { grid-gap: initial; }
   .gapInherit { grid-gap: inherit; }
@@ -44,6 +45,7 @@
   <div id="gapPercent"></div>
   <div id="gapPercentTwo"></div>
   <div id="gapCalc"></div>
+  <div id="gapCalcFixedPercent"></div>
   <div id="gapCalcTwo"></div>
   <div id="gapInitial" class="gapInitial"></div>
   <div class="gapPx">
@@ -70,37 +72,37 @@
         var target = document.getElementById("default");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Default gap is 'normal'");
+      }, "Default grid-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("gapPx");
         assert_equals(getComputedStyle(target).rowGap, "12px");
         assert_equals(getComputedStyle(target).columnGap, "12px");
-      }, "gap accepts pixels");
+      }, "grid-gap accepts pixels");
     test(
       function(){
         var target = document.getElementById("gapPxTwo");
         assert_equals(getComputedStyle(target).rowGap, "12px");
         assert_equals(getComputedStyle(target).columnGap, "8px");
-      }, "gap accepts pixels 2");
+      }, "grid-gap accepts pixels 2");
     test(
       function(){
         var target = document.getElementById("gapPxPercent");
         assert_equals(getComputedStyle(target).rowGap, "12px");
         assert_equals(getComputedStyle(target).columnGap, "10%");
-      }, "gap accepts pixels combined with percentage");
+      }, "grid-gap accepts pixels combined with percentage");
     test(
       function(){
         var target = document.getElementById("gapEm");
         assert_equals(getComputedStyle(target).rowGap, "20px");
         assert_equals(getComputedStyle(target).columnGap, "20px");
-      }, "gap accepts em");
+      }, "grid-gap accepts em");
     test(
       function(){
         var target = document.getElementById("gapEmTwo");
         assert_equals(getComputedStyle(target).rowGap, "20px");
         assert_equals(getComputedStyle(target).columnGap, "40px");
-      }, "gap accepts em 2");
+      }, "grid-gap accepts em 2");
     test(
       function(){
         var target = document.getElementById("gapVw");
@@ -108,7 +110,7 @@
         // in any window size we just check it's not "normal".
         assert_not_equals(getComputedStyle(target).rowGap, "normal");
         assert_not_equals(getComputedStyle(target).columnGap, "normal");
-      }, "gap accepts vw");
+      }, "grid-gap accepts vw");
     test(
       function(){
         var target = document.getElementById("gapVwTwo");
@@ -116,110 +118,116 @@
         // in any window size we just check it's not "normal".
         assert_not_equals(getComputedStyle(target).rowGap, "normal");
         assert_not_equals(getComputedStyle(target).columnGap, "normal");
-      }, "gap accepts vw and vh");
+      }, "grid-gap accepts vw and vh");
     test(
       function(){
         var target = document.getElementById("gapPercent");
         assert_equals(getComputedStyle(target).rowGap, "15%");
         assert_equals(getComputedStyle(target).columnGap, "15%");
-      }, "gap accepts percentage");
+      }, "grid-gap accepts percentage");
     test(
       function(){
         var target = document.getElementById("gapPercentTwo");
         assert_equals(getComputedStyle(target).rowGap, "15%");
         assert_equals(getComputedStyle(target).columnGap, "10%");
-      }, "gap accepts percentage 2");
+      }, "grid-gap accepts percentage 2");
     test(
       function(){
         var target = document.getElementById("gapCalc");
         assert_equals(getComputedStyle(target).rowGap, "14px");
         assert_equals(getComputedStyle(target).columnGap, "14px");
-      }, "gap accepts calc()");
+      }, "grid-gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("gapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).rowGap, "calc(5px + 10%)");
+        assert_equals(getComputedStyle(target).columnGap, "calc(5px + 10%)");
+      }, "grid-gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("gapCalcTwo");
         assert_equals(getComputedStyle(target).rowGap, "14px");
         assert_equals(getComputedStyle(target).columnGap, "12px");
-      }, "gap accepts calc() 2");
+      }, "grid-gap accepts calc() 2");
     test(
       function(){
         var target = document.getElementById("gapInitial");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial gap is 'normal'");
+      }, "Initial grid-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("gapInitialPx");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial gap is 'normal' 2");
+      }, "Initial grid-gap is 'normal' 2");
     test(
       function(){
         var target = document.getElementById("gapInherit");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Initial inherited gap is 'normal'");
+      }, "Initial inherited grid-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("gapInheritPx");
         assert_equals(getComputedStyle(target).rowGap, "12px");
         assert_equals(getComputedStyle(target).columnGap, "12px");
-      }, "gap is inheritable");
+      }, "grid-gap is inheritable");
 
     test(
       function(){
         var target = document.getElementById("invalidGridGapNegative");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Negative gap is invalid");
+      }, "Negative grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapMaxContent");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "'max-content' gap is invalid");
+      }, "'max-content' grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapNone");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "'none' gap is invalid");
+      }, "'none' grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapAngle");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Angle gap is invalid");
+      }, "Angle grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapResolution");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Resolution gap is invalid");
+      }, "Resolution grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapTime");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "Time gap is invalid");
+      }, "Time grid-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapThree");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "gap with three values is invalid");
+      }, "grid-gap with three values is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapSlash");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "gap with slash is invalid");
+      }, "grid-gap with slash is invalid");
     test(
       function(){
         var target = document.getElementById("invalidGridGapOneWrong");
         assert_equals(getComputedStyle(target).rowGap, "normal");
         assert_equals(getComputedStyle(target).columnGap, "normal");
-      }, "gap with one wrong value is invalid");
+      }, "grid-gap with one wrong value is invalid");
   </script>
 </body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html
index 9dc8c8da59a..e394ea1446b 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html
@@ -1,26 +1,27 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Box Alignment Test: row-gap parsing</title>
+<title>CSS Box Alignment Test: grid-row-gap parsing</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-legacy">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
-  .rowGapPx { row-gap: 12px; }
-  #rowGapEm { row-gap: 2em; font: 10px/1 Monospace; }
-  #rowGapVw { row-gap: 2vw; }
-  #rowGapPercent { row-gap: 15%; }
-  #rowGapCalc { row-gap: calc(10px + 4px); }
-  .rowGapInitial { row-gap: initial; }
-  .rowGapInherit { row-gap: inherit; }
+  .rowGapPx { grid-row-gap: 12px; }
+  #rowGapEm { grid-row-gap: 2em; font: 10px/1 Monospace; }
+  #rowGapVw { grid-row-gap: 2vw; }
+  #rowGapPercent { grid-row-gap: 15%; }
+  #rowGapCalc { grid-row-gap: calc(10px + 4px); }
+  #rowGapCalcFixedPercent { grid-row-gap: calc(5px + 10%); }
+  .rowGapInitial { grid-row-gap: initial; }
+  .rowGapInherit { grid-row-gap: inherit; }
 
-  #invalidRowGapNegative { row-gap: -10px; }
-  #invalidRowGapMaxContent { row-gap: max-content; }
-  #invalidRowGapNone { row-gap: none; }
-  #invalidRowGapMultiple { row-gap: 10px 1px; }
-  #invalidRowGapAngle { row-gap: 3rad; }
-  #invalidRowGapResolution { row-gap: 2dpi; }
-  #invalidRowGapTime { row-gap: 200ms; }
+  #invalidRowGapNegative { grid-row-gap: -10px; }
+  #invalidRowGapMaxContent { grid-row-gap: max-content; }
+  #invalidRowGapNone { grid-row-gap: none; }
+  #invalidRowGapMultiple { grid-row-gap: 10px 1px; }
+  #invalidRowGapAngle { grid-row-gap: 3rad; }
+  #invalidRowGapResolution { grid-row-gap: 2dpi; }
+  #invalidRowGapTime { grid-row-gap: 200ms; }
 </style>
 <body>
   <div id="log"></div>
@@ -31,6 +32,7 @@
   <div id="rowGapVw"></div>
   <div id="rowGapPercent"></div>
   <div id="rowGapCalc"></div>
+  <div id="rowGapCalcFixedPercent"></div>
   <div id="rowGapInitial" class="rowGapInitial"></div>
   <div class="rowGapPx">
     <div id="rowGapInitialPx" class="rowGapInitial"></div>
@@ -53,91 +55,96 @@
       function(){
         var target = document.getElementById("default");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Default row-gap is 'normal'");
+      }, "Default grid-row-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("rowGapPx");
         assert_equals(getComputedStyle(target).rowGap, "12px");
-      }, "row-gap accepts pixels");
+      }, "grid-row-gap accepts pixels");
     test(
       function(){
         var target = document.getElementById("rowGapEm");
         assert_equals(getComputedStyle(target).rowGap, "20px");
-      }, "row-gap accepts em");
+      }, "grid-row-gap accepts em");
     test(
       function(){
         var target = document.getElementById("rowGapVw");
         // The rowGap size would depend on the viewport width, so to make the test pass
         // in any window size we just check it's not "normal".
         assert_not_equals(getComputedStyle(target).rowGap, "normal");
-      }, "row-gap accepts vw");
+      }, "grid-row-gap accepts vw");
     test(
       function(){
         var target = document.getElementById("rowGapPercent");
         assert_equals(getComputedStyle(target).rowGap, "15%");
-      }, "row-gap accepts percentage");
+      }, "grid-row-gap accepts percentage");
     test(
       function(){
         var target = document.getElementById("rowGapCalc");
         assert_equals(getComputedStyle(target).rowGap, "14px");
-      }, "row-gap accepts calc()");
+      }, "grid-row-gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("rowGapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).rowGap, "calc(5px + 10%)");
+      }, "grid-row-gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("rowGapInitial");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Initial row-gap is 'normal'");
+      }, "Initial grid-row-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("rowGapInitialPx");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Initial row-gap is 'normal' 2");
+      }, "Initial grid-row-gap is 'normal' 2");
     test(
       function(){
         var target = document.getElementById("rowGapInherit");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Initial inherited row-gap is 'normal'");
+      }, "Initial inherited grid-row-gap is 'normal'");
     test(
       function(){
         var target = document.getElementById("rowGapInheritPx");
         assert_equals(getComputedStyle(target).rowGap, "12px");
-      }, "row-gap is inheritable");
+      }, "grid-row-gap is inheritable");
 
 
     test(
       function(){
         var target = document.getElementById("invalidRowGapNegative");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Negative row-gap is invalid");
+      }, "Negative grid-row-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapMaxContent");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "'max-content' row-gap is invalid");
+      }, "'max-content' grid-row-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapNone");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "'none' row-gap is invalid");
+      }, "'none' grid-row-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapMultiple");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "row-gap with multiple values is invalid");
+      }, "grid-row-gap with multiple values is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapAngle");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Angle row-gap is invalid");
+      }, "Angle grid-row-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapResolution");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Resolution row-gap is invalid");
+      }, "Resolution grid-row-gap is invalid");
     test(
       function(){
         var target = document.getElementById("invalidRowGapTime");
         assert_equals(getComputedStyle(target).rowGap, "normal");
-      }, "Time row-gap is invalid");
+      }, "Time grid-row-gap is invalid");
   </script>
 </body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html b/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html
index 6de848c3c2a..71b971d3a8a 100644
--- a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html
@@ -11,6 +11,7 @@
   #rowGapVw { row-gap: 2vw; }
   #rowGapPercent { row-gap: 15%; }
   #rowGapCalc { row-gap: calc(10px + 4px); }
+  #rowGapCalcFixedPercent { row-gap: calc(5px + 10%); }
   .rowGapInitial { row-gap: initial; }
   .rowGapInherit { row-gap: inherit; }
 
@@ -31,6 +32,7 @@
   <div id="rowGapVw"></div>
   <div id="rowGapPercent"></div>
   <div id="rowGapCalc"></div>
+  <div id="rowGapCalcFixedPercent"></div>
   <div id="rowGapInitial" class="rowGapInitial"></div>
   <div class="rowGapPx">
     <div id="rowGapInitialPx" class="rowGapInitial"></div>
@@ -81,6 +83,11 @@
         var target = document.getElementById("rowGapCalc");
         assert_equals(getComputedStyle(target).rowGap, "14px");
       }, "row-gap accepts calc()");
+    test(
+      function(){
+        var target = document.getElementById("rowGapCalcFixedPercent");
+        assert_equals(getComputedStyle(target).rowGap, "calc(5px + 10%)");
+      }, "row-gap accepts calc() mixing fixed and percentage values");
     test(
       function(){
         var target = document.getElementById("rowGapInitial");
diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html b/tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html
new file mode 100644
index 00000000000..037e62f9949
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Font Loading API IDL tests</title>
+<link rel="help" href="https://drafts.csswg.org/css-font-loading/#fontfacesetloadevent">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script>
+"use strict";
+
+function doTest([dom, cssfontloading]) {
+  const idl_array = new IdlArray();
+  idl_array.add_untested_idls(dom);
+  idl_array.add_untested_idls("[Exposed=Worker] interface WorkerGlobalScope : EventTarget { };");
+  idl_array.add_objects({Document: ["document"]});
+  idl_array.add_idls(cssfontloading);
+  idl_array.test();
+}
+
+function fetchText(url) {
+  return fetch(url).then((response) => response.text());
+}
+
+promise_test(() => {
+  return Promise.all([
+    "/interfaces/dom.idl",
+    "/interfaces/css-font-loading.idl",
+  ].map(fetchText)).then(doTest);
+}, "Test IDL implementation of CSS Font Loading");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html b/tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html
new file mode 100644
index 00000000000..1a7c59abd5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: calc() function in font-variation-settings</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-values/#funcdef-calc">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#test {
+  font-variation-settings: "XHGT" calc(0.7);
+}
+</style>
+<div id="test"></div>
+<script>
+const div = document.querySelector("#test");
+test(function() {
+  assert_equals(getComputedStyle(div).fontVariationSettings, "\"XHGT\" 0.7");
+}, "calc() in font-variation-settings");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
index a447ead37f5..e456af8ce0a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned elements with a grid container as containing block.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
index 82e60635499..e798b80d9d0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned elements with a grid container as parent.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
index 7528b084c8a..ae074da1af5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="match" href="grid-paint-positioned-children-001-ref.html">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   border: 2px solid black;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
index 3610cd3bfc7..e8ab2426c84 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: Grid positioned children writing modes reference test</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
index b92263956ab..eb855279ca8 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="match" href="grid-positioned-children-writing-modes-001-ref.html">
 <meta name="assert" content="This test checks the behavior of the positioned grid children in combination with the writing modes and text direction properties.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
index 849567c600a..81ea909d029 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items don't avoid auto-fit tracks to collapse.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
index 7271081ea6f..27fc722e6c3 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks tracks before the first in-flow item also collapse and positioned items don't have any impact.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
index 05ac15dd289..1c893392a4b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items will use the area defined by the in-flow items, ignoring any collapsed track.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
index 13b29ea9c53..54b2ff79027 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
index 70695c4e128..56f870f4ec0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps, both before and after the first in-flow item .">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
index 5b792205ab3..e301d349376 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps but consider those between in-flow items inside their grid area.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
index 1f9958029cc..8c4621627fd 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps even with non-empty tracks before and after.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .container {
   width: 250px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
index 2b299cd5dae..19ee662e04e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="match" href="grid-positioned-items-background-001-ref.html">
 <meta name="assert" content="This test checks that the background of positioned items is painted in the right position">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
index 50741e2fe6b..9ed046b4215 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="match" href="grid-positioned-items-background-rtl-001-ref.html">
 <meta name="assert" content="This test checks that the background of positioned items is painted in the right position using RTL direction.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
index 80b795dcc58..ebff62aae9a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align" title="10.5. Aligning the Grid: the justify-content and align-content properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid using content alignment.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
index ad9147e22a1..628a63c7e79 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align" title="10.5. Aligning the Grid: the justify-content and align-content properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid using content alignment in RTL.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
index e1adc6b713b..b9f3343ea92 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters" title="10.1. Gutters: the row-gap, column-gap, and gap properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with gaps.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
index 4a6cd881b19..16ab39df9fb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters" title="10.1. Gutters: the row-gap, column-gap, and gap properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with gaps in RTL.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
index 6d62088435e..71f096aa74b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned grid items placed on the implicit grid.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
index f0f98d2d682..7b8fa4ef7bd 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks that grid placement properties of absolutely positioned items using implicit grid lines are treated as 'auto'.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
index a0ccd1ef78c..4941d77a71a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned grid items can be placed directly on the padding.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
index a50e12abdf5..24d9d769f99 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that grid placement properties of absolutely positioned items using unknown named grid lines are treated as 'auto'.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
index fb9cad16847..5a31c35f208 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks that positioned grid items are placed properly (including implicit tracks) even if the grid has implicit tracks.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
index 2acae44e768..0e8cd3369f7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the different size options for absolutely positioned grid items.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
index 56aa0e15e5c..5ef006ae137 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned items shouldn't create implicit tracks on the grid.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
index a6834cb0d59..597e778019b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned items shouldn't take up space or otherwise participate in the layout of the grid.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
index a468863543f..2ded937ad4b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Grid Layout Test: Positioned grid items sizing reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <meta name="flags" content="ahem">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
index ae128064f1d..4f849575f0a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="positioned-grid-items-sizing-001-ref.html">
 <meta name="assert" content="This test checks that the sizing of positioned grid items without specific dimensions or offsets is equivalent to the size of regular items.">
 <meta name="flags" content="ahem">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/support/grid.css
rename to tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html
new file mode 100644
index 00000000000..daeba00aee1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Support for calc mixing fixed and percentage values for gap</title>
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-shorthand">
+<link rel="match" href="../reference/grid-different-gutters-ref.html">
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<style>
+    #grid {
+        display: grid;
+        width: 200px;
+        height: 220px;
+        gap: calc(15% + 7px) calc(10px + 5%);
+        grid-template-columns: 90px 90px;
+        grid-template-rows: 90px 90px;
+        background-color: green;
+    }
+
+    #grid > div {
+        background-color: silver;
+    }
+</style>
+
+<p>The test passes if it has the same visual effect as reference.</p>
+<div id="grid">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html
new file mode 100644
index 00000000000..1e56e708dfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Support for calc mixing fixed and percentage values for grid-gap as alias for gap</title>
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-shorthand">
+<link rel="help" href0"https://www.w3.org/TR/css-align-3/#gap-legacy">
+<link rel="match" href="../reference/grid-different-gutters-ref.html">
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<style>
+    #grid {
+        display: grid;
+        width: 200px;
+        height: 220px;
+        grid-gap: calc(15% + 7px) calc(10px + 5%);
+        grid-template-columns: 90px 90px;
+        grid-template-rows: 90px 90px;
+        background-color: green;
+    }
+
+    #grid > div {
+        background-color: silver;
+    }
+</style>
+
+<p>The test passes if it has the same visual effect as reference.</p>
+<div id="grid">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
index d08712d30d2..9441b0a439e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
 <meta name="assert" content="This test checks that grid-template-{rows|columns} with fit-content() tracks recomputes the tracks when the fit-content() argument is modified.">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   width: fit-content;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
index cb7a582ab10..f90bd047993 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: grid-template-columns fit-content() reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <meta name="flags" content="ahem">
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
index d492d4585f8..c594d805e64 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
@@ -7,7 +7,7 @@
 <link rel="match" href="grid-template-columns-fit-content-001-ref.html">
 <meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-columns, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   justify-content: start;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
index a1f83dc85af..a6785fcb12f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: grid-template-rows fit-content() reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <meta name="flags" content="ahem">
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
index 6d406c3f1b4..293196032e1 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
@@ -7,7 +7,7 @@
 <link rel="match" href="grid-template-rows-fit-content-001-ref.html">
 <meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-rows, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   justify-content: start;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
new file mode 100644
index 00000000000..602e114880a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
@@ -0,0 +1,277 @@
+.grid {
+  display: grid;
+  background-color: grey;
+}
+
+.inline-grid {
+  display: inline-grid;
+  background-color: grey;
+}
+
+.firstRowFirstColumn {
+  background-color: blue;
+  grid-column: 1;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlyFirstColumn {
+  background-color: blue;
+  grid-column: 1 / 2;
+  grid-row: 1 / 2;
+}
+
+.firstRowSecondColumn {
+  background-color: lime;
+  grid-column: 2;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlySecondColumn {
+  background-color: lime;
+  grid-column: 2 / 3;
+  grid-row: 1 / 2;
+}
+
+.secondRowFirstColumn {
+  background-color: purple;
+  grid-column: 1;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlyFirstColumn {
+  background-color: purple;
+  grid-column: 1 / 2;
+  grid-row: 2 / 3;
+}
+
+.secondRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlySecondColumn {
+  background-color: orange;
+  grid-column: 2 / 3;
+  grid-row: 2 / 3;
+}
+
+.endSecondRowEndSecondColumn {
+  background-color: orange;
+  grid-column-end: 3;
+  grid-row-end: 3;
+}
+
+.thirdRowSecondColumn {
+  background-color: red;
+  grid-column: 2;
+  grid-row: 3;
+}
+
+.firstRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.secondRowThirdColumn {
+  background-color: navy;
+  grid-column: 3;
+  grid-row: 2;
+}
+
+.firstRowFourthColumn {
+  background-color: green;
+  grid-column: 4;
+  grid-row: 1;
+}
+
+.secondRowFourthColumn {
+  background-color: pink;
+  grid-column: 4;
+  grid-row: 2;
+}
+
+.firstAutoRowSecondAutoColumn {
+  grid-row: 1 / auto;
+  grid-column: 2 / auto;
+}
+
+.autoLastRowAutoLastColumn {
+  grid-row: auto / -1;
+  grid-column: auto / -1;
+}
+
+.autoSecondRowAutoFirstColumn {
+  grid-row: auto / 2;
+  grid-column: auto / 1;
+}
+
+.firstRowBothColumn {
+  grid-row: 1;
+  grid-column: 1 / -1;
+}
+
+.secondRowBothColumn {
+  grid-row: 2;
+  grid-column: 1 / -1;
+}
+
+.bothRowFirstColumn {
+  grid-row: 1 / -1;
+  grid-column: 1;
+}
+
+.bothRowSecondColumn {
+  grid-row: 1 / -1;
+  grid-column: 2;
+}
+
+.bothRowBothColumn {
+  grid-row: 1 / -1;
+  grid-column: 1 / -1;
+}
+
+/* Auto column / row. */
+.autoRowAutoColumn {
+  background-color: pink;
+  grid-column: auto;
+  grid-row: auto;
+}
+
+.firstRowAutoColumn {
+  background-color: blue;
+  grid-column: auto;
+  grid-row: 1;
+}
+
+.secondRowAutoColumn {
+  background-color: purple;
+  grid-column: auto;
+  grid-row: 2;
+}
+
+.thirdRowAutoColumn {
+  background-color: navy;
+  grid-column: auto;
+  grid-row: 3;
+}
+
+.autoRowFirstColumn {
+  background-color: lime;
+  grid-column: 1;
+  grid-row: auto;
+}
+
+.autoRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: auto;
+}
+
+.autoRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: auto;
+}
+
+.autoRowAutoColumnSpanning2 {
+  background-color: maroon;
+  grid-column: span 2;
+  grid-row: auto;
+}
+
+.autoRowSpanning2AutoColumn {
+  background-color: aqua;
+  grid-column: auto;
+  grid-row: span 2;
+}
+
+.autoRowSpanning2AutoColumnSpanning3 {
+  background-color: olive;
+  grid-column: span 3;
+  grid-row: span 2;
+}
+
+.autoRowSpanning3AutoColumnSpanning2 {
+  background-color: indigo;
+  grid-column: span 2;
+  grid-row: span 3;
+}
+
+.autoRowFirstColumnSpanning2 {
+  background-color: maroon;
+  grid-column: 1 / span 2;
+  grid-row: auto;
+}
+
+.autoRowSecondColumnSpanning2 {
+  background-color: olive;
+  grid-column: 2 / span 2;
+  grid-row: auto;
+}
+
+.firstRowSpanning2AutoColumn {
+  background-color: maroon;
+  grid-column: auto;
+  grid-row: 1 / span 2;
+  height: 100%;
+}
+
+.secondRowSpanning2AutoColumn {
+  background-color: olive;
+  grid-column: auto;
+  grid-row: 2 / span 2;
+  height: 100%;
+}
+
+/* Grid element flow. */
+.gridAutoFlowColumnSparse {
+  grid-auto-flow: column;
+}
+
+.gridAutoFlowColumnDense {
+  grid-auto-flow: column dense;
+}
+
+.gridAutoFlowRowSparse {
+  grid-auto-flow: row;
+}
+
+.gridAutoFlowRowDense {
+  grid-auto-flow: row dense;
+}
+
+/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
+.constrainedContainer {
+  width: 10px;
+  height: 10px;
+}
+
+.unconstrainedContainer {
+  width: 1000px;
+  height: 1000px;
+}
+
+.sizedToGridArea {
+  font: 10px/1 Ahem;
+  /* Make us fit our grid area. */
+  width: 100%;
+  height: 100%;
+}
+
+.verticalRL {
+  writing-mode: vertical-rl;
+}
+.verticalLR {
+  writing-mode: vertical-lr;
+}
+.horizontalTB {
+  writing-mode: horizontal-tb;
+}
+.directionRTL {
+  direction: rtl;
+}
+.directionLTR {
+  direction: ltr;
+}
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
new file mode 100644
index 00000000000..00487f766a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  width: 100px;
+  border: solid thick;
+  grid: 10px 10px / minmax(auto, 0px);
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
new file mode 100644
index 00000000000..c9f77a6ebe0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  display: inline-grid;
+  border: solid 5px;
+  grid: 10px 10px / minmax(auto, 0px);
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
new file mode 100644
index 00000000000..943837d2031
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items orthogonal</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that orthogonal grid items minimum width takes into account borders, padding and margins for grid containers with definite width.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  width: 100px;
+  border: solid thick;
+  grid: 10px 10px / minmax(auto, 0px);
+}
+
+.grid > div:nth-child(1) { background: cyan; writing-mode: vertical-lr; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
new file mode 100644
index 00000000000..25ad710d5d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items orthogonal</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that orthogonal grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  display: inline-grid;
+  border: solid 5px;
+  grid: 10px 10px / minmax(auto, 0px);
+}
+
+.grid > div:nth-child(1) { background: cyan; writing-mode: vertical-lr; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
new file mode 100644
index 00000000000..1afe6df9535
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items vertical-lr</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width in vertical-lr.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  width: 100px;
+  border: solid thick;
+  grid: minmax(auto, 0px) / 10px 10px;
+  writing-mode: vertical-lr;
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
new file mode 100644
index 00000000000..a239369e4d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items vertical-lr</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width in vertical-lr.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  display: inline-grid;
+  border: solid 5px;
+  grid: minmax(auto, 0px) / 10px 10px;
+  writing-mode: vertical-lr;
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
new file mode 100644
index 00000000000..df3fe9bca49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items vertical-rl</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width in vertical-rl.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  width: 100px;
+  border: solid thick;
+  grid: minmax(auto, 0px) / 10px 10px;
+  writing-mode: vertical-rl;
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
new file mode 100644
index 00000000000..3978ed607b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Mininum width of grid items vertical-rl</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width in vertical-rl.">
+<link rel="stylesheet" href="support/grid.css">
+<style>
+.grid {
+  display: inline-grid;
+  border: solid 5px;
+  grid: minmax(auto, 0px) / 10px 10px;
+  writing-mode: vertical-rl;
+}
+
+.grid > div:nth-child(1) { background: cyan; }
+.grid > div:nth-child(2) { background: magenta; }
+
+.width60 { width: 60px; }
+.minWidth60 { min-width: 60px; }
+
+.marginLeft5 { margin-left: 5px; }
+.marginRight10 { margin-right: 10px; }
+
+.paddingLeft6 { padding-left: 6px; }
+.paddingRight3 { padding-right: 3px; }
+
+.borderLeft2, .borderRight4 { border: solid yellow 0px; }
+.borderLeft2 { border-left-width: 2px; }
+.borderRight4 { border-right-width: 4px; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<h3>Direction LTR</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<h3>Direction RTL</h3>
+
+<pre>Item width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="width60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item min-width: 60px;</pre>
+
+<div class="grid directionRTL" data-expected-width="70">
+  <div class="minWidth60" data-expected-width="60"></div>
+  <div data-expected-width="60"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="width60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px;</pre>
+
+<div class="grid directionRTL" data-expected-width="75">
+  <div class="minWidth60 marginLeft5" data-expected-width="60"></div>
+  <div data-expected-width="65"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="width60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="80">
+  <div class="minWidth60 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="70"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="width60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px;</pre>
+
+<div class="grid directionRTL" data-expected-width="85">
+  <div class="minWidth60 marginLeft5 marginRight10" data-expected-width="60"></div>
+  <div data-expected-width="75"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 paddingLeft6" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="width60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="73">
+  <div class="minWidth60 paddingRight3" data-expected-width="63"></div>
+  <div data-expected-width="63"></div>
+</div>
+
+<pre>Item width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="width60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; padding-left: 6px; &amp; padding-right: 3px;</pre>
+
+<div class="grid directionRTL" data-expected-width="79">
+  <div class="minWidth60 paddingLeft6 paddingRight3" data-expected-width="69"></div>
+  <div data-expected-width="69"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="width60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px;</pre>
+
+<div class="grid directionRTL" data-expected-width="72">
+  <div class="minWidth60 borderLeft2" data-expected-width="62"></div>
+  <div data-expected-width="62"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="width60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="74">
+  <div class="minWidth60 borderRight4" data-expected-width="64"></div>
+  <div data-expected-width="64"></div>
+</div>
+
+<pre>Item width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="width60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="76">
+  <div class="minWidth60 borderLeft2 borderRight4" data-expected-width="66"></div>
+  <div data-expected-width="66"></div>
+</div>
+
+<pre>Item width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="width60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
+
+<pre>Item min-width: 60px; &amp; margin-left: 5px; &amp; margin-right: 10px; &amp; padding-left: 6px; &amp; padding-right: 3px; &amp; border-left-width: 2px; &amp; border-right-width: 4px;</pre>
+
+<div class="grid directionRTL" data-expected-width="100">
+  <div class="minWidth60 marginLeft5 marginRight10 paddingLeft6 paddingRight3 borderLeft2 borderRight4" data-expected-width="75"></div>
+  <div data-expected-width="90"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
index 127ea8df4af..ce1db93080a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   border: solid thick;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
index 636a40fcb2d..c5e6da55887 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   border: solid thick;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
index fb706bfca59..c77556cfc2e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes and spaning items.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   border: solid thick;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
index 722426e0c9b..a3c35a5a370 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes and spaning items.">
-<link rel="stylesheet" href="../support/grid.css">
+<link rel="stylesheet" href="support/grid.css">
 <style>
 .grid {
   border: solid thick;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
new file mode 100644
index 00000000000..602e114880a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
@@ -0,0 +1,277 @@
+.grid {
+  display: grid;
+  background-color: grey;
+}
+
+.inline-grid {
+  display: inline-grid;
+  background-color: grey;
+}
+
+.firstRowFirstColumn {
+  background-color: blue;
+  grid-column: 1;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlyFirstColumn {
+  background-color: blue;
+  grid-column: 1 / 2;
+  grid-row: 1 / 2;
+}
+
+.firstRowSecondColumn {
+  background-color: lime;
+  grid-column: 2;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlySecondColumn {
+  background-color: lime;
+  grid-column: 2 / 3;
+  grid-row: 1 / 2;
+}
+
+.secondRowFirstColumn {
+  background-color: purple;
+  grid-column: 1;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlyFirstColumn {
+  background-color: purple;
+  grid-column: 1 / 2;
+  grid-row: 2 / 3;
+}
+
+.secondRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlySecondColumn {
+  background-color: orange;
+  grid-column: 2 / 3;
+  grid-row: 2 / 3;
+}
+
+.endSecondRowEndSecondColumn {
+  background-color: orange;
+  grid-column-end: 3;
+  grid-row-end: 3;
+}
+
+.thirdRowSecondColumn {
+  background-color: red;
+  grid-column: 2;
+  grid-row: 3;
+}
+
+.firstRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.secondRowThirdColumn {
+  background-color: navy;
+  grid-column: 3;
+  grid-row: 2;
+}
+
+.firstRowFourthColumn {
+  background-color: green;
+  grid-column: 4;
+  grid-row: 1;
+}
+
+.secondRowFourthColumn {
+  background-color: pink;
+  grid-column: 4;
+  grid-row: 2;
+}
+
+.firstAutoRowSecondAutoColumn {
+  grid-row: 1 / auto;
+  grid-column: 2 / auto;
+}
+
+.autoLastRowAutoLastColumn {
+  grid-row: auto / -1;
+  grid-column: auto / -1;
+}
+
+.autoSecondRowAutoFirstColumn {
+  grid-row: auto / 2;
+  grid-column: auto / 1;
+}
+
+.firstRowBothColumn {
+  grid-row: 1;
+  grid-column: 1 / -1;
+}
+
+.secondRowBothColumn {
+  grid-row: 2;
+  grid-column: 1 / -1;
+}
+
+.bothRowFirstColumn {
+  grid-row: 1 / -1;
+  grid-column: 1;
+}
+
+.bothRowSecondColumn {
+  grid-row: 1 / -1;
+  grid-column: 2;
+}
+
+.bothRowBothColumn {
+  grid-row: 1 / -1;
+  grid-column: 1 / -1;
+}
+
+/* Auto column / row. */
+.autoRowAutoColumn {
+  background-color: pink;
+  grid-column: auto;
+  grid-row: auto;
+}
+
+.firstRowAutoColumn {
+  background-color: blue;
+  grid-column: auto;
+  grid-row: 1;
+}
+
+.secondRowAutoColumn {
+  background-color: purple;
+  grid-column: auto;
+  grid-row: 2;
+}
+
+.thirdRowAutoColumn {
+  background-color: navy;
+  grid-column: auto;
+  grid-row: 3;
+}
+
+.autoRowFirstColumn {
+  background-color: lime;
+  grid-column: 1;
+  grid-row: auto;
+}
+
+.autoRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: auto;
+}
+
+.autoRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: auto;
+}
+
+.autoRowAutoColumnSpanning2 {
+  background-color: maroon;
+  grid-column: span 2;
+  grid-row: auto;
+}
+
+.autoRowSpanning2AutoColumn {
+  background-color: aqua;
+  grid-column: auto;
+  grid-row: span 2;
+}
+
+.autoRowSpanning2AutoColumnSpanning3 {
+  background-color: olive;
+  grid-column: span 3;
+  grid-row: span 2;
+}
+
+.autoRowSpanning3AutoColumnSpanning2 {
+  background-color: indigo;
+  grid-column: span 2;
+  grid-row: span 3;
+}
+
+.autoRowFirstColumnSpanning2 {
+  background-color: maroon;
+  grid-column: 1 / span 2;
+  grid-row: auto;
+}
+
+.autoRowSecondColumnSpanning2 {
+  background-color: olive;
+  grid-column: 2 / span 2;
+  grid-row: auto;
+}
+
+.firstRowSpanning2AutoColumn {
+  background-color: maroon;
+  grid-column: auto;
+  grid-row: 1 / span 2;
+  height: 100%;
+}
+
+.secondRowSpanning2AutoColumn {
+  background-color: olive;
+  grid-column: auto;
+  grid-row: 2 / span 2;
+  height: 100%;
+}
+
+/* Grid element flow. */
+.gridAutoFlowColumnSparse {
+  grid-auto-flow: column;
+}
+
+.gridAutoFlowColumnDense {
+  grid-auto-flow: column dense;
+}
+
+.gridAutoFlowRowSparse {
+  grid-auto-flow: row;
+}
+
+.gridAutoFlowRowDense {
+  grid-auto-flow: row dense;
+}
+
+/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
+.constrainedContainer {
+  width: 10px;
+  height: 10px;
+}
+
+.unconstrainedContainer {
+  width: 1000px;
+  height: 1000px;
+}
+
+.sizedToGridArea {
+  font: 10px/1 Ahem;
+  /* Make us fit our grid area. */
+  width: 100%;
+  height: 100%;
+}
+
+.verticalRL {
+  writing-mode: vertical-rl;
+}
+.verticalLR {
+  writing-mode: vertical-lr;
+}
+.horizontalTB {
+  writing-mode: horizontal-tb;
+}
+.directionRTL {
+  direction: rtl;
+}
+.directionLTR {
+  direction: ltr;
+}
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
index f94fdcfe965..b8e344ef777 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-letter">
 <meta name="assert" content="The test checks that grid item should ignore grid container's first-letter pseudo-element.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
   body { line-height: 20px; }
   .grid-first-letter::first-letter { line-height: 100px; color: red; }
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
index b491298f3ea..140d7bf1151 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-formatted-line">
 <meta name="assert" content="The test checks that grid item should ignore grid container's first-line pseudo-element.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
   body { line-height: 20px; }
   .grid-first-line::first-line { line-height: 100px; }
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
index c9454fe30e7..b6914eb536e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-letter">
 <meta name="assert" content="The test checks that grid items accept first-letter pseudo-element.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
   .item::first-letter { line-height: 100px; }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
index 1330b376318..8bf8c653bf7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-formatted-line">
 <meta name="assert" content="The test checks that grid items accept first-line pseudo-element.">
-<link href="../support/grid.css" rel="stylesheet">
+<link href="support/grid.css" rel="stylesheet">
 <style>
   .item::first-line { line-height: 100px; }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
new file mode 100644
index 00000000000..602e114880a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
@@ -0,0 +1,277 @@
+.grid {
+  display: grid;
+  background-color: grey;
+}
+
+.inline-grid {
+  display: inline-grid;
+  background-color: grey;
+}
+
+.firstRowFirstColumn {
+  background-color: blue;
+  grid-column: 1;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlyFirstColumn {
+  background-color: blue;
+  grid-column: 1 / 2;
+  grid-row: 1 / 2;
+}
+
+.firstRowSecondColumn {
+  background-color: lime;
+  grid-column: 2;
+  grid-row: 1;
+}
+
+.onlyFirstRowOnlySecondColumn {
+  background-color: lime;
+  grid-column: 2 / 3;
+  grid-row: 1 / 2;
+}
+
+.secondRowFirstColumn {
+  background-color: purple;
+  grid-column: 1;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlyFirstColumn {
+  background-color: purple;
+  grid-column: 1 / 2;
+  grid-row: 2 / 3;
+}
+
+.secondRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: 2;
+}
+
+.onlySecondRowOnlySecondColumn {
+  background-color: orange;
+  grid-column: 2 / 3;
+  grid-row: 2 / 3;
+}
+
+.endSecondRowEndSecondColumn {
+  background-color: orange;
+  grid-column-end: 3;
+  grid-row-end: 3;
+}
+
+.thirdRowSecondColumn {
+  background-color: red;
+  grid-column: 2;
+  grid-row: 3;
+}
+
+.firstRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.secondRowThirdColumn {
+  background-color: navy;
+  grid-column: 3;
+  grid-row: 2;
+}
+
+.firstRowFourthColumn {
+  background-color: green;
+  grid-column: 4;
+  grid-row: 1;
+}
+
+.secondRowFourthColumn {
+  background-color: pink;
+  grid-column: 4;
+  grid-row: 2;
+}
+
+.firstAutoRowSecondAutoColumn {
+  grid-row: 1 / auto;
+  grid-column: 2 / auto;
+}
+
+.autoLastRowAutoLastColumn {
+  grid-row: auto / -1;
+  grid-column: auto / -1;
+}
+
+.autoSecondRowAutoFirstColumn {
+  grid-row: auto / 2;
+  grid-column: auto / 1;
+}
+
+.firstRowBothColumn {
+  grid-row: 1;
+  grid-column: 1 / -1;
+}
+
+.secondRowBothColumn {
+  grid-row: 2;
+  grid-column: 1 / -1;
+}
+
+.bothRowFirstColumn {
+  grid-row: 1 / -1;
+  grid-column: 1;
+}
+
+.bothRowSecondColumn {
+  grid-row: 1 / -1;
+  grid-column: 2;
+}
+
+.bothRowBothColumn {
+  grid-row: 1 / -1;
+  grid-column: 1 / -1;
+}
+
+/* Auto column / row. */
+.autoRowAutoColumn {
+  background-color: pink;
+  grid-column: auto;
+  grid-row: auto;
+}
+
+.firstRowAutoColumn {
+  background-color: blue;
+  grid-column: auto;
+  grid-row: 1;
+}
+
+.secondRowAutoColumn {
+  background-color: purple;
+  grid-column: auto;
+  grid-row: 2;
+}
+
+.thirdRowAutoColumn {
+  background-color: navy;
+  grid-column: auto;
+  grid-row: 3;
+}
+
+.autoRowFirstColumn {
+  background-color: lime;
+  grid-column: 1;
+  grid-row: auto;
+}
+
+.autoRowSecondColumn {
+  background-color: orange;
+  grid-column: 2;
+  grid-row: auto;
+}
+
+.autoRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: auto;
+}
+
+.autoRowAutoColumnSpanning2 {
+  background-color: maroon;
+  grid-column: span 2;
+  grid-row: auto;
+}
+
+.autoRowSpanning2AutoColumn {
+  background-color: aqua;
+  grid-column: auto;
+  grid-row: span 2;
+}
+
+.autoRowSpanning2AutoColumnSpanning3 {
+  background-color: olive;
+  grid-column: span 3;
+  grid-row: span 2;
+}
+
+.autoRowSpanning3AutoColumnSpanning2 {
+  background-color: indigo;
+  grid-column: span 2;
+  grid-row: span 3;
+}
+
+.autoRowFirstColumnSpanning2 {
+  background-color: maroon;
+  grid-column: 1 / span 2;
+  grid-row: auto;
+}
+
+.autoRowSecondColumnSpanning2 {
+  background-color: olive;
+  grid-column: 2 / span 2;
+  grid-row: auto;
+}
+
+.firstRowSpanning2AutoColumn {
+  background-color: maroon;
+  grid-column: auto;
+  grid-row: 1 / span 2;
+  height: 100%;
+}
+
+.secondRowSpanning2AutoColumn {
+  background-color: olive;
+  grid-column: auto;
+  grid-row: 2 / span 2;
+  height: 100%;
+}
+
+/* Grid element flow. */
+.gridAutoFlowColumnSparse {
+  grid-auto-flow: column;
+}
+
+.gridAutoFlowColumnDense {
+  grid-auto-flow: column dense;
+}
+
+.gridAutoFlowRowSparse {
+  grid-auto-flow: row;
+}
+
+.gridAutoFlowRowDense {
+  grid-auto-flow: row dense;
+}
+
+/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
+.constrainedContainer {
+  width: 10px;
+  height: 10px;
+}
+
+.unconstrainedContainer {
+  width: 1000px;
+  height: 1000px;
+}
+
+.sizedToGridArea {
+  font: 10px/1 Ahem;
+  /* Make us fit our grid area. */
+  width: 100%;
+  height: 100%;
+}
+
+.verticalRL {
+  writing-mode: vertical-rl;
+}
+.verticalLR {
+  writing-mode: vertical-lr;
+}
+.horizontalTB {
+  writing-mode: horizontal-tb;
+}
+.directionRTL {
+  direction: rtl;
+}
+.directionLTR {
+  direction: ltr;
+}
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html b/tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html
new file mode 100644
index 00000000000..21f9fb97436
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>Paint order with float VS regular block is correct inside multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/zindex.html#painting-order" title="E.2 Painting order">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-gap:0; width:100px; background:hotpink;">
+  <div style="float:left; width:50px; height:200px; background:green;"></div>
+  <div style="height:200px; background:red;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html
new file mode 100644
index 00000000000..6bf12aa7ddb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<title>CSS Scoping Module Level 1 - Dynamic fallback content</title>
+<link rel="author" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<link rel="match" href="reference/green-box.html"/>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host">
+  <span slot="myslot">FAIL</span>
+</div>
+<script>
+  let root = host.attachShadow({ mode: "open" });
+  root.innerHTML = `
+    <slot name="myslot">
+      <div style="width: 100px; height: 100px; background: green"></div>
+    </slot>
+  `;
+  document.body.offsetTop;
+  host.firstElementChild.remove();
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html
new file mode 100644
index 00000000000..7553049efb7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<title>CSS Scoping Module Level 1 - Dynamic fallback content</title>
+<link rel="author" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<link rel="match" href="reference/green-box.html"/>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host">
+  <span slot="myslot">FAIL</span>
+</div>
+<script>
+  let root = host.attachShadow({ mode: "open" });
+  root.innerHTML = `
+    <slot name="myslot">
+      <div style="width: 100px; height: 100px; background: green"></div>
+    </slot>
+  `;
+  document.body.offsetTop;
+  host.firstElementChild.removeAttribute("slot");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html
new file mode 100644
index 00000000000..59f8b5376b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>CSS Scoping Module Level 1 - Dynamic fallback content</title>
+<link rel="author" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<link rel="match" href="reference/green-box.html"/>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host">
+</div>
+<script>
+  let root = host.attachShadow({ mode: "open" });
+  root.innerHTML = `
+    <slot name="myslot">FAIL</slot>
+  `;
+  document.body.offsetTop;
+  host.innerHTML = `
+    <div slot="myslot" style="width: 100px; height: 100px; background: green"></div>
+  `;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html
new file mode 100644
index 00000000000..b301741da40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>CSS Scoping Module Level 1 - Dynamic fallback content</title>
+<link rel="author" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<link rel="match" href="reference/green-box.html"/>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host">
+  <div slot="myslot" style="width: 100px; height: 100px; background: green"></div>
+</div>
+<script>
+  let root = host.attachShadow({ mode: "open" });
+  root.innerHTML = `
+    <slot name="myslot"></slot>
+  `;
+  document.body.offsetTop;
+  let newSlot = document.createElement('slot');
+  newSlot.appendChild(document.createTextNode("FAIL"));
+  newSlot.setAttribute("name", "myslot");
+  root.insertBefore(newSlot, root.firstChild);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html
new file mode 100644
index 00000000000..ff030c0cde1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>CSS Scoping Module Level 1 - Dynamic fallback content</title>
+<link rel="author" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<link rel="match" href="reference/green-box.html"/>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host">
+  <div slot="myslot" style="width: 100px; height: 100px; background: green"></div>
+</div>
+<script>
+  let root = host.attachShadow({ mode: "open" });
+  root.innerHTML = `
+    <slot name="myslot"></slot>
+    <slot name="myotherslot">
+      FAIL
+    </slot>
+  `;
+  document.body.offsetTop;
+  host.firstElementChild.setAttribute("slot", "myotherslot");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas.html
new file mode 100644
index 00000000000..82274344526
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  position: absolute;
+  margin: 0px;
+}
+#scroller {
+  height: 600px;
+  width: 600px;
+  overflow: scroll;
+  scroll-snap-type: both mandatory;
+}
+#space {
+  width: 2000px;
+  height: 2000px;
+}
+
+.snap {
+  width: 200px;
+  height: 200px;
+  background-color: blue;
+  scroll-snap-align: start;
+}
+
+#left-top {
+  left: 0px;
+  top: 0px;
+}
+
+#right-top {
+  left: 800px;
+  top: 0px;
+}
+
+#left-bottom {
+  left: 0px;
+  top: 800px;
+}
+
+</style>
+<div id="scroller">
+  <div id="space"></div>
+  <div id="left-top" class="snap"></div>
+  <div id="right-top" class="snap"></div>
+  <div id="left-bottom" class="snap"></div>
+</div>
+<script>
+var scroller = document.getElementById("scroller");
+test(() => {
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollLeft, 0);
+  assert_equals(scroller.scrollTop, 0);
+  scroller.scrollTo(300, 0);
+  assert_equals(scroller.scrollLeft, 800);
+  assert_equals(scroller.scrollTop, 0);
+}, 'Only snap to visible area on X axis, even when the non-visible ones are closer');
+
+test(() => {
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollLeft, 0);
+  assert_equals(scroller.scrollTop, 0);
+  scroller.scrollTo(0, 300);
+  assert_equals(scroller.scrollLeft, 0);
+  assert_equals(scroller.scrollTop, 800);
+}, 'Only snap to visible area on Y axis, even when the non-visible ones are closer');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html
new file mode 100644
index 00000000000..2fd6df98196
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<style>
+.test {
+  width: 200px;
+  overflow: hidden;
+}
+
+.float {
+  float: left;
+  width: 50%;
+  height: 100px;
+
+  background: orange;
+  clip-path: polygon(0 0, 100% 100%, 0 100%);
+}
+
+.flex {
+  display: flex;
+  height: 50px;
+  background: rebeccapurple;
+}
+</style>
+<div class="test">
+  <div class="float"></div>
+  <div class="flex"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html
new file mode 100644
index 00000000000..cfb5d46a0db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="match" href="reference/shape-outside-formatting-context-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-shapes/">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1970">
+<meta name="assert" content="The test verifies that a new formatting context does *not* get sized and positioned based off the float area (defined by shape outside).">
+<style>
+.test {
+  width: 200px;
+  overflow: hidden;
+}
+
+.float {
+  float: left;
+  width: 50%;
+  height: 100px;
+
+  background: orange;
+  shape-outside: polygon(0 0, 100% 100%, 0 100%);
+  clip-path: polygon(0 0, 100% 100%, 0 100%);
+}
+
+.flex {
+  display: flex;
+  height: 50px;
+  background: rebeccapurple;
+}
+</style>
+<div class="test">
+  <div class="float"></div>
+  <div class="flex"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
index 543645135ba..737a8d7e2a8 100644
--- a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
+++ b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
@@ -79,8 +79,8 @@
     <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
     <div>
         <x-table style="width: 400px">
-            <x-tr><x-td><img block src="http://w3.org/favicon.ico" target=a /></x-tr>
-            <img src="http://w3.org/favicon.ico" table-row target=b />
+            <x-tr><x-td><img block src="../support/blue32x32.ico" target=a /></x-tr>
+            <img src="../support/blue32x32.ico" table-row target=b />
         </x-table>
     </div>
     <script>
@@ -109,8 +109,8 @@
     <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements</p>
     <div>
         <x-table style="width: 400px">
-            <x-tr><x-td><img inline src="http://w3.org/favicon.ico" target=a /></x-tr>
-            <img src="http://w3.org/favicon.ico" table-column target=b />
+            <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
+            <img src="../support/blue32x32.ico" table-column target=b />
         </x-table>
     </div>
     <script>
@@ -139,8 +139,8 @@
     <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements</p>
     <div>
         <x-table style="width: 400px">
-            <x-tr><x-td><img inline src="http://w3.org/favicon.ico" target=a /></x-tr>
-            <x-tr><img src="http://w3.org/favicon.ico" table-cell target=b /></x-tr>
+            <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
+            <x-tr><img src="../support/blue32x32.ico" table-cell target=b /></x-tr>
         </x-table>
     </div>
     <script>
@@ -192,8 +192,8 @@
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are considered <mark>inline</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" inline-table target=a />
-        <img src="http://w3.org/favicon.ico" inline-table target=b />
+        <img src="../support/blue32x32.ico" inline-table target=a />
+        <img src="../support/blue32x32.ico" inline-table target=b />
     </div>
     <script>
 
@@ -244,8 +244,8 @@
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table</mark> and are considered <mark>block</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" table target=a />
-        <img src="http://w3.org/favicon.ico" table target=b />
+        <img src="../support/blue32x32.ico" table target=a />
+        <img src="../support/blue32x32.ico" table target=b />
     </div>
     <script>
 
@@ -296,8 +296,8 @@
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" table-row target=a />
-        <img src="http://w3.org/favicon.ico" table-row target=b />
+        <img src="../support/blue32x32.ico" table-row target=a />
+        <img src="../support/blue32x32.ico" table-row target=b />
     </div>
     <script>
 
@@ -348,8 +348,8 @@
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" table-row-group target=a />
-        <img src="http://w3.org/favicon.ico" table-row-group target=b />
+        <img src="../support/blue32x32.ico" table-row-group target=a />
+        <img src="../support/blue32x32.ico" table-row-group target=b />
     </div>
     <script>
 
@@ -400,8 +400,8 @@
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" table-column target=a />
-        <img src="http://w3.org/favicon.ico" table-column target=b />
+        <img src="../support/blue32x32.ico" table-column target=a />
+        <img src="../support/blue32x32.ico" table-column target=b />
     </div>
     <script>
 
@@ -452,8 +452,8 @@
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements</p>
     <div>
-        <img src="http://w3.org/favicon.ico" table-cell target=a />
-        <img src="http://w3.org/favicon.ico" table-cell target=b />
+        <img src="../support/blue32x32.ico" table-cell target=a />
+        <img src="../support/blue32x32.ico" table-cell target=b />
     </div>
     <script>
 
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-013.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-013.html
deleted file mode 100644
index 4d3c9ca4bb5..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-013.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 23B4 TOP SQUARE BRACKET</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-013-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has OP Opening Punctuation property, the browser will not leave 23B4 TOP SQUARE BRACKET at the end of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中&#x23B4;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />&#x23B4;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-048.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-048.html
deleted file mode 100644
index a2fd90baa82..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-048.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FD3E ORNATE LEFT PARENTHESIS</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-048-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has OP Opening Punctuation property, the browser will not leave FD3E ORNATE LEFT PARENTHESIS at the end of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中&#xFD3E;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />&#xFD3E;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-118.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-118.html
deleted file mode 100644
index c460ee42fcf..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-118.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 23B5 BOTTOM SQUARE BRACKET</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-118-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has a CL Closing Punctuation property, the browser will not leave 23B5 BOTTOM SQUARE BRACKET at the beginning of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中中&#x23B5;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#x23B5;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-154.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-154.html
deleted file mode 100644
index 47b8ed043ff..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-154.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FD3F ORNATE RIGHT PARENTHESIS</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-154-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has a CL Closing Punctuation property, the browser will not leave FD3F ORNATE RIGHT PARENTHESIS at the beginning of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中中&#xFD3F;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#xFD3F;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-216.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-216.html
deleted file mode 100644
index 6cace8eec2b..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-216.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-216-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has an NS Non-Starter property, the browser will not leave 30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK at the beginning of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中中&#x30FC;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#x30FC;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-224.html b/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-224.html
deleted file mode 100644
index 11517ac0dde..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-224.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FF70 HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-breaking'>
-<link rel="match" href="reference/css3-text-line-break-opclns-224-ref.html">
-<meta name='flags' content=''>
-<meta name="assert" content="Because it has an NS Non-Starter property, the browser will not leave FF70 HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK at the beginning of a line.">
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='test'>中中中&#xFF70;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#xFF70;文</div>
-
-
-<!--Notes:
-
-These tests examine the default behavior of characters against the expectations in the Unicode Standard Annex, version 5.1.0. The two-letter abbreviations are conventions for property names in the Unicode Standard. Non-tailorable characters have normative behavior in the Unicode Standard that applies in all normal circumstances.
-<p class='notes'>For more information about expected line break behavior and line break classes, see <a href='http://www.unicode.org/reports/tr14/'>Unicode Standard Annex #14 Line Breaking Properties</a>.
-
-
--->
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html
deleted file mode 100644
index 666a8b8c091..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-013-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 23B4 TOP SQUARE BRACKET</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />&#x23B4;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />&#x23B4;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html
deleted file mode 100644
index b087f2ddb15..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-048-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FD3E ORNATE LEFT PARENTHESIS</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />&#xFD3E;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />&#xFD3E;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html
deleted file mode 100644
index 3aeff410e31..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-118-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 23B5 BOTTOM SQUARE BRACKET</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />中&#x23B5;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#x23B5;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html
deleted file mode 100644
index e1e1361e774..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-154-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FD3F ORNATE RIGHT PARENTHESIS</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />中&#xFD3F;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#xFD3F;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html
deleted file mode 100644
index a93b2261b68..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-216-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: 30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />中&#x30FC;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#x30FC;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html b/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html
deleted file mode 100644
index b0b4f7392fb..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-224-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8"/>
-<title>CSS3 Text, linebreaks: FF70 HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<meta name='flags' content=''>
-<style type='text/css'>
-@font-face {
-	font-family: 'mplus-1p-regular';
-	src: url('/fonts/mplus-1p-regular.woff') format('woff');
-	/* filesize: 803K */
-	}
-.test, .ref { font-size: 30px; font-family: mplus-1p-regular, sans-serif; width: 95px; padding: 0; border: 1px solid orange; line-height: 1em; }
-</style>
-</head>
-<body>
-<p class="instructions">Test passes if the two orange boxes are identical.</p>
-
-
-<div class='ref'>中中<br />中&#xFF70;文</div>
-
-
-
-
-
-<div class='ref'>中中<br />中&#xFF70;文</div>
-
-
-
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-025.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-025.xht
deleted file mode 100644
index 87dcaf34e2f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-025.xht
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Text Test: line-break - normal and prefixes</title>
-		<!-- prefixes -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-025-ref.xht" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before prefixes such as EURO SIGN (U+20AC) and FULLWIDTH DOLLAR SIGN (U+FF04)." />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			.test span {
-				line-break: normal;						// The property to be tested
-			}
-			p.test, p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 5px;
-				padding: 5px;
-			}
-		</style>
-	</head>
-	<body lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes DOLLAR SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes POUND SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes YEN SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes EURO SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes NUMERO SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH DOLLAR SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH POUND SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH YEN SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018a.xht
deleted file mode 100644
index d65f5257844..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018a.xht
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Text Test: line-break - strict and prefixes</title>
-		<!-- prefixes -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-strict-018a-ref.xht" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before prefixes such as EURO SIGN (U+20AC) and FULLWIDTH DOLLAR SIGN (U+FF04)." />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			.test span {
-				line-break: strict;						// The property to be tested
-			}
-			p.test, p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 10px;
-				padding: 10px;
-			}
-		</style>
-	</head>
-	<body lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes DOLLAR SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes POUND SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes YEN SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes EURO SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes NUMERO SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH DOLLAR SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018b.xht
deleted file mode 100644
index 62315b945b7..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018b.xht
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Text Test: line-break - strict and prefixes</title>
-		<!-- prefixes -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-strict-018b-ref.xht" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before prefixes such as EURO SIGN (U+20AC) and FULLWIDTH DOLLAR SIGN (U+FF04)." />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			.test span {
-				line-break: strict;						// The property to be tested
-			}
-			p.test, p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 10px;
-				padding: 10px;
-			}
-		</style>
-	</head>
-	<body lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH POUND SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH YEN SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-025-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-025-ref.xht
deleted file mode 100644
index 5f62f080541..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-025-ref.xht
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-025.xht -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 5px;
-				padding: 5px;
-			}
-		</style>
-	</head>
-	<body  lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes DOLLAR SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes POUND SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes YEN SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes EURO SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes NUMERO SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH DOLLAR SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH POUND SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH YEN SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018a-ref.xht
deleted file mode 100644
index ec2860fe175..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018a-ref.xht
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-strict-018.xht -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 10px;
-				padding: 10px;
-			}
-		</style>
-	</head>
-	<body  lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes DOLLAR SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0024;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes POUND SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a3;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes YEN SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a5;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes EURO SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x20ac;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes NUMERO SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2116;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH DOLLAR SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xff04;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018b-ref.xht
deleted file mode 100644
index 8d654a61572..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018b-ref.xht
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-strict-018.xht -->
-		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<meta http-equiv="content-language" content="en, ja" />
-		<style type="text/css">
-			@font-face
-			{
-				font-family: "mplus-1p-regular";
-				src: url("/fonts/mplus-1p-regular.woff") format("woff");
-				/* filesize: 803300 bytes (784.5 KBytes) */
-				/*
-				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
-				*/
-			}
-			p.control {
-				border: 1px solid gray;
-				color: blue;
-				font-family: "mplus-1p-regular";
-				width: 10em;
-			}
-			span.target {
-				background-color: aqua;
-			}
-			div.wrapper {
-				display: inline-block;
-				border: 1px solid;
-				margin: 10px;
-				padding: 10px;
-			}
-		</style>
-	</head>
-	<body  lang="en">
-		<p>
-			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
-		</p>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH POUND SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe1;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- prefixes FULLWIDTH YEN SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#xffe5;</span>サンプル文</span>
-			</p>
-		</div>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html
new file mode 100644
index 00000000000..08f956c9166
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Text — line breaking for nowrap and floats</title>
+<meta name=assert content="When whitespace: nowrap is specified, floats should not cause line breaks">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#white-space-property">
+<link rel=match href="reference/line-breaking-012-ref.html">
+<style>
+.container {
+    position: relative;
+    color:green;
+    line-height: 1em;
+    font-family: Ahem;
+    font-size: 20px;
+}
+
+.wrapper {
+    white-space: nowrap;
+}
+
+span {
+    float: left;
+}
+
+.fail {
+    color: red;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: -1;
+}
+</style>
+<body>
+  <p>There should be a green rectangle and no red.</p>
+  <div class="container">
+    <div class="fail">XX</div>
+    <div class="wrapper">X<span>X<span></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html
new file mode 100644
index 00000000000..463dc2287ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Reference File for line breaking tests</title>
+<style>
+div {
+    color:green;
+    line-height: 1em;
+    font-family: Ahem;
+    font-size: 20px;
+}
+</style>
+<body>
+    <p>There should be a green rectangle and no red.</p>
+    <div>XX</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-002-ref.xht b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-002-ref.xht
deleted file mode 100644
index 726103e2f5f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-002-ref.xht
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja">
-	<head>
-		<title>CSS Test: word-break - normal - basic cases Reftest Reference</title>
-		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
-		<style type="text/css">
-			<![CDATA[
-				p.control {
-					border: 1px solid gray;
-					color: blue;
-					font-family: "IPAMincho", "IPAGothic", "IPA明朝", "IPAゴシック";
-					width: 10em;
-				}
-				div.wrapper {
-					display: inline-block;
-					border: 1px solid;
-					margin: 10px;
-					padding: 10px;
-				}
-				span.attention {
-					color: red;
-				}
-			]]>
-		</style>
-	</head>
-	<body>
-		<p>
-			Test passes if each pair of upper and lower text in the square box is identical.
-		</p>
-		<div class="wrapper">
-			<p class="control">
-				<span>Filler Text Filler<br />Text Filler Text</span>
-			</p>
-			<p class="control">
-				<span>Filler Text Filler<br />Text Filler Text</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<p class="control">
-				<span>満たすための文字<br />Filler Text</span>
-			</p>
-			<p class="control">
-				<span>満たすための文字<br />Filler Text</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<p class="control">
-				<span>満たすための文字満た<br />すための文字</span>
-			</p>
-			<p class="control">
-				<span>満たすための文字満た<br />すための文字</span>
-			</p>
-		</div>
-		<p>
-			<span class="attention">* You will need a Japanese font.</span><br />
-			If you are unable to see font glyphs for certain characters using the browsers default font, install the <a href="http://ossipedia.ipa.go.jp/ipafont/">IPA Font(http://ossipedia.ipa.go.jp/ipafont/)</a> and reload this page.
-		</p>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-002.xht b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-002.xht
deleted file mode 100644
index 059dc19e93a..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-002.xht
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja">
-	<head>
-		<title>CSS Test: word-break - normal - basic cases</title>
-		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
-		<link rel="help" title="CSS Text Level 3: 5.2. Word Breaking Rules: the ‘word-break’ property" href="http://www.w3.org/TR/css-text-3/#word-break" />
-		<link rel="match" href="reference/word-break-normal-002-ref.xht"/>
-		<meta name="flags" content="font" />
-		<meta name="assert" content="Break lines according to their usual rules." />
-		<style type="text/css">
-			<![CDATA[
-				.test span {
-					word-break: normal;
-				}
-				/* the CSS below is not part of the test */
-				p.test, p.control {
-					border: 1px solid gray;
-					color: blue;
-					font-family: "IPAMincho", "IPAGothic", "IPA明朝", "IPAゴシック";
-					width: 10em;
-				}
-				div.wrapper {
-					display: inline-block;
-					border: 1px solid;
-					margin: 10px;
-					padding: 10px;
-				}
-				span.attention {
-					color: red;
-				}
-			]]>
-		</style>
-	</head>
-	<body>
-		<p>
-			Test passes if each pair of upper and lower text in the square box is identical.
-		</p>
-		<div class="wrapper">
-			<p class="test">
-				<span>Filler Text Filler Text Filler Text</span>
-			</p>
-			<p class="control">
-				<span>Filler Text Filler<br />Text Filler Text</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<p class="test">
-				<span>満たすための文字 Filler Text</span>
-			</p>
-			<p class="control">
-				<span>満たすための文字<br />Filler Text</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<p class="test">
-				<span>満たすための文字満たすための文字</span>
-			</p>
-			<p class="control">
-				<span>満たすための文字満た<br />すための文字</span>
-			</p>
-		</div>
-		<p>
-			<span class="attention">* You will need a Japanese font.</span><br />
-			If you are unable to see font glyphs for certain characters using the browsers default font, install the <a href="http://ossipedia.ipa.go.jp/ipafont/">IPA Font(http://ossipedia.ipa.go.jp/ipafont/)</a> and reload this page.
-		</p>
-	</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html
index b6b0de59e75..b923f380bda 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html
@@ -14,10 +14,4 @@ test(() => {
   assert_throws(new TypeError(), () => new CSSKeywordValue(''));
 }, 'Constructing CSSKeywordValue with an empty string throws a TypeError');
 
-test(() => {
-  let result = new CSSKeywordValue('lemon');
-  assert_throws(new TypeError(), () => result.value = '');
-  assert_equals(result.value, 'lemon');
-}, 'Updating CSSKeywordValue.value with an empty string throws a TypeError');
-
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html
new file mode 100644
index 00000000000..1af557fb086
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSKeywordValue.value</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-csskeywordvalue-value">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+const gTestArguments = [
+  { keyword: 'initial', description: 'a CSS wide keyword' },
+  { keyword: 'auto', description: 'a CSS keyword' },
+  { keyword: 'lemon', description: 'an unsupported CSS keyword' },
+  { keyword: '3! + 4@', description: 'a string containing multiple tokens' },
+  { keyword: '☺', description: 'a unicode string' },
+];
+
+for (const args of gTestArguments) {
+  test(() => {
+    const result = new CSSKeywordValue(args.keyword);
+    assert_not_equals(result, null, 'a CSSKeywordValue is created');
+    assert_equals(result.value, args.keyword, 'value reflects new value');
+  }, `CSSKeywordValue.value can be updated to ${args.description}`);
+}
+
+test(() => {
+  let result = new CSSKeywordValue('lemon');
+  assert_throws(new TypeError(), () => result.value = '');
+  assert_equals(result.value, 'lemon', 'value does not change');
+}, 'Updating CSSKeywordValue.value with an empty string throws a TypeError');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html
index fe163681ee9..1ebbf8de73b 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html
@@ -1,12 +1,11 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>CSSKeywordValue</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#csskeywordvalue">
-<meta name="assert" content="Test CSSKeywordValue constructor and attributes" />
+<title>CSSKeywordValue Constructor</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-csskeywordvalue-csskeywordvalue">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <body>
-<div id="log">
+<div id="log"></div>
 <script>
 'use strict';
 
@@ -18,23 +17,13 @@ const gTestArguments = [
   { keyword: '☺', description: 'a unicode string' },
 ];
 
-for (const {keyword, description} of gTestArguments) {
+for (const args of gTestArguments) {
   test(() => {
-    const result = new CSSKeywordValue(keyword);
-
-    assert_not_equals(result, null,
-        'A CSSKeywordValue should be created');
-    assert_equals(result.value, keyword,
-        'Value attribute should be same as passed in the constructor');
-  }, 'CSSKeywordValue can be constructed from ' + description);
-
-  test(() => {
-    let result = new CSSKeywordValue('auto');
-    result.value = keyword;
-
-    assert_equals(result.value, keyword,
-        'Value attribute should be same as passed in the setter');
-  }, 'CSSKeywordValue.value can be updated to ' + description);
+    const result = new CSSKeywordValue(args.keyword);
+    assert_not_equals(result, null, 'a CSSKeywordValue is created');
+    assert_equals(result.value, args.keyword,
+                  'value is same as given by constructor');
+  }, `CSSKeywordValue can be constructed from ${args.description}`);
 }
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html
new file mode 100644
index 00000000000..66d24beab09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'break' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+for (const suffix of ['after', 'before']) {
+  runPropertyTests('break-' + suffix, [
+    { syntax: 'auto' },
+    { syntax: 'avoid' },
+    { syntax: 'avoid-column' },
+    { syntax: 'avoid-page' },
+    { syntax: 'avoid-region' },
+    { syntax: 'column' },
+    { syntax: 'left' },
+    { syntax: 'page' },
+    { syntax: 'recto' },
+    { syntax: 'region' },
+    { syntax: 'right' },
+    { syntax: 'verso' },
+  ]);
+}
+
+runPropertyTests('break-inside', [
+    { syntax: 'auto' },
+    { syntax: 'avoid' },
+    { syntax: 'avoid-column' },
+    { syntax: 'avoid-page' },
+    { syntax: 'avoid-region' },
+  ]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html
new file mode 100644
index 00000000000..9ae512d2dfe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'caption-side' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('caption-side', [
+  { syntax: 'top' },
+  { syntax: 'bottom' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html
new file mode 100644
index 00000000000..650b08035df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-basis' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('flex-basis', [
+  { syntax: 'auto' },
+  { syntax: 'content' },
+  {
+    syntax: '<length>',
+    specified: assert_is_equal_with_range_handling,
+  },
+  {
+    syntax: '<percentage>',
+    specified: assert_is_equal_with_range_handling,
+  },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html
new file mode 100644
index 00000000000..49b7a983316
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-direction' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('flex-direction', [
+  { syntax: 'row' },
+  { syntax: 'row-reverse' },
+  { syntax: 'column' },
+  { syntax: 'column-reverse' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html
new file mode 100644
index 00000000000..3d6b46f2624
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-flow' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runUnsupportedPropertyTests('flex-flow', [
+  'row', 'column wrap', 'row-reverse wrap-reverse'
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html
new file mode 100644
index 00000000000..9c04ad30c86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-grow' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('flex-grow', [
+  {
+    syntax: '<number>',
+    specified: assert_is_equal_with_range_handling,
+  },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html
new file mode 100644
index 00000000000..30ee7db84d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-shrink' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('flex-shrink', [
+  {
+    syntax: '<number>',
+    specified: assert_is_equal_with_range_handling,
+  },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html
new file mode 100644
index 00000000000..56d14f64cf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex-wrap' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('flex-wrap', [
+  { syntax: 'nowrap' },
+  { syntax: 'wrap' },
+  { syntax: 'wrap-reverse' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html
new file mode 100644
index 00000000000..99a3e1219da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'flex' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runUnsupportedPropertyTests('flex', [
+  'auto', '2', '1 30px', '2 2 10%'
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html
new file mode 100644
index 00000000000..620f68ff653
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'font-size' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('font-size', [
+  {
+    syntax: 'xx-small',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'x-small',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'small',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'medium',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'large',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'x-large',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'xx-large',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'larger',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: 'smaller',
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: '<length>',
+    specified: assert_is_equal_with_range_handling,
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+  {
+    syntax: '<percentage>',
+    specified: assert_is_equal_with_range_handling,
+    computed: (_, result) => assert_is_unit('px', result)
+  },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html
new file mode 100644
index 00000000000..85f5749f94e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'isolation' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('isolation', [
+  { syntax: 'auto' },
+  { syntax: 'isolate' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html
new file mode 100644
index 00000000000..8f2cc07593b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>scroll-margin related properties</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+for (const suffix of ['top', 'left', 'right', 'bottom']) {
+  runPropertyTests('scroll-margin-' + suffix, [
+    { syntax: '<length>' },
+  ]);
+}
+
+for (const suffix of ['inline-start', 'block-start', 'inline-end', 'block-end']) {
+  runPropertyTests('scroll-margin-' + suffix, [
+    { syntax: '<length>' },
+  ]);
+}
+
+runUnsupportedPropertyTests('scroll-margin',
+  ['0px', '1px 2px', '3px 4px 5px', '6px 7px 8px 9px']
+);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html
new file mode 100644
index 00000000000..5ac27c433dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'unicode-bidi' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('unicode-bidi', [
+  { syntax: 'normal' },
+  { syntax: 'embed' },
+  { syntax: 'isolate' },
+  { syntax: 'bidi-override' },
+  { syntax: 'isolate-override' },
+  { syntax: 'plaintext' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html
new file mode 100644
index 00000000000..976a0ea22db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'writing-mode' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('writing-mode', [
+  { syntax: 'horizontal-tb' },
+  { syntax: 'vertical-rl' },
+  { syntax: 'vertical-lr' },
+  { syntax: 'sideways-rl' },
+  { syntax: 'sideways-lr' },
+]);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/GetBoundingRect.html b/tests/wpt/web-platform-tests/css/cssom-view/GetBoundingRect.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/cssom/GetBoundingRect.html
rename to tests/wpt/web-platform-tests/css/cssom-view/GetBoundingRect.html
index 6ab5e4c9b3f..7286bd09882 100644
--- a/tests/wpt/web-platform-tests/css/cssom/GetBoundingRect.html
+++ b/tests/wpt/web-platform-tests/css/cssom-view/GetBoundingRect.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>getBoundingClientRect</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getboundingclientrect">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSS.html b/tests/wpt/web-platform-tests/css/cssom/CSS.html
index 1bbecbfa3ba..fd2966a104c 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSS.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSS.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSSOM - CSS interface</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#the-css.escape()-method">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html b/tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html
index 532aa6fa910..3f6d1821867 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title></title>
+<link rel="help" href="https://drafts.csswg.org/css-animations/#interface-csskeyframerule">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type="text/css" id="styleElement">
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html b/tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html
index 68453498767..7d91127d1e0 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM -  CSSKeyframesRule interface</title>
+    <link rel="help" href="https://drafts.csswg.org/css-animations/#interface-csskeyframesrule">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html b/tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html
index 64ed94b6e7f..fbbaa3c5693 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - CSSNamespaceRule interface</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssnamespacerule-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html b/tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html
index a394779617d..4605b749648 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - CSSRuleList interface</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssrulelist-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
index 62ad133d5f6..86016ef5a3d 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - CSSStyleSheet interface</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssstylesheet-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style id="my-stylesheet">
diff --git a/tests/wpt/web-platform-tests/css/cssom/MediaList.html b/tests/wpt/web-platform-tests/css/cssom/MediaList.html
index bddb5c981cb..8308ee89e4b 100644
--- a/tests/wpt/web-platform-tests/css/cssom/MediaList.html
+++ b/tests/wpt/web-platform-tests/css/cssom/MediaList.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - MediaList interface</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-medialist-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html b/tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html
index 358264009a4..bb7d2ff4e3e 100644
--- a/tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html
+++ b/tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - StyleSheetList interface</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-stylesheetlist-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html b/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html
index c94b63e9b31..ed1cab257df 100644
--- a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html
+++ b/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html
@@ -4,7 +4,7 @@
         <title>CSSOM Parsing Test: @font-face rules toString() as valid interfaces</title>
         <link rel="author" title="Paul Irish" href="mailto:paul.irish@gmail.com">
         <link rel="reviewer" title="Ms2ger" href="mailto:ms2ger@gmail.com"> <!-- 2012-06-17 -->
-        <link rel="help" href="http://www.w3.org/TR/cssom-1/#css-font-face-rule">
+        <link rel="help" href="https://drafts.csswg.org/css-fonts-4/#om-fontface">
 
         <meta name="flags" content="dom">
 
diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html b/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html
index e44c3dc6578..9a06808e3ae 100644
--- a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html
+++ b/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html
@@ -3,7 +3,7 @@
     <head>
         <title>CSSOM Parsing Test: @font-face rules parsed into CSSOM CSSFontFaceRules</title>
         <link rel="author" title="Paul Irish" href="mailto:paul.irish@gmail.com">
-        <link rel="help" href="https://drafts.csswg.org/cssom/#css-rules">
+        <link rel="help" href="https://drafts.csswg.org/css-fonts-4/#om-fontface">
 
         <meta name="flags" content="dom">
 
diff --git a/tests/wpt/web-platform-tests/css/cssom/historical.html b/tests/wpt/web-platform-tests/css/cssom/historical.html
index ef31d14d3cf..d956f1410dc 100644
--- a/tests/wpt/web-platform-tests/css/cssom/historical.html
+++ b/tests/wpt/web-platform-tests/css/cssom/historical.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>Historical features</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#changes-from-5-december-2013">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff --git a/tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html b/tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html
index c350a1ac211..7e2d1767a0b 100644
--- a/tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html
+++ b/tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - Overlow property has different serialization than other shorthands.</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#serialize-a-css-value">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html b/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html
index 681d32f1865..43a76d1ef2e 100644
--- a/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html
+++ b/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>(Test #1) CSSOM - CSSStyleRule.selectorText Modification Restyle - Test #1</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext">
 <link rel="match" href="selectorText-modification-restyle-001-ref.html">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html b/tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html
index 0f165ae0cd2..804885a74a1 100644
--- a/tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html
+++ b/tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>cssom - Serialization of CSS declaration with "important" flag</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#serialize-a-css-declaration">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="noWhitespace" style="display: inline !important;"></div>
diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-values.html b/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
index df6c692d293..7334424a0a1 100644
--- a/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
+++ b/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSSOM serialize values</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#serializing-css-values">
 <meta name="author" title="Josh Matthews" href="mailto:josh@joshmatthews.net">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html b/tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html
index d714b81518b..b543bf40de1 100644
--- a/tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html
+++ b/tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSSOM - Serialization with variable preserves original serialization.</title>
+<link rel="help" href="https://drafts.csswg.org/css-variables/#serializing-custom-props">
+<link rel="help" href="https://drafts.csswg.org/css-variables/#variables-in-shorthands">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="longhand-whitespace" style="font-size: var(--a);"></div>
diff --git a/tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html b/tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html
index c34b1652626..522e181dbf5 100644
--- a/tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html
+++ b/tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html
@@ -3,6 +3,8 @@
 <head>
     <meta charset="utf-8">
     <title>Shorthand serialization should be done correctly.</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#serialize-a-css-declaration-block">
+    <link rel="help" href="https://drafts.csswg.org/css-variables/#variables-in-shorthands">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html b/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html
index 9df0a54b7d8..ccfbf7cec2c 100644
--- a/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html
+++ b/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>CSSOM - CSSStylesheet should support origins</title>
+    <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssstylesheet-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/css/cssom/variable-names.html b/tests/wpt/web-platform-tests/css/cssom/variable-names.html
index b951b7dfbb2..5591411e6e5 100644
--- a/tests/wpt/web-platform-tests/css/cssom/variable-names.html
+++ b/tests/wpt/web-platform-tests/css/cssom/variable-names.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Tests for handling of CSS Custom Property names</title>
+<link rel="help" href="https://drafts.csswg.org/css-variables/#serializing-custom-props">
 <meta name="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/support/blue32x32.ico b/tests/wpt/web-platform-tests/css/support/blue32x32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5844dd614c22028ce81422233c0aa400a6f41e0d
GIT binary patch
literal 326
pcmZQzU<5)11tu_Uz{tQL#=yX!0mKSG>;S|dd0gN>E{PE)4ggmv0v7-P

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/docs/_config.yml b/tests/wpt/web-platform-tests/docs/_config.yml
index c70d94b448d..91ece99d713 100644
--- a/tests/wpt/web-platform-tests/docs/_config.yml
+++ b/tests/wpt/web-platform-tests/docs/_config.yml
@@ -41,3 +41,5 @@ exclude:
   - vendor/bundle/
   - .bundle/
   - OWNERS
+sass:
+    sass_dir: assets/
diff --git a/tests/wpt/web-platform-tests/docs/_includes/header.html b/tests/wpt/web-platform-tests/docs/_includes/header.html
index 150d6163a59..6c966407672 100644
--- a/tests/wpt/web-platform-tests/docs/_includes/header.html
+++ b/tests/wpt/web-platform-tests/docs/_includes/header.html
@@ -1,5 +1,7 @@
 <header class="site-header" role="banner">
 
+  <a class="github-fork-ribbon left-top" href="https://github.com/w3c/web-platform-tests/blob/master/docs/{{ page.path }}" data-ribbon="Edit on GitHub">Edit on GitHub</a>
+
   <div class="wrapper">
 
     <a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a>
diff --git a/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md b/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
index d888a5c9ab2..1785a8dd610 100644
--- a/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
+++ b/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
@@ -7,8 +7,10 @@ To run WPT on Chrome on an Android device, some additional set up is required.
 First of all, as usual Android development, we need to have `adb` and be able to
 connect to the device.
 
-Furthermore, until we find a better way, we need to root the Android device and
-update the /etc/hosts file to include
+## Hosts
+
+Until we find a better way, we need to root the Android device and update the
+/etc/hosts file to include
 
 ```
 127.0.0.1   web-platform.test
@@ -20,7 +22,23 @@ update the /etc/hosts file to include
 0.0.0.0     nonexistent-origin.web-platform.test
 ```
 
-After this, we may run wpt with the `chrome_android` product
+## CA certificate
+
+In order to run HTTPS tests, we need to add
+[WPT's CA](https://github.com/w3c/web-platform-tests/blob/master/tools/certs/cacert.pem)
+to the phone. First, convert the certificate from PEM to CRT:
+
+```
+openssl x509 -outform der -in tools/certs/cacert.pem -out cacert.crt
+```
+
+Then copy `cacert.crt` to your phone's external storage (preferably to
+Downloads/ as it'll be easier to find). Open Settings -> Security & location ->
+Encryption & credentials -> Install from storage. Find and install `cacert.crt`.
+(The setting entries might be slightly different based your Android version.)
+
+
+Finally, we may run wpt with the `chrome_android` product
 
 ```
 ./wpt run chrome_android [test_list]
diff --git a/tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss b/tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss
new file mode 100644
index 00000000000..c81530bfdb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss
@@ -0,0 +1,124 @@
+/*!
+ * "Fork me on GitHub" CSS ribbon v0.2.2 | MIT License
+ * https://github.com/simonwhitaker/github-fork-ribbon-css
+*/
+
+.github-fork-ribbon {
+  width: 12.1em;
+  height: 12.1em;
+  position: absolute;
+  overflow: hidden;
+  top: 0;
+  right: 0;
+  z-index: 9999;
+  pointer-events: none;
+  font-size: 13px;
+  text-decoration: none;
+  text-indent: -999999px;
+}
+
+.github-fork-ribbon.fixed {
+  position: fixed;
+}
+
+.github-fork-ribbon:hover, .github-fork-ribbon:active {
+  background-color: rgba(0, 0, 0, 0.0);
+}
+
+.github-fork-ribbon:before, .github-fork-ribbon:after {
+  /* The right and left classes determine the side we attach our banner to */
+  position: absolute;
+  display: block;
+  width: 15.38em;
+  height: 1.54em;
+
+  top: 3.23em;
+  right: -3.23em;
+
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.github-fork-ribbon:before {
+  content: "";
+
+  /* Add a bit of padding to give some substance outside the "stitching" */
+  padding: .38em 0;
+
+  /* Set the base colour */
+  background-color: #a00;
+
+  /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
+  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.15)));
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
+  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
+  background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
+  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
+
+  /* Add a drop shadow */
+  -webkit-box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
+  box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
+
+  pointer-events: auto;
+}
+
+.github-fork-ribbon:after {
+  /* Set the text from the data-ribbon attribute */
+  content: attr(data-ribbon);
+
+  /* Set the text properties */
+  color: #fff;
+  font: 700 1em "Helvetica Neue", Helvetica, Arial, sans-serif;
+  line-height: 1.54em;
+  text-decoration: none;
+  text-shadow: 0 -.08em rgba(0, 0, 0, 0.5);
+  text-align: center;
+  text-indent: 0;
+
+  /* Set the layout properties */
+  padding: .15em 0;
+  margin: .15em 0;
+
+  /* Add "stitching" effect */
+  border-width: .08em 0;
+  border-style: dotted;
+  border-color: #fff;
+  border-color: rgba(255, 255, 255, 0.7);
+}
+
+.github-fork-ribbon.left-top, .github-fork-ribbon.left-bottom {
+  right: auto;
+  left: 0;
+}
+
+.github-fork-ribbon.left-bottom, .github-fork-ribbon.right-bottom {
+  top: auto;
+  bottom: 0;
+}
+
+.github-fork-ribbon.left-top:before, .github-fork-ribbon.left-top:after, .github-fork-ribbon.left-bottom:before, .github-fork-ribbon.left-bottom:after {
+  right: auto;
+  left: -3.23em;
+}
+
+.github-fork-ribbon.left-bottom:before, .github-fork-ribbon.left-bottom:after, .github-fork-ribbon.right-bottom:before, .github-fork-ribbon.right-bottom:after {
+  top: auto;
+  bottom: 3.23em;
+}
+
+.github-fork-ribbon.left-top:before, .github-fork-ribbon.left-top:after, .github-fork-ribbon.right-bottom:before, .github-fork-ribbon.right-bottom:after {
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
diff --git a/tests/wpt/web-platform-tests/docs/assets/main.scss b/tests/wpt/web-platform-tests/docs/assets/main.scss
index 4dc5e5c4147..6274e755100 100644
--- a/tests/wpt/web-platform-tests/docs/assets/main.scss
+++ b/tests/wpt/web-platform-tests/docs/assets/main.scss
@@ -164,3 +164,9 @@ nav.home {
         display: block !important;
     }
 }
+
+@import "gh-fork-ribbon";
+
+.github-fork-ribbon:before {
+    background-color: $grey-color-dark;
+}
diff --git a/tests/wpt/web-platform-tests/docs/introduction.md b/tests/wpt/web-platform-tests/docs/introduction.md
index d45d6223003..4e4932e21b2 100644
--- a/tests/wpt/web-platform-tests/docs/introduction.md
+++ b/tests/wpt/web-platform-tests/docs/introduction.md
@@ -151,7 +151,7 @@ After your `hosts` file is configured, the servers will be locally accessible at
 http://web-platform.test:8000/<br>
 https://web-platform.test:8443/ *
 
-\**See [Trusting Root CA](README.md#trusting-root-ca)*
+\**See [Trusting Root CA](https://github.com/w3c/web-platform-tests/blob/master/README.md#trusting-root-ca)*
 
 ## Running tests automatically
 
diff --git a/tests/wpt/web-platform-tests/domxpath/document.tentative.html b/tests/wpt/web-platform-tests/domxpath/document.tentative.html
new file mode 100644
index 00000000000..c44ebd99375
--- /dev/null
+++ b/tests/wpt/web-platform-tests/domxpath/document.tentative.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>XPath parent of documentElement</title>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<body>
+<script>
+test(function() {
+  var result = document.evaluate("..", // expression
+                                document.documentElement, // context node
+                                null, // resolver
+                                XPathResult.ANY_TYPE, // type
+                                null); // result
+  var matched = [];
+  var cur;
+  while ((cur = result.iterateNext()) !== null) {
+    matched.push(cur);
+  }
+  assert_array_equals(matched, [document]);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/entries-api/README.md b/tests/wpt/web-platform-tests/entries-api/README.md
new file mode 100644
index 00000000000..2f54d8bf891
--- /dev/null
+++ b/tests/wpt/web-platform-tests/entries-api/README.md
@@ -0,0 +1,9 @@
+Tests for the [Files and Directory Entries API](https://github.com/wicg/entries-api)
+
+* [Explainer](https://github.com/WICG/entries-api/blob/gh-pages/EXPLAINER.md)
+* [Draft Specification](https://wicg.github.io/entries-api/)
+
+Unfortunately, most of the tests are **manual** and require drag-and-drop of test
+data files, which can be found in the `entries-api/support` directory. The tests
+can be run via [w3c-test.org](http://w3c-test.org/entries-api/), but a local clone
+of the repo is required for access to the test data files.
diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm b/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm
new file mode 100644
index 00000000000..b1b74e88b82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm
@@ -0,0 +1,29 @@
+<!--
+self.close()
+var source = new EventSource("../resources/message.py")
+postMessage(source.readyState)
+/*-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>dedicated worker - EventSource created after: worker.close()</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+      var test = async_test();
+      test.step(function() {
+        var worker = new Worker('#')
+        worker.onmessage = function(e) {
+          test.step(function() {
+            assert_equals(e.data, EventSource.CONNECTING, 'this.readyState')
+          })
+          test.done()
+        }
+      })
+    </script>
+  </body>
+</html>
+<!--*/ //-->
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
new file mode 100644
index 00000000000..defe06ffedb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <!-- Feature-Policy: fullscreen *; -->
+  <script>
+  'use strict';
+  var same_origin = 'https://{{domains[]}}:{{ports[https][0]}}';
+  var cross_origin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  var same_origin_src = '/feature-policy/resources/feature-policy-allowedfeatures.html';
+  var cross_origin_src = cross_origin + same_origin_src;
+  var policies = [
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true},
+    {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false},
+    {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false},
+    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true}];
+  var pipe_front = '?pipe=sub|header(Feature-Policy,fullscreen ';
+  var pipe_end = ';)';
+  var header_policies = ["*", "'self'", "'none'"];
+
+  // Test that frame.policy inherits from parent's header policy when allow
+  // attribute is not specified.
+  test(function() {
+    test_frame_policy('fullscreen', same_origin_src, true);
+  }, 'Test frame policy on same origin iframe inherit from header policy.');
+  test(function() {
+    test_frame_policy('fullscreen', cross_origin_src, true);
+  }, 'Test frame policy on cross origin iframe inherit from header policy.');
+
+  // Test frame policy with allow attribute set to be one of the policies above.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow + '".');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow + '".');
+  }
+
+  // Test that the header policy of the iframe document does not change the
+  // frame policy.
+  for (var i = 0; i < policies.length; i++) {
+    for (var j = 0; j < header_policies.length; j++) {
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          same_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].sameOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          cross_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].crossOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+    }
+  }
+
+  // Test that the allow attribute overrides allowfullscreen.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+  }
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers
new file mode 100644
index 00000000000..111121a52fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers
@@ -0,0 +1 @@
+Feature-Policy: fullscreen *;
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
new file mode 100644
index 00000000000..d757d4c4cf5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <!-- Feature-Policy: fullscreen 'self'; -->
+  <script>
+  'use strict';
+  var same_origin = 'https://{{domains[]}}:{{ports[https][0]}}';
+  var cross_origin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  var same_origin_src = '/feature-policy/resources/feature-policy-allowedfeatures.html';
+  var cross_origin_src = cross_origin + same_origin_src;
+  var policies = [
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true},
+    {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false},
+    {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false},
+    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true}];
+  var pipe_front = '?pipe=sub|header(Feature-Policy,fullscreen ';
+  var pipe_end = ';)';
+  var header_policies = ["*", "'self'", "'none'"];
+
+  // Test that frame.policy inherits from parent's header policy when allow
+  // attribute is not specified.
+  test(function() {
+    test_frame_policy('fullscreen', same_origin_src, true);
+  }, 'Test frame policy on same origin iframe inherit from header policy.');
+  test(function() {
+    test_frame_policy('fullscreen', cross_origin_src, false);
+  }, 'Test frame policy on cross origin iframe inherit from header policy.');
+
+  // Test frame policy with allow attribute set to be one of the policies above.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow + '".');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow + '".');
+  }
+
+  // Test that the header policy of the iframe document does not change the
+  // frame policy.
+  for (var i = 0; i < policies.length; i++) {
+    for (var j = 0; j < header_policies.length; j++) {
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          same_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].sameOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          cross_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].crossOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+    }
+  }
+
+  // Test that the allow attribute overrides allowfullscreen.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+  }
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers
new file mode 100644
index 00000000000..0cc259b24f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers
@@ -0,0 +1 @@
+Feature-Policy: fullscreen 'self';
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
new file mode 100644
index 00000000000..f10c66fe0e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <!-- Feature-Policy: fullscreen 'self' cross_origin https://www.example.com; -->
+  <script>
+  'use strict';
+  var same_origin = 'https://{{domains[]}}:{{ports[https][0]}}';
+  var cross_origin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  var cross_origin1 = 'https://{{domains[www1]}}:{{ports[https][0]}}';
+  var same_origin_src = '/feature-policy/resources/feature-policy-allowedfeatures.html';
+  var cross_origin_src = cross_origin + same_origin_src;
+  var cross_origin_src1 = cross_origin1 + same_origin_src;
+  // Test feature policy with same_origin_src and cross_origin_src.
+  var policies = [
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: true},
+    {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false, crossOrigin1TestExpect: false},
+    {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false, crossOrigin1TestExpect: false},
+    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: false}];
+  var pipe_front = '?pipe=sub|header(Feature-Policy,fullscreen ';
+  var pipe_end = ';)';
+  var header_policies = ["*", "'self'", "'none'"];
+
+  // Test that frame.policy inherits from parent's header policy when allow
+  // attribute is not specified.
+  test(function() {
+    test_frame_policy('fullscreen', same_origin_src, true);
+  }, 'Test frame policy on same origin iframe inherit from header policy.');
+  test(function() {
+    test_frame_policy('fullscreen', cross_origin_src, true);
+  }, 'Test frame policy on cross origin iframe inherit from header policy.');
+  test(function() {
+    test_frame_policy('fullscreen', cross_origin_src1, false);
+  }, 'Test frame policy on another cross origin iframe inherit from header policy.');
+
+  // Test frame policy with allow attribute set to be one of the policies above.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow + '".');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow + '".');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src1, policies[i].crossOrigin1TestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on another cross origin iframe with allow = "' + policies[i].allow + '".');
+  }
+
+  // Test that the header policy of the iframe document does not change the
+  // frame policy.
+  for (var i = 0; i < policies.length; i++) {
+    for (var j = 0; j < header_policies.length; j++) {
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          same_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].sameOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          cross_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].crossOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          cross_origin_src1 + pipe_front + header_policies[j] + pipe_end,
+          policies[i].crossOrigin1TestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on another cross origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+    }
+  }
+
+  // Test that the allow attribute overrides allowfullscreen.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src1, policies[i].crossOrigin1TestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on another cross origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+  }
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers
new file mode 100644
index 00000000000..c2493a08903
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers
@@ -0,0 +1 @@
+Feature-Policy: fullscreen 'self' https://{{domains[www]}}:{{ports[https][0]}} https://www.example.com;
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html
new file mode 100644
index 00000000000..e1178e797d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <!-- Feature-Policy: fullscreen 'none'; -->
+  <script>
+  'use strict';
+  var same_origin = 'https://{{domains[]}}:{{ports[https][0]}}';
+  var cross_origin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  var same_origin_src = '/feature-policy/resources/feature-policy-allowedfeatures.html';
+  var cross_origin_src = cross_origin + same_origin_src;
+  var policies = [
+    {allow: "*", sameOriginTestExpect: false, crossOriginTestExpect: false},
+    {allow: "'self'", sameOriginTestExpect: false, crossOriginTestExpect: false},
+    {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false},
+    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: false, crossOriginTestExpect: false}];
+  var pipe_front = '?pipe=sub|header(Feature-Policy,fullscreen ';
+  var pipe_end = ';)';
+  var header_policies = ["*", "'self'", "'none'"];
+
+  // Test that frame.policy inherits from parent's header policy when allow
+  // attribute is not specified.
+  test(function() {
+    test_frame_policy('fullscreen', same_origin_src, false);
+  }, 'Test frame policy on same origin iframe inherit from header policy.');
+  test(function() {
+    test_frame_policy('fullscreen', cross_origin_src, false);
+  }, 'Test frame policy on cross origin iframe inherit from header policy.');
+
+  // Test frame policy with allow attribute set to be one of the policies above.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow + '".');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';');
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow + '".');
+  }
+
+  // Test that the header policy of the iframe document does not change the
+  // frame policy.
+  for (var i = 0; i < policies.length; i++) {
+    for (var j = 0; j < header_policies.length; j++) {
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          same_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].sameOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+      test(function() {
+        test_frame_policy(
+          'fullscreen',
+          cross_origin_src + pipe_front + header_policies[j] + pipe_end,
+          policies[i].crossOriginTestExpect,
+          'fullscreen ' + policies[i].allow + ';');
+      }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+         '" and header policy = "Feature-Policy: fullscreen ' + header_policies[j] + ';".');
+    }
+  }
+
+  // Test that the allow attribute overrides allowfullscreen.
+  for (var i = 0; i < policies.length; i++) {
+    test(function() {
+      test_frame_policy(
+        'fullscreen', same_origin_src, policies[i].sameOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on same origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+    test(function() {
+      test_frame_policy(
+        'fullscreen', cross_origin_src, policies[i].crossOriginTestExpect,
+        'fullscreen ' + policies[i].allow + ';', /*allowfullscreen*/true);
+    }, 'Test frame policy on cross origin iframe with allow = "' + policies[i].allow +
+       '" and allowfullscreen.');
+  }
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers
new file mode 100644
index 00000000000..961d40336ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers
@@ -0,0 +1 @@
+Feature-Policy: fullscreen 'none';
diff --git a/tests/wpt/web-platform-tests/feature-policy/interfaces.any.js b/tests/wpt/web-platform-tests/feature-policy/interfaces.any.js
new file mode 100644
index 00000000000..baebc2ff0c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/interfaces.any.js
@@ -0,0 +1,23 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+"use strict";
+
+// https://wicg.github.io/feature-policy/
+
+var idlArray = new IdlArray();
+
+function doTest(idl) {
+  idlArray.add_untested_idls("interface HTMLIFrameElement {};");
+  idlArray.add_idls(idl);
+  idlArray.add_objects({
+    HTMLIframeElement: ['document.createElement("iframe")'],
+  })
+  idlArray.test();
+  done();
+}
+
+promise_test(function () {
+  return fetch("/interfaces/feature-policy.idl").then(response => response.text())
+    .then(doTest);
+}, "Test interfaces");
diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
index 925408ea8a4..be8629d153d 100644
--- a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
+++ b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
@@ -383,3 +383,33 @@ function test_subframe_header_policy(
     });
   }, test_name);
 }
+
+// This function tests that frame policy allows a given feature correctly. A
+// feature is allowed in a frame either through inherited policy or specified
+// by iframe allow attribute.
+// Arguments:
+//     feature: feature name.
+//     src: the URL to load in the frame.
+//     test_expect: boolean value of whether the feature should be allowed.
+//     allow: optional, the allow attribute (container policy) of the iframe.
+//     allowfullscreen: optional, boolean value of allowfullscreen attribute.
+function test_frame_policy(
+    feature, src, test_expect, allow, allowfullscreen) {
+  let frame = document.createElement('iframe');
+  document.body.appendChild(frame);
+  // frame_policy should be dynamically updated as allow and allowfullscreen is
+  // updated.
+  var frame_policy = frame.policy;
+  if (typeof allow !== 'undefined') {
+    frame.setAttribute('allow', allow);
+  }
+  if (!!allowfullscreen) {
+    frame.setAttribute('allowfullscreen', true);
+  }
+  frame.src = src;
+  if (test_expect) {
+    assert_true(frame_policy.allowedFeatures().includes(feature));
+  } else {
+    assert_false(frame_policy.allowedFeatures().includes(feature));
+  }
+}
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.html b/tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.html
index 83a1a1f0e0c..d247a7ff2db 100644
--- a/tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.html
+++ b/tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.html
@@ -48,6 +48,17 @@
         assert_throws(new TypeError(), function() { new Request(bodyConsumed); });
       }, "Check creating a new request from a disturbed request");
 
+      promise_test(function() {
+        assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
+        const originalBody = bodyConsumed.body;
+        const bodyReplaced = new Request(bodyConsumed, { body: "Replaced body" });
+        assert_not_equals(bodyReplaced.body, originalBody, "new request's body is new");
+        assert_false(bodyReplaced.bodyUsed, "bodyUsed is false when request is not disturbed");
+        return bodyReplaced.text().then(text => {
+          assert_equals(text, "Replaced body");
+        });
+      }, "Check creating a new request with a new body from a disturbed request");
+
       promise_test(function() {
         var bodyRequest = new Request("", initValuesDict);
         const originalBody = bodyRequest.body;
@@ -58,7 +69,7 @@
         assert_not_equals(originalBody, undefined, "body should not be undefined");
         assert_not_equals(originalBody, null, "body should not be null");
         assert_not_equals(requestFromRequest.body, originalBody, "new request's body is new");
-        return requestFromRequest.text(text => {
+        return requestFromRequest.text().then(text => {
           assert_equals(text, "Request's body");
         });
       }, "Input request used for creating new request became disturbed");
@@ -74,7 +85,7 @@
         assert_not_equals(originalBody, null, "body should not be null");
         assert_not_equals(requestFromRequest.body, originalBody, "new request's body is new");
 
-        return requestFromRequest.text(text => {
+        return requestFromRequest.text().then(text => {
           assert_equals(text, "init body");
         });
       }, "Input request used for creating new request became disturbed even if body is not used");
diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
index dd9869125ab..976d42731d1 100644
--- a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
@@ -9,5 +9,17 @@
 "use strict";
 
 run_fp_tests_disabled(GeolocationSensor);
+
+promise_test(async t => {
+  await promise_rejects(t, 'SecurityError', GeolocationSensor.read());
+}, "GeolocationSensor.read(): 'SecurityError' is thrown when disabled by Feature Policy");
+
+promise_test(async t => {
+  const controller = new AbortController();
+  const signal = controller.signal;
+  controller.abort();
+
+  await promise_rejects(t, 'AbortError', GeolocationSensor.read({ signal }));
+}, "GeolocationSensor.read(): 'AbortError' takes priority");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html b/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html
new file mode 100644
index 00000000000..9eb0339a185
--- /dev/null
+++ b/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>GeolocationSensor.read() Test</title>
+<link rel="author" title="Intel" href="http://www.intel.com">
+<link rel="help" href="https://wicg.github.io/geolocation-sensor/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+const properties = [
+  'timestamp',
+  'latitude',
+  'longitude',
+  'altitude',
+  'accuracy',
+  'altitudeAccuracy',
+  'heading',
+  'speed'
+];
+
+promise_test(async t => {
+  const geo = await GeolocationSensor.read({ signal: null });
+  assert_not_equals(geo.timestamp, null);
+  properties.forEach(property => assert_own_property(geo, property));
+}, "Test that read() method resolves with valid reading when signal is null");
+
+promise_test(async t => {
+  const geo = await GeolocationSensor.read();
+  assert_not_equals(geo.timestamp, null);
+  properties.forEach(property => assert_own_property(geo, property));
+}, "Test that read() method resolves with valid reading");
+
+promise_test(async t => {
+  const controller = new AbortController();
+  const signal = controller.signal;
+  controller.abort();
+
+  await promise_rejects(t, 'AbortError', GeolocationSensor.read({ signal }));
+}, "Test that read() method rejects 'AbortError' if signal's aborted flag is set");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html b/tests/wpt/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html
index 08d127e84b1..cd2d019c47d 100644
--- a/tests/wpt/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html
+++ b/tests/wpt/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html
@@ -40,7 +40,7 @@ function runWindowTests (baselineDimensions) {
       var prefixedMessage = new PrefixedMessageTest();
       prefixedMessage.onMessage(t.step_func_done((data, e) => {
         e.source.close();
-        assert_equals(data.width, baselineDimensions.width);
+        assert_equals(data.height, baselineDimensions.height);
       }));
       var win = window.open(prefixedMessage.url(windowURL), '', feature);
     }, `${feature}: absence of feature "height" should be treated same as "height=0"`);
diff --git a/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js
new file mode 100644
index 00000000000..704130abfe9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js
@@ -0,0 +1,20 @@
+["replace",
+ "NOBODY",
+ "@ FD ;",
+ "it does not matter, you see \f",
+ "text/plain",
+ "text/xml",
+ "application/octet-stream",
+ "\0"].forEach(type => {
+  async_test(t => {
+    const frame = document.body.appendChild(document.createElement("iframe"));
+    t.add_cleanup(() => frame.remove());
+    frame.contentDocument.open(type);
+    frame.contentDocument.write("<B>heya</b>");
+    frame.contentDocument.close();
+    assert_equals(frame.contentDocument.body.firstChild.localName, "b");
+    assert_equals(frame.contentDocument.body.textContent, "heya");
+    assert_equals(frame.contentDocument.contentType, "text/html");
+    t.done();
+  }, "document.open() with type set to: " + type + " (type argument is supposed to be ignored)");
+});
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html b/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html
index a4bc173baaa..e991e19f059 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html
+++ b/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html
@@ -13,13 +13,13 @@
 "use strict";
 async_test(function(t) {
   var request = new XMLHttpRequest();
-  request.open("GET", "domstringlist.idl");
+  request.open("GET", "/interfaces/html.idl");
   request.send();
   request.onload = t.step_func(function() {
     var idlArray = new IdlArray();
     var idls = request.responseText;
 
-    idlArray.add_idls(idls);
+    idlArray.add_idls(idls, { only: ["DOMStringList"] });
 
     idlArray.add_objects({
       DOMStringList: ['location.ancestorOrigins'],
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js b/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js
index 0231b5058ce..e957b9e9b50 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js
+++ b/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js
@@ -5,13 +5,13 @@ importScripts("/resources/WebIDLParser.js", "/resources/idlharness.js");
 
 async_test(function(t) {
   var request = new XMLHttpRequest();
-  request.open("GET", "domstringlist.idl");
+  request.open("GET", "/interfaces/html.idl");
   request.send();
   request.onload = t.step_func(function() {
     var idlArray = new IdlArray();
     var idls = request.responseText;
 
-    idlArray.add_idls(idls);
+    idlArray.add_idls(idls, { only: ["DOMStringList"] });
 
     idlArray.add_objects({
       DOMStringList: [],
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.idl b/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.idl
deleted file mode 100644
index 9b72a7c834c..00000000000
--- a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-[Exposed=(Window,Worker)]
-interface DOMStringList {
-  readonly attribute unsigned long length;
-  getter DOMString? item(unsigned long index);
-  boolean contains(DOMString string);
-};
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py
new file mode 100644
index 00000000000..5fc67faa880
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py
@@ -0,0 +1,2 @@
+def main(request, response):
+    return ([("Content-Type", "text/html")], "<script>parent.postMessage(\"" + str(request.POST.first("testinput")) + "\", '*');</script>")
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html
new file mode 100644
index 00000000000..1cf939cdaa9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<iframe id=testframe name=testframe></iframe>
+<form id=testform method=post action="//{{domains[www1]}}:{{location[port]}}/html/semantics/forms/form-submission-0/resources/file-submission.py" target=testframe enctype="multipart/form-data">
+<input name=testinput id=testinput type=file>
+</form>
+<script>
+async_test(t => {
+  const dataTransfer = new DataTransfer();
+  dataTransfer.items.add(new File(["foobar"], "name"));
+  assert_equals(1, dataTransfer.files.length);
+
+  testinput.files = dataTransfer.files;
+  testform.submit();
+
+  onmessage = e => {
+    if (e.source !== testframe) return;
+    assert_equals("FieldStorage('testinput', 'name', 'foobar')", e.data);
+    t.done();
+  };
+}, 'Posting a File');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html b/tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html
new file mode 100644
index 00000000000..be6b42d07d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/parsing.html#tree-construction:html-integration-point">
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<math><annotation-xml id="point-1" encoding="text/html"><xmp>&lt;/xmp&gt;&lt;img></xmp></annotation-xml></math>
+<math><annotation-xml id="point-2" encoding="application/xhtml+xml"><style>&lt;/style&gt;&lt;img></style></annotation-xml></math>
+<svg><foreignObject id="point-3"><iframe>&lt;/iframe&gt;&lt;img></iframe></foreignObject></svg>
+<svg><desc id="point-4"><noembed>&lt;/noembed&gt;&lt;img></noembed></desc></svg>
+<svg><title id="point-5"><noframes>&lt;/noframes&gt;&lt;img></noframes></title></svg>
+
+<script>
+function generate_test(id) {
+  return () => {
+    let point = document.querySelector('#' + id);
+    assert_not_equals(point.namespaceURI, 'http://www.w3.org/1999/xhtml');
+    let rawTextElement = point.firstChild;
+    assert_equals(rawTextElement.namespaceURI, 'http://www.w3.org/1999/xhtml');
+    assert_equals(rawTextElement.textContent.substr(0, 4), '&lt;',
+                  'Entity references should not be decoded.');
+  };
+}
+
+test(generate_test('point-1'), 'MathML annotation-xml with encoding=text/html should be an HTML integration point');
+test(generate_test('point-2'), 'MathML annotation-xml with encoding=application/xhtml+xml should be an HTML integration point');
+test(generate_test('point-3'), 'SVG foreignObject should be an HTML integration point');
+test(generate_test('point-4'), 'SVG desc should be an HTML integration point');
+test(generate_test('point-5'), 'SVG title should be an HTML integration point');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/click.html
new file mode 100644
index 00000000000..37721ad9ef3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/click.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver click method</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<button type="button" id="button">Button</button>
+
+<script>
+async_test(t => {
+  let button = document.getElementById("button");
+  test_driver
+    .click(button)
+    .then(() => t.done())
+    .catch(t.unreached_func("click failed"));
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
index d4f64593741..6d4f35973cb 100644
--- a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
@@ -7,23 +7,17 @@ dictionary CookieListItem {
 
 typedef sequence<CookieListItem> CookieList;
 
+dictionary CookieChangeEventInit : EventInit {
+  CookieList changed;
+  CookieList deleted;
+};
+
 [
-  Exposed=(ServiceWorker,Window)
-] interface CookieStore {
-  Promise<CookieList?> getAll(USVString name, optional CookieStoreGetOptions options);
-  Promise<CookieList?> getAll(optional CookieStoreGetOptions options);
-
-  Promise<CookieListItem?> get(USVString name, optional CookieStoreGetOptions options);
-  Promise<CookieListItem?> get(optional CookieStoreGetOptions options);
-
-  Promise<boolean> has(USVString name, optional CookieStoreGetOptions options);
-  Promise<boolean> has(optional CookieStoreGetOptions options);
-
-  Promise<void> set(USVString name, USVString value, optional CookieStoreSetOptions options);
-  Promise<void> set(CookieStoreSetOptions options);
-
-  Promise<void> delete(USVString name, optional CookieStoreSetOptions options);
-  Promise<void> delete(CookieStoreSetOptions options);
+  Exposed=(ServiceWorker,Window),
+  Constructor(DOMString type, optional CookieChangeEventInit eventInitDict)
+] interface CookieChangeEvent : Event {
+  readonly attribute CookieList changed;
+  readonly attribute CookieList deleted;
 };
 
 enum CookieMatchType {
@@ -47,6 +41,27 @@ dictionary CookieStoreSetOptions {
   boolean httpOnly = false;
 };
 
+[
+  Exposed=(ServiceWorker,Window)
+] interface CookieStore : EventTarget {
+  Promise<CookieList?> getAll(USVString name, optional CookieStoreGetOptions options);
+  Promise<CookieList?> getAll(optional CookieStoreGetOptions options);
+
+  Promise<CookieListItem?> get(USVString name, optional CookieStoreGetOptions options);
+  Promise<CookieListItem?> get(optional CookieStoreGetOptions options);
+
+  Promise<boolean> has(USVString name, optional CookieStoreGetOptions options);
+  Promise<boolean> has(optional CookieStoreGetOptions options);
+
+  Promise<void> set(USVString name, USVString value, optional CookieStoreSetOptions options);
+  Promise<void> set(CookieStoreSetOptions options);
+
+  Promise<void> delete(USVString name, optional CookieStoreSetOptions options);
+  Promise<void> delete(CookieStoreSetOptions options);
+
+  attribute EventHandler onchange;
+};
+
 partial interface Window {
   [Replaceable, SameObject] readonly attribute CookieStore cookieStore;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
new file mode 100644
index 00000000000..56091017172
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
@@ -0,0 +1,86 @@
+typedef (ArrayBuffer or ArrayBufferView) BinaryData;
+
+dictionary FontFaceDescriptors {
+  CSSOMString style = "normal";
+  CSSOMString weight = "normal";
+  CSSOMString stretch = "normal";
+  CSSOMString unicodeRange = "U+0-10FFFF";
+  CSSOMString variant = "normal";
+  CSSOMString featureSettings = "normal";
+  CSSOMString variationSettings = "normal";
+  CSSOMString display = "auto";
+};
+
+enum FontFaceLoadStatus { "unloaded", "loading", "loaded", "error" };
+
+[Constructor(CSSOMString family, (CSSOMString or BinaryData) source,
+             optional FontFaceDescriptors descriptors),
+ Exposed=(Window,Worker)]
+interface FontFace {
+  attribute CSSOMString family;
+  attribute CSSOMString style;
+  attribute CSSOMString weight;
+  attribute CSSOMString stretch;
+  attribute CSSOMString unicodeRange;
+  attribute CSSOMString variant;
+  attribute CSSOMString featureSettings;
+  attribute CSSOMString variationSettings;
+  attribute CSSOMString display;
+
+  readonly attribute FontFaceLoadStatus status;
+
+  Promise<FontFace> load();
+  readonly attribute Promise<FontFace> loaded;
+};
+
+dictionary FontFaceSetLoadEventInit : EventInit {
+  sequence<FontFace> fontfaces = [];
+};
+
+[Constructor(CSSOMString type, optional FontFaceSetLoadEventInit eventInitDict),
+ Exposed=(Window,Worker)]
+interface FontFaceSetLoadEvent : Event {
+  [SameObject] readonly attribute FrozenArray<FontFace> fontfaces;
+};
+
+enum FontFaceSetLoadStatus { "loading", "loaded" };
+
+callback ForEachCallback = void (FontFace font, long index, FontFaceSet self);
+
+[Exposed=(Window,Worker),
+ Constructor(sequence<FontFace> initialFaces)]
+interface FontFaceSet : EventTarget {
+  // FontFaceSet is Set-like!
+  setlike<FontFace>;
+  FontFaceSet add(FontFace font);
+  boolean delete(FontFace font);
+  void clear();
+
+  // events for when loading state changes
+  attribute EventHandler onloading;
+  attribute EventHandler onloadingdone;
+  attribute EventHandler onloadingerror;
+
+  // check and start loads if appropriate
+  // and fulfill promise when all loads complete
+  Promise<sequence<FontFace>> load(CSSOMString font, optional CSSOMString text = " ");
+
+  // return whether all fonts in the fontlist are loaded
+  // (does not initiate load if not available)
+  boolean check(CSSOMString font, optional CSSOMString text = " ");
+
+  // async notification that font loading and layout operations are done
+  readonly attribute Promise<FontFaceSet> ready;
+
+  // loading state, "loading" while one or more fonts loading, "loaded" otherwise
+  readonly attribute FontFaceSetLoadStatus status;
+};
+
+[Exposed=(Window,Worker),
+ NoInterfaceObject]
+interface FontFaceSource {
+  readonly attribute FontFaceSet fonts;
+};
+
+Document implements FontFaceSource;
+WorkerGlobalScope implements FontFaceSource;
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index ae65018c71b..4186f1d2df5 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -440,14 +440,22 @@ interface Comment : CharacterData {
 };
 
 
-[Constructor,
- Exposed=Window]
-interface Range {
+[Exposed=Window]
+interface AbstractRange {
   readonly attribute Node startContainer;
   readonly attribute unsigned long startOffset;
   readonly attribute Node endContainer;
   readonly attribute unsigned long endOffset;
   readonly attribute boolean collapsed;
+};
+
+[Exposed=Window]
+interface StaticRange : AbstractRange {
+};
+
+[Constructor,
+ Exposed=Window]
+interface Range : AbstractRange {
   readonly attribute Node commonAncestorContainer;
 
   void setStart(Node node, unsigned long offset);
diff --git a/tests/wpt/web-platform-tests/interfaces/feature-policy.idl b/tests/wpt/web-platform-tests/interfaces/feature-policy.idl
new file mode 100644
index 00000000000..f11815ac543
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/feature-policy.idl
@@ -0,0 +1,7 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Feature Policy spec.
+// See https://wicg.github.io/feature-policy/
+
+partial interface HTMLIFrameElement {
+    [CEReactions] attribute DOMString allow;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/hr-time.idl b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
index ccbbc332326..3c793c328c6 100644
--- a/tests/wpt/web-platform-tests/interfaces/hr-time.idl
+++ b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
@@ -1,13 +1,17 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the High Resolution Time spec.
+// See https://w3c.github.io/hr-time/
+
 typedef double DOMHighResTimeStamp;
 
 [Exposed=(Window,Worker)]
 interface Performance : EventTarget {
-    DOMHighResTimeStamp now();
+    DOMHighResTimeStamp now ();
     readonly attribute DOMHighResTimeStamp timeOrigin;
-    [Default] object              toJSON();
+    [Default] object toJSON();
 };
 
 partial interface WindowOrWorkerGlobalScope {
     [Replaceable]
-    readonly attribute Performance performance;
+    readonly    attribute Performance performance;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 49348a723b3..89558dfe133 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -2,7 +2,7 @@
  LegacyUnenumerableNamedProperties]
 interface HTMLAllCollection {
   readonly attribute unsigned long length;
-  getter Element? (unsigned long index);
+  getter Element (unsigned long index);
   getter (HTMLCollection or Element)? namedItem(DOMString name);
   (HTMLCollection or Element)? item(optional DOMString nameOrIndex);
 
diff --git a/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl b/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
index 7db942ea955..faa1c93b70b 100644
--- a/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
+++ b/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
@@ -1,28 +1,34 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Screen Orientation API spec.
+// See https://w3c.github.io/screen-orientation/
+
 partial interface Screen {
-    [SameObject]
-    readonly attribute ScreenOrientation orientation;
+  [SameObject] readonly attribute ScreenOrientation orientation;
 };
+
 [Exposed=Window]
 interface ScreenOrientation : EventTarget {
-    Promise<void> lock(OrientationLockType orientation);
-    void          unlock();
-    readonly attribute OrientationType type;
-    readonly attribute unsigned short  angle;
-             attribute EventHandler    onchange;
+  Promise<void> lock(OrientationLockType orientation);
+  void unlock();
+  readonly attribute OrientationType type;
+  readonly attribute unsigned short angle;
+  attribute EventHandler onchange;
 };
+
 enum OrientationType {
-    "portrait-primary",
-    "portrait-secondary",
-    "landscape-primary",
-    "landscape-secondary"
+  "portrait-primary",
+  "portrait-secondary",
+  "landscape-primary",
+  "landscape-secondary"
 };
+
 enum OrientationLockType {
-    "any",
-    "natural",
-    "landscape",
-    "portrait",
-    "portrait-primary",
-    "portrait-secondary",
-    "landscape-primary",
-    "landscape-secondary"
+  "any",
+  "natural",
+  "landscape",
+  "portrait",
+  "portrait-primary",
+  "portrait-secondary",
+  "landscape-primary",
+  "landscape-secondary"
 };
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 74ecc09bf41..42c7d48afc4 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -889,25 +889,7 @@ SUPPORT-WRONG-DIR: css/css-timing/testcommon.js
 MISSING-LINK: css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
 MISSING-LINK: css/css-typed-om/declared-styleMap-accepts-inherit.html
 MISSING-LINK: css/css-typed-om/styleMap-update-function.html
-MISSING-LINK: css/cssom/CSS.html
-MISSING-LINK: css/cssom/CSSKeyframeRule.html
-MISSING-LINK: css/cssom/CSSKeyframesRule.html
-MISSING-LINK: css/cssom/CSSNamespaceRule.html
-MISSING-LINK: css/cssom/CSSRuleList.html
-MISSING-LINK: css/cssom/CSSStyleSheet.html
-MISSING-LINK: css/cssom/GetBoundingRect.html
-MISSING-LINK: css/cssom/historical.html
-MISSING-LINK: css/cssom/MediaList.html
-MISSING-LINK: css/cssom/overflow-serialization.html
-MISSING-LINK: css/cssom/selectorText-modification-restyle-001.html
-MISSING-LINK: css/cssom/serialization-CSSDeclaration-with-important.html
-MISSING-LINK: css/cssom/serialize-values.html
-MISSING-LINK: css/cssom/serialize-variable-reference.html
-MISSING-LINK: css/cssom/shorthand-serialization.html
 SUPPORT-WRONG-DIR: css/cssom/stylesheet-same-origin.css
-MISSING-LINK: css/cssom/stylesheet-same-origin.sub.html
-MISSING-LINK: css/cssom/StyleSheetList.html
-MISSING-LINK: css/cssom/variable-names.html
 MISSING-LINK: css/cssom-view/DOMRectList.html
 MISSING-LINK: css/cssom-view/elementFromPoint-002.html
 MISSING-LINK: css/cssom-view/elementFromPoint-003.html
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
index f2b32516475..a047a30873c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
@@ -62,7 +62,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
index 08d639dd488..54451138868 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
@@ -50,7 +50,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
index ee06e19fd57..327a72e30b5 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
index beddc512a77..67a46138134 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
@@ -50,7 +50,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
index bc710f302f6..9bc6bcbf277 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
@@ -62,7 +62,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
index 462c8193374..1e5a6606b03 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
@@ -38,7 +38,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
index afd5b8e77a9..c28f29c99e6 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
@@ -38,7 +38,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
index 29b023b3051..0172ff1c700 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
@@ -41,7 +41,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
index 4dfe2eae975..061cda79af9 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
@@ -41,7 +41,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
index f68f13df77d..50c3491e487 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
index a616e7f2336..2749e09c48a 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
@@ -32,7 +32,8 @@
   }
 
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
index 3dadb399a26..a7133f89ecf 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
index 83604b1e70e..a29b5832a9e 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
@@ -34,6 +34,10 @@ promise_test(function() {
         if (mediainfo.kind == "audioinput") {
           assert_equals(typeof capabilities.echoCancellation, "object", "echoCancellation must be an object.");
         }
+        if (mediainfo.kind == "videoinput") {
+          assert_equals(typeof capabilities.facingMode, "object", "facingMode must be an object.");
+          verifyVideoRangeProperties(capabilities);
+        }
       } else if ( mediainfo.kind == "audiooutput" ) {
         assert_true(mediainfo instanceof MediaDeviceInfo);
       } else {
@@ -42,6 +46,33 @@ promise_test(function() {
     }
   });
 }, "mediaDevices.enumerateDevices() is present and working on navigator");
+
+function verifyVideoRangeProperties(capabilities) {
+  if (capabilities.hasOwnProperty('width')) {
+      assert_equals(Object.keys(capabilities.width).length, 2);
+      assert_true(capabilities.width.hasOwnProperty('min'));
+      assert_true(capabilities.width.hasOwnProperty('max'));
+      assert_less_than_equal(capabilities.width.min, capabilities.width.max);
+  }
+  if (capabilities.hasOwnProperty('height')) {
+    assert_equals(Object.keys(capabilities.height).length, 2);
+    assert_true(capabilities.height.hasOwnProperty('min'));
+    assert_true(capabilities.height.hasOwnProperty('max'));
+    assert_less_than_equal(capabilities.height.min, capabilities.height.max);
+  }
+  if (capabilities.hasOwnProperty('aspectRatio')) {
+    assert_equals(Object.keys(capabilities.aspectRatio).length, 2);
+    assert_true(capabilities.aspectRatio.hasOwnProperty('min'));
+    assert_true(capabilities.aspectRatio.hasOwnProperty('max'));
+    assert_less_than_equal(capabilities.aspectRatio.min, capabilities.aspectRatio.max);
+  }
+  if (capabilities.hasOwnProperty('frameRate')) {
+    assert_equals(Object.keys(capabilities.frameRate).length, 2);
+    assert_true(capabilities.frameRate.hasOwnProperty('min'));
+    assert_true(capabilities.frameRate.hasOwnProperty('max'));
+    assert_less_than_equal(capabilities.frameRate.min, capabilities.frameRate.max);
+  }
+}
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..f0c5ae172ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..e592db53c3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..ee9c3c6d22d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..e050885df3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..369044ff69e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..aea84f71e64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
new file mode 100644
index 00000000000..83d425c58eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-https
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-https",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
new file mode 100644
index 00000000000..728e6ce73ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-https
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-https",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..4753bb3208d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
new file mode 100644
index 00000000000..e82c6cfdc18
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
new file mode 100644
index 00000000000..d9c87b30c54
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: same-host-https
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: allowed">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "same-host-https",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..2a4f6a5e459
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..6b9d9b4f826
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..a3f302ae60b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..0a507e5b109
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..5375ae50b97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
new file mode 100644
index 00000000000..c6afc29050c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-http
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-http",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
new file mode 100644
index 00000000000..2b83f31198b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-https
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: beacon-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-https",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "beacon-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
new file mode 100644
index 00000000000..efc6ce6881d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-https
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: beacon-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-https",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "beacon-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/common.js b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
index b2673e0d9c1..12e9262ca07 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/common.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
@@ -304,6 +304,26 @@ function requestViaLinkPrefetch(url) {
   }
 }
 
+/**
+ * Initiates a new beacon request.
+ * @param {string} url The URL of a resource to prefetch.
+ * @return {Promise} The promise for success/error events.
+ */
+async function requestViaSendBeacon(url) {
+  function wait(ms) {
+    return new Promise(resolve => step_timeout(resolve, ms));
+  }
+  if (!navigator.sendBeacon(url)) {
+    // If mixed-content check fails, it should return false.
+    throw new Error('sendBeacon() fails.');
+  }
+  // We don't have a means to see the result of sendBeacon() request
+  // for sure. Let's wait for a while and let the generic test function
+  // ask the server for the result.
+  await wait(500);
+  return 'allowed';
+}
+
 /**
  * Creates a new media element with a child source element, binds loadeddata and
  *     error events, sets attributes and appends to document.body.
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
index fa27a3d6ae1..f0e2d340fcf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
@@ -59,6 +59,7 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
   var resourceMap = {
     "a-tag": requestViaAnchor,
     "area-tag": requestViaArea,
+    "beacon-request": requestViaSendBeacon,
     "fetch-request": requestViaFetch,
     "form-tag": requestViaForm,
     "iframe-tag": requestViaIframe,
@@ -81,6 +82,7 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
   var contentType = {
     "a-tag": "text/html",
     "area-tag": "text/html",
+    "beacon-request": "text/plain",
     "fetch-request": "application/json",
     "form-tag": "text/html",
     "iframe-tag": "text/html",
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec.src.json b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
index e59fa9f8c4c..54479ef4282 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec.src.json
+++ b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
@@ -240,7 +240,8 @@
         "object-tag",
         "picture-tag",
         "websocket-request",
-        "link-prefetch-tag"
+        "link-prefetch-tag",
+        "beacon-request"
       ],
       "optionally-blockable": [
         "img-tag",
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec_json.js b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
index f70e3ccc000..1bd1ecc8a26 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec_json.js
+++ b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http", "same-host-wss", "same-host-ws", "cross-origin-wss", "cross-origin-ws"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr-request", "worker-request", "fetch-request", "a-tag", "object-tag", "picture-tag", "websocket-request", "link-prefetch-tag"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "context_nesting": ["top-level", "sub-level"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme-redirect", "swap-scheme-redirect"], "opt_in_method": ["no-opt-in", "http-csp", "meta-csp", "img-crossorigin"], "source_scheme": ["http", "https"]}, "specification": [{"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-allows", "redirection": "*", "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-ws", "same-host-ws"], "name": "ws-downgrade-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"origin": ["same-host-https"], "name": "allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": ["same-host-wss"], "name": "websocket-allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "excluded_tests": [{"origin": "*", "name": "Redundant-subresources", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http"], "name": "Skip-origins-not-applicable-to-websockets", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket-request"], "optionally-blockable": []}}, {"origin": "*", "name": "TODO-opt-in-method-img-cross-origin", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "img-crossorigin", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": "*", "name": "Skip-redundant-for-opt-in-method", "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": ["meta-csp", "img-crossorigin"], "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}]};
+var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http", "same-host-wss", "same-host-ws", "cross-origin-wss", "cross-origin-ws"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr-request", "worker-request", "fetch-request", "a-tag", "object-tag", "picture-tag", "websocket-request", "link-prefetch-tag", "beacon-request"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "context_nesting": ["top-level", "sub-level"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme-redirect", "swap-scheme-redirect"], "opt_in_method": ["no-opt-in", "http-csp", "meta-csp", "img-crossorigin"], "source_scheme": ["http", "https"]}, "specification": [{"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-allows", "redirection": "*", "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-ws", "same-host-ws"], "name": "ws-downgrade-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"origin": ["same-host-https"], "name": "allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": ["same-host-wss"], "name": "websocket-allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "excluded_tests": [{"origin": "*", "name": "Redundant-subresources", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http"], "name": "Skip-origins-not-applicable-to-websockets", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket-request"], "optionally-blockable": []}}, {"origin": "*", "name": "TODO-opt-in-method-img-cross-origin", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "img-crossorigin", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": "*", "name": "Skip-redundant-for-opt-in-method", "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": ["meta-csp", "img-crossorigin"], "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}]};
diff --git a/tests/wpt/web-platform-tests/payment-handler/interfaces.https.any.js b/tests/wpt/web-platform-tests/payment-handler/interfaces.https.any.js
index d0e23281c27..ccddf464d13 100644
--- a/tests/wpt/web-platform-tests/payment-handler/interfaces.https.any.js
+++ b/tests/wpt/web-platform-tests/payment-handler/interfaces.https.any.js
@@ -3,11 +3,6 @@
 
 'use strict';
 
-if (self.importScripts) {
-  importScripts('/resources/testharness.js');
-  importScripts('/resources/WebIDLParser.js', '/resources/idlharness.js');
-}
-
 // https://w3c.github.io/payment-handler/
 
 promise_test(async () => {
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html
new file mode 100644
index 00000000000..fab78f43fd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test for PaymentRequest.show() method</title>
+<link rel="help" href="https://w3c.github.io/browser-payment-api/#show-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+setup({
+  explicit_done: true,
+  explicit_timeout: true,
+});
+const basicCard = Object.freeze({ supportedMethods: "basic-card" });
+const defaultMethods = Object.freeze([basicCard]);
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+test(() => {
+  try {
+    new PaymentRequest(defaultMethods, defaultDetails);
+  } catch (err) {
+    done();
+    throw err;
+  }
+}, "Must be possible to construct a payment request");
+
+function manualTest1(button){
+  button.disabled = true;
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show(); // Sets state to "interactive"
+    await promise_rejects(t, "InvalidStateError", request.show());
+    await request.abort();
+    await promise_rejects(t, "AbortError", acceptPromise);
+  }, button.textContent.trim());
+}
+
+function manualTest2(button){
+  button.disabled = true;
+  promise_test(async t => {
+    const request1 = new PaymentRequest(defaultMethods, defaultDetails);
+    const request2 = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise1 = request1.show();
+    const acceptPromise2 = request2.show();
+    await promise_rejects(t, "AbortError", acceptPromise2);
+    await request1.abort();
+    await promise_rejects(t, "AbortError", acceptPromise1);
+  }, button.textContent.trim());
+}
+
+function manualTest3(button){
+  button.disabled = true;
+  promise_test(async t => {
+    const request = new PaymentRequest(
+      [{ supportedMethods: "this-is-not-supported" }],
+      defaultDetails);
+    const acceptPromise = request.show();
+    await promise_rejects(t, "NotSupportedError", acceptPromise);
+  }, button.textContent.trim());
+  done();
+}
+</script>
+
+<h2>Test for PaymentRequest.show() method</h2>
+<p>
+  Click on each button in sequence from top to bottom without refreshing the page.
+</p>
+<ol>
+  <li>
+    <button onclick="manualTest1(this)">
+      Throws if the promise [[state]] is not "created"
+    </button>
+  </li>
+  <li>
+    <button onclick="manualTest2(this)">
+      If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.
+    </button>
+  </li>
+  <li>
+    <button onclick="manualTest3(this)">
+      If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
+    </button>
+  </li>
+</ol>
+<small>
+  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+</small>
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
index 555c4936537..32b56680e7f 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
@@ -7,8 +7,11 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
-const basicCard = Object.freeze({ supportedMethods: "basic-card" });
-const defaultMethods = Object.freeze([basicCard]);
+const defaultMethods = Object.freeze([
+  { supportedMethods: "basic-card" },
+  { supportedMethods: "https://apple.com/pay" }
+]);
+
 const defaultDetails = Object.freeze({
   total: {
     label: "Total",
@@ -19,39 +22,9 @@ const defaultDetails = Object.freeze({
   },
 });
 
-test(() => {
-  try {
-    new PaymentRequest(defaultMethods, defaultDetails);
-  } catch (err) {
-    done();
-    throw err;
-  }
-}, "Must be possible to construct a payment request");
-
-
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const acceptPromise = request.show(); // Sets state to "interactive"
-  await promise_rejects(t, "InvalidStateError", request.show());
-  await request.abort();
-  await promise_rejects(t, "AbortError", acceptPromise);
-}, `Throws if the promise [[state]] is not "created"`);
-
-promise_test(async t => {
-  const request1 = new PaymentRequest(defaultMethods, defaultDetails);
-  const request2 = new PaymentRequest(defaultMethods, defaultDetails);
-  const acceptPromise1 = request1.show();
-  const acceptPromise2 = request2.show();
-  await promise_rejects(t, "AbortError", acceptPromise2);
-  await request1.abort();
-  await promise_rejects(t, "AbortError", acceptPromise1);
-}, `If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(
-    [{ supportedMethods: "this-is-not-supported" }],
-    defaultDetails);
   const acceptPromise = request.show();
-  await promise_rejects(t, "NotSupportedError", acceptPromise);
-}, `If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.`);
+  await promise_rejects(t, "SecurityError", acceptPromise);
+}, `Calling show() without being triggered by user interaction throws`);
 </script>
diff --git a/tests/wpt/web-platform-tests/preload/download-resources.html b/tests/wpt/web-platform-tests/preload/download-resources.html
index ee8fdd0ea12..dc2b4693cf1 100644
--- a/tests/wpt/web-platform-tests/preload/download-resources.html
+++ b/tests/wpt/web-platform-tests/preload/download-resources.html
@@ -8,7 +8,7 @@
 <link rel=preload href="resources/dummy.js" as=script>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -22,7 +22,7 @@
         verifyPreloadAndRTSupport()
         verifyNumberOfDownloads("resources/dummy.js", 1);
         verifyNumberOfDownloads("resources/dummy.css", 1);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 1);
         verifyNumberOfDownloads("resources/white.mp4", 1);
         verifyNumberOfDownloads("resources/sound_5.oga", 1);
         verifyNumberOfDownloads("resources/foo.vtt", 1);
diff --git a/tests/wpt/web-platform-tests/preload/link-header-on-subresource.html b/tests/wpt/web-platform-tests/preload/link-header-on-subresource.html
index 22351e37c7b..a02bc7c819e 100644
--- a/tests/wpt/web-platform-tests/preload/link-header-on-subresource.html
+++ b/tests/wpt/web-platform-tests/preload/link-header-on-subresource.html
@@ -10,7 +10,7 @@
 <script>
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport();
-        verifyNumberOfDownloads("/preload/resources/CanvasTest.ttf?link-header-on-subresource", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf?link-header-on-subresource", 1);
         t.done();
     }));
 </script>
diff --git a/tests/wpt/web-platform-tests/preload/onload-event.html b/tests/wpt/web-platform-tests/preload/onload-event.html
index 35ba2eb54b8..6af2d64a1c1 100644
--- a/tests/wpt/web-platform-tests/preload/onload-event.html
+++ b/tests/wpt/web-platform-tests/preload/onload-event.html
@@ -19,7 +19,7 @@
 <link rel=preload href="resources/dummy.js" as=script onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
 <link rel=preload href="resources/white.mp4" as=video onload="videoLoaded = true;">
 <link rel=preload href="resources/sound_5.oga" as=audio onload="audioLoaded = true;">
 <link rel=preload href="resources/foo.vtt" as=track onload="trackLoaded = true;">
diff --git a/tests/wpt/web-platform-tests/preload/preload-csp.sub.html b/tests/wpt/web-platform-tests/preload/preload-csp.sub.html
index 70db5f474e3..8e5e45b9a1c 100644
--- a/tests/wpt/web-platform-tests/preload/preload-csp.sub.html
+++ b/tests/wpt/web-platform-tests/preload/preload-csp.sub.html
@@ -9,7 +9,7 @@
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -23,7 +23,7 @@
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);
diff --git a/tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html b/tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html
index bde6b982bce..cb080e62ba3 100644
--- a/tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html
+++ b/tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html
@@ -9,7 +9,7 @@
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -23,7 +23,7 @@
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);
diff --git a/tests/wpt/web-platform-tests/preload/preload-with-type.html b/tests/wpt/web-platform-tests/preload/preload-with-type.html
index cf79e778c29..8578143a234 100644
--- a/tests/wpt/web-platform-tests/preload/preload-with-type.html
+++ b/tests/wpt/web-platform-tests/preload/preload-with-type.html
@@ -31,7 +31,7 @@
 <link rel=preload href="resources/dummy.js" as=script type="text/javascript" onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style type="text/css" onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image type="image/png" onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/' + videoFormat + '" onload="videoLoaded = true;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/' + audioFormat + '" onload="audioLoaded = true;">');
@@ -40,7 +40,7 @@
 <link rel=preload href="resources/dummy.js" as=script type="application/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/dummy.css" as=style type="text/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/square.png" as=image type="image/foobar" onload="gibberishLoaded++;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/foobar" onload="gibberishLoaded++;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/foobar" onload="gibberishLoaded++;">');
diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers b/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers
index 4ada08cdf1e..f6b4b491ce5 100644
--- a/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers
+++ b/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers
@@ -1,2 +1,2 @@
 Cache-Control: max-age=1000
-Link: </preload/resources/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
+Link: </fonts/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
diff --git a/tests/wpt/web-platform-tests/preload/single-download-preload.html b/tests/wpt/web-platform-tests/preload/single-download-preload.html
index 83151c2a8d9..e8f26178710 100644
--- a/tests/wpt/web-platform-tests/preload/single-download-preload.html
+++ b/tests/wpt/web-platform-tests/preload/single-download-preload.html
@@ -9,7 +9,7 @@
 <link rel=preload href="resources/dummy.css?single-download-preload" as=style>
 <link rel=preload href="resources/square.png?single-download-preload" as=image>
 <link rel=preload href="resources/square.png?background&single-download-preload" as=image>
-<link rel=preload href="resources/CanvasTest.ttf?single-download-preload" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf?single-download-preload" as=font crossorigin>
 <link rel=preload href="resources/white.mp4?single-download-preload" as=video>
 <link rel=preload href="resources/sound_5.oga?single-download-preload" as=audio>
 <link rel=preload href="resources/foo.vtt?single-download-preload" as=track>
@@ -25,7 +25,7 @@
     }
     @font-face {
       font-family:ahem;
-      src: url(resources/CanvasTest.ttf?single-download-preload);
+      src: url(/fonts/CanvasTest.ttf?single-download-preload);
     }
     span { font-family: ahem, Arial; }
 </style>
@@ -49,7 +49,7 @@
             verifyNumberOfDownloads("resources/dummy.css?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?background&single-download-preload", 1);
-            verifyNumberOfDownloads("resources/CanvasTest.ttf?single-download-preload", 1);
+            verifyNumberOfDownloads("/fonts/CanvasTest.ttf?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?foobar", 0);
             verifyNumberOfDownloads("resources/foo.vtt?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?single-download-preload", 1);
diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html
index d6324ea56ba..c5ab4667b0b 100644
--- a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Presentation API PresentationRequest for Controlling User Agent (Error)</title>
+<title>Constructing a PresentationRequest (Error)</title>
 <link rel="author" title="Franck William Taffo" href="http://www.fokus.fraunhofer.de">
-<link rel="help" href="http://w3c.github.io/presentation-api/#dfn-controlling-user-agent">
+<link rel="author" title="Tomoyuki Shimizu" href="https://github.com/tomoyukilabs">
+<link rel="help" href="http://w3c.github.io/presentation-api/#constructing-a-presentationrequest">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
 
-    test(function() {
-        assert_throws(new TypeError(), function() {
-            new PresentationRequest();
-        });
+  test(() => {
+    assert_throws(new TypeError(), () => {
+      new PresentationRequest();
     }, 'Call PresentationRequest() constructor without presentation URL. TypeError Exception expected.');
 
-    test(function() {
-        assert_throws('NotSupportedError', function() {
-            new PresentationRequest([]);
-        });
+    assert_throws('NotSupportedError', () => {
+      new PresentationRequest([]);
     }, 'Call PresentationRequest constructor with an empty sequence. NotSupportedError Exception expected.');
 
-    test(function() {
-        assert_throws('SyntaxError', function() {
-            new PresentationRequest('http://@');
-        });
+    assert_throws('SyntaxError', () => {
+      new PresentationRequest('http://@');
     }, 'Call PresentationRequest constructor with an invalid URL. SyntaxError Exception expected.');
 
-    test(function() {
-        assert_throws('SyntaxError', function() {
-            new PresentationRequest(['presentation.html', 'http://@']);
-        });
+    assert_throws('NotSupportedError', () => {
+        new PresentationRequest('unsupported://example.com');
+    }, 'Call PresentationRequest constructor with an unsupported URL. NotSupportedError expected.');
+
+    assert_throws('SyntaxError', function() {
+      new PresentationRequest(['presentation.html', 'http://@']);
     }, 'Call PresentationRequest constructor with a sequence of URLs, one of them invalid. SyntaxError Exception expected.');
+
+    assert_throws('NotSupportedError', function() {
+      new PresentationRequest(['unsupported://example.com', 'invalid://example.com']);
+    }, 'Call PresentationRequest constructor only with a sequence of unsupported URLs. NotSupportedError Exception expected.');
+  });
 </script>
diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html
index 70ea5a806e7..890e0ed6249 100644
--- a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html
@@ -8,17 +8,24 @@
 <script src="/resources/testharnessreport.js"></script>
 
 <script>
-    test(() => {
-        let request = new PresentationRequest('presentation.html');
-        assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with a relative presentation URL is constructed successfully.');
+  test(() => {
+    let request = new PresentationRequest('presentation.html');
+    assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with a relative presentation URL is constructed successfully.');
 
-        request = new PresentationRequest('https://example.org/');
-        assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with an absolute presentation URL is constructed successfully.');
+    request = new PresentationRequest('https://example.org/');
+    assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with an absolute presentation URL is constructed successfully.');
 
-        request = new PresentationRequest([
-            'presentation.html',
-            'https://example.org/presentation/'
-        ]);
-        assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with an array of presentation URLs is constructed successfully.');
-    });
+    request = new PresentationRequest([
+      'presentation.html',
+      'https://example.org/presentation/'
+    ]);
+    assert_true(request instanceof PresentationRequest, 'An instance of PresentationRequest with an array of presentation URLs is constructed successfully.');
+
+    request = new PresentationRequest([
+      'unsupported://example.com',
+      'presentation.html',
+      'https://example.org/presentation/'
+    ]);
+    assert_true(request instanceof PresentationRequest, 'An unsupported URL in an array of presentation URLs is ignored successfully.');
+  });
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_frame_initiator_type.html b/tests/wpt/web-platform-tests/resource-timing/resource_frame_initiator_type.html
deleted file mode 100644
index f6471988624..00000000000
--- a/tests/wpt/web-platform-tests/resource-timing/resource_frame_initiator_type.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Resource Timing frame initiator type</title>
-<link rel="author" title="Google" href="http://www.google.com/" />
-<link rel="help" href="http://www.w3.org/TR/resource-timing/#dom-performanceresourcetiming-initiatortype"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/webperftestharness.js"></script>
-<script src="resources/webperftestharnessextension.js"></script>
-<script>
-setup({explicit_done: true});
-
-function onload_test() {
-    const iframe = document.getElementById('frameContext');
-    const context = new PerformanceContext(iframe.contentWindow.performance);
-    const entries = context.getEntriesByType('resource');
-
-    const index = window.location.pathname.lastIndexOf('/');
-    const pathname = window.location.pathname.substring(0, index) +
-      '/resources/blank_page_green.htm';
-    const expected_entries = {};
-    expected_entries[pathname] = 'frame';
-
-    test_resource_entries(entries, expected_entries);
-    done();
-}
-</script>
-</head>
-<body>
-<h1>Description</h1>
-<p>This test validates that the frame initiator type is represented.</p>
-<div id="log"></div>
-<iframe id="frameContext" onload="onload_test();" src="resources/green_frame.htm" style="width: 250px; height: 250px;"></iframe>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_initiator_types.html b/tests/wpt/web-platform-tests/resource-timing/resource_initiator_types.html
index 30f8c0c024e..69cb23b91d9 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resource_initiator_types.html
+++ b/tests/wpt/web-platform-tests/resource-timing/resource_initiator_types.html
@@ -18,6 +18,7 @@ let ol_font_loaded = false;
 let ul_font_loaded = false;
 let xhr_loaded = false;
 let tests_run = false;
+let frameset_loaded = false;
 
 function check_finished() {
     if (!ul_font_loaded) {
@@ -26,7 +27,7 @@ function check_finished() {
     if (!ol_font_loaded) {
         ol_font_loaded = check_font_loaded('ol');
     }
-    if (page_loaded && ol_font_loaded && ul_font_loaded && background_loaded && xhr_loaded) {
+    if (page_loaded && ol_font_loaded && ul_font_loaded && background_loaded && xhr_loaded && frameset_loaded) {
         perform_test();
     } else {
         step_timeout(check_finished, 100);
@@ -64,40 +65,88 @@ function onload_test() {
     step_timeout(check_finished, 100);
 }
 
+function frameset_onload() {
+    frameset_loaded = true;
+
+    step_timeout(check_finished, 100);
+}
+
 function perform_test() {
     if (tests_run) {
         return;
     }
     tests_run = true;
     const context = new PerformanceContext(document.getElementById('frameContext').contentWindow.performance);
-    const entries = context.getEntriesByType('resource');
+    let entries = context.getEntriesByType('resource');
+
+    // check for frameset
+    if (document.getElementById('frameContext2') &&
+        document.getElementById('frameContext2').contentWindow) {
+        const context2 = new PerformanceContext(document.getElementById('frameContext2').contentWindow.performance);
+        entries = entries.concat(context2.getEntriesByType('resource'));
+    }
 
     const index = window.location.pathname.lastIndexOf('/');
     const pathname = window.location.pathname.substring(0, index) + '/resources/';
     const font_pathname = window.location.pathname.substring(0, index - 15) + 'fonts/Ahem.ttf';
 
     let expected_entries = {};
-    expected_entries[font_pathname] = 'css';
-    expected_entries[pathname + 'resource_timing_test0.png'] = 'img';
-    expected_entries[pathname + 'blank_page_green.htm'] = 'iframe';
-    expected_entries[pathname + 'empty_script.js'] = 'script';
-    expected_entries[pathname + 'resource_timing_test0.css?id=embed'] = 'embed';
-    expected_entries[pathname + 'resource_timing_test0.css?id=n1'] = 'css';
-    expected_entries[font_pathname + '?id=n1'] = 'css';
-    expected_entries[pathname + 'blue.png?id=1'] = 'css';
-    expected_entries[pathname + 'blue.png?id=2'] = 'css';
-    expected_entries[pathname + 'blue.png?id=async_xhr'] = 'xmlhttprequest';
-    expected_entries[pathname + 'blue.png?id=body'] = 'body';
-    expected_entries[pathname + 'blue.png?id=input'] = 'input';
-    expected_entries[pathname + 'blue.png?id=n1'] = 'css';
-    expected_entries[pathname + 'blue.png?id=object'] = 'object';
-    expected_entries[pathname + 'blue.png?id=poster'] = 'video';
-    expected_entries[pathname + 'nested.css'] = 'link';
+    addEntryIfExists(entries, expected_entries, font_pathname, 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'resource_timing_test0.png', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'resource_timing_test0.png?id=srcset-srcset', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'resource_timing_test0.png?id=srcset-src', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blank_page_green.htm', 'iframe');
+    addEntryIfExists(entries, expected_entries, pathname + 'blank_page_green.htm?id=frame', 'frame');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty_script.js', 'script');
+    addEntryIfExists(entries, expected_entries, pathname + 'resource_timing_test0.css?id=embed', 'embed');
+    addEntryIfExists(entries, expected_entries, pathname + 'resource_timing_test0.css?id=n1', 'css');
+    addEntryIfExists(entries, expected_entries, font_pathname + '?id=n1', 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=cursor', 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=1', 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=2', 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=async_xhr', 'xmlhttprequest');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=body', 'body');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=input', 'input');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=n1', 'css');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=object', 'object');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=video-poster', 'video');
+    addEntryIfExists(entries, expected_entries, '/media/test.mp4?id=video-src', 'video');
+    addEntryIfExists(entries, expected_entries, '/media/test.mp4?id=video-source', 'source');
+    addEntryIfExists(entries, expected_entries, '/media/test.ogg?id=video-source', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=video-track', 'track');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-src', 'audio');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-wav', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-mpeg', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-ogg', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-source', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-img', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-notsupported-img', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-img-src', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-img-srcset', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-99x-img-src', 'img');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=svg-image', 'image');
+    addEntryIfExists(entries, expected_entries, pathname + 'nested.css', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'nested.css?id=prefetch', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'nested.css?id=preload', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'blank_page_green.htm?id=prerender', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'manifest.json', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=beacon', 'beacon');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=fetch', 'fetch');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?favicon', 'link');
+    addEntryIfExists(entries, expected_entries, pathname + 'eventsource.py?id=eventsource', 'eventsource');
 
     test_resource_entries(entries, expected_entries);
     done();
 }
 
+function addEntryIfExists(entries, expected_entries, path, initiatorType) {
+    const url = window.location.protocol + "//" + window.location.host + path;
+
+    if (entries.find(function(entry) { return entry.name === url; })) {
+        expected_entries[path] = initiatorType;
+    }
+}
+
 window.on_test_body_created = check_finished;
 window.on_async_xhr_done = function() {
     xhr_loaded = true;
@@ -110,5 +159,6 @@ window.on_async_xhr_done = function() {
 <p>This test validates that all of the initiator types are represented.</p>
 <div id="log"></div>
 <iframe id="frameContext" onload="onload_test();" src="resources/all_resource_types.htm" style="width: 250px; height: 250px;"></iframe>
+<iframe id="frameContext2" onload="frameset_onload();" src="resources/green_frame.htm" style="width: 250px; height: 250px;"></iframe>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/all_resource_types.htm b/tests/wpt/web-platform-tests/resource-timing/resources/all_resource_types.htm
index 41789d869cf..bc7101c2192 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resources/all_resource_types.htm
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/all_resource_types.htm
@@ -3,6 +3,7 @@
     <head>
         <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
         <title>All Resource Types Test Page</title>
+        <link rel="shortcut icon" href="empty.py?favicon">
     </head>
     <body background='blue.png?id=body'>
         <script>
@@ -10,7 +11,14 @@
                 window.parent.on_test_body_created();
         </script>
         <link rel="stylesheet" href="nested.css"></link>
+        <link rel="prefetch" href="nested.css?id=prefetch"></link>
+        <link rel="preload" href="nested.css?id=preload" as="style"></link>
+        <link rel="prerender" href="blank_page_green.htm?id=prerender"></link>
+        <link rel="manifest" href="manifest.json"></link>
         <img src="resource_timing_test0.png"></img>
+        <img src="resource_timing_test0.png?id=srcset-src"
+            srcset="resource_timing_test0.png?id=srcset-srcset 67w"
+            sizes="67px"></img>
         <iframe src="blank_page_green.htm" width="100px" height="100px"></iframe>
         <script src="empty_script.js"></script>
         <script>
@@ -21,6 +29,18 @@
                     parent.on_async_xhr_done();
             }
             async_xhr.send();
+
+            if (window.navigator && navigator.sendBeacon) {
+                navigator.sendBeacon('empty.py?id=beacon');
+            }
+
+            if (window.fetch) {
+                fetch('empty.py?id=fetch');
+            }
+
+            if (window.EventSource) {
+                var evtSource = new EventSource('eventsource.py?id=eventsource');
+            }
         </script>
         <style>
             @font-face {
@@ -30,6 +50,9 @@
             iframe {
                 background: url('blue.png?id=1');
             }
+            body {
+                cursor: url('blue.png?id=cursor'), pointer;
+            }
             ul {
                 font-family: remoteFontAhem;
                 list-style-image: url('blue.png?id=2');
@@ -44,6 +67,41 @@
         <embed src="resource_timing_test0.css?id=embed" type="text/css"></embed>
         <input type="image" src="blue.png?id=input"></input>
         <object type="image/png" data="blue.png?id=object"></object>
-        <video poster="blue.png?id=poster"></video>
+        <video poster="blue.png?id=video-poster"></video>
+        <video src="/media/test.mp4?id=video-src" autoplay="true"></video>
+        <video autoplay="true">
+            <source src="/media/test.mp4?id=video-source" type="video/mp4">
+            <source src="/media/test.ogv?id=video-source" type="video/ogg">
+            <track kind="subtitles" src="empty.py?id=video-track" srclang="en" default>
+        </video>
+        <audio src="empty.py?id=audio-src"></audio>
+        <audio>
+            <source src="empty.py?id=audio-source-wav" type="audio/wav" />
+            <source src="empty.py?id=audio-source-mpeg" type="audio/mpeg" />
+            <source src="empty.py?id=audio-source-ogg" type="audio/ogg" />
+        </audio>
+        <svg width=200 height=200
+            xmlns="http://www.w3.org/2000/svg"
+            xmlns:xlink="http://www.w3.org/1999/xlink">
+            <image href="blue.png?id=svg-image" height="200" width="200"/>
+        </svg>
+        <picture>
+            <source srcset="blue.png?id=picture-source" type="image/png" />
+            <img src="blue.png?id=picture-img" />
+        </picture>
+        <picture>
+            <source srcset="blue.png?id=picture-notsupported-source" type="image/notsupported" />
+            <img src="blue.png?id=picture-notsupported-img" />
+        </picture>
+        <picture>
+            <img src="blue.png?id=picture-img-src"
+                srcset="blue.png?id=picture-img-srcset"
+                sizes="67px"></img>
+        </picture>
+        <picture>
+            <img src="blue.png?id=picture-99x-img-src"
+                srcset="blue.png?id=picture-99x-img-srcset 99x"
+                sizes="67px"></img>
+        </picture>
     </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/empty.py b/tests/wpt/web-platform-tests/resource-timing/resources/empty.py
new file mode 100644
index 00000000000..e5ccfbe9739
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/empty.py
@@ -0,0 +1,3 @@
+def main(request, response):
+    response.headers.set("Content-Type", "text/plain")
+    return ""
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py b/tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py
new file mode 100644
index 00000000000..5095ea9b34f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py
@@ -0,0 +1,3 @@
+def main(request, response):
+    response.headers.set("Content-Type", "text/event-stream")
+    return ""
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/green_frame.htm b/tests/wpt/web-platform-tests/resource-timing/resources/green_frame.htm
index c91f44abf32..f3f03245dcc 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resources/green_frame.htm
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/green_frame.htm
@@ -1,7 +1,7 @@
 <html>
   <head>
     <frameset>
-      <frame src="blank_page_green.htm">
+      <frame src="blank_page_green.htm?id=frame">
     </frameset>
   </head>
 </html>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
new file mode 100644
index 00000000000..535a90a4ab5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
@@ -0,0 +1,822 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+'use strict';
+
+(function() {
+  var mojomId = 'content/shell/common/layout_test/fake_bluetooth_chooser.mojom';
+  if (mojo.internal.isMojomLoaded(mojomId)) {
+    console.warn('The following mojom is loaded multiple times: ' + mojomId);
+    return;
+  }
+  mojo.internal.markMojomLoaded(mojomId);
+  var bindings = mojo;
+  var associatedBindings = mojo;
+  var codec = mojo.internal;
+  var validator = mojo.internal;
+
+  var exports = mojo.internal.exposeNamespace('content.mojom');
+
+
+  var ChooserEventType = {};
+  ChooserEventType.CHOOSER_OPENED = 0;
+  ChooserEventType.SCAN_STARTED = ChooserEventType.CHOOSER_OPENED + 1;
+  ChooserEventType.DEVICE_UPDATE = ChooserEventType.SCAN_STARTED + 1;
+  ChooserEventType.ADAPTER_REMOVED = ChooserEventType.DEVICE_UPDATE + 1;
+  ChooserEventType.ADAPTER_DISABLED = ChooserEventType.ADAPTER_REMOVED + 1;
+  ChooserEventType.ADAPTER_ENABLED = ChooserEventType.ADAPTER_DISABLED + 1;
+  ChooserEventType.DISCOVERY_FAILED_TO_START = ChooserEventType.ADAPTER_ENABLED + 1;
+  ChooserEventType.DISCOVERING = ChooserEventType.DISCOVERY_FAILED_TO_START + 1;
+  ChooserEventType.DISCOVERY_IDLE = ChooserEventType.DISCOVERING + 1;
+  ChooserEventType.ADD_DEVICE = ChooserEventType.DISCOVERY_IDLE + 1;
+
+  ChooserEventType.isKnownEnumValue = function(value) {
+    switch (value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+      return true;
+    }
+    return false;
+  };
+
+  ChooserEventType.validate = function(enumValue) {
+    var isExtensible = false;
+    if (isExtensible || this.isKnownEnumValue(enumValue))
+      return validator.validationError.NONE;
+
+    return validator.validationError.UNKNOWN_ENUM_VALUE;
+  };
+
+  function FakeBluetoothChooserEvent(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooserEvent.prototype.initDefaults_ = function() {
+    this.type = 0;
+    this.origin = null;
+    this.peripheralAddress = null;
+  };
+  FakeBluetoothChooserEvent.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooserEvent.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 32}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate FakeBluetoothChooserEvent.type
+    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, ChooserEventType);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate FakeBluetoothChooserEvent.origin
+    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 8, true)
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate FakeBluetoothChooserEvent.peripheralAddress
+    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 16, true)
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooserEvent.encodedSize = codec.kStructHeaderSize + 24;
+
+  FakeBluetoothChooserEvent.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooserEvent();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.type = decoder.decodeStruct(codec.Int32);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    val.origin = decoder.decodeStruct(codec.NullableString);
+    val.peripheralAddress = decoder.decodeStruct(codec.NullableString);
+    return val;
+  };
+
+  FakeBluetoothChooserEvent.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooserEvent.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.Int32, val.type);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.encodeStruct(codec.NullableString, val.origin);
+    encoder.encodeStruct(codec.NullableString, val.peripheralAddress);
+  };
+  function FakeBluetoothChooser_WaitForEvents_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_WaitForEvents_Params.prototype.initDefaults_ = function() {
+    this.numOfEvents = 0;
+  };
+  FakeBluetoothChooser_WaitForEvents_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_WaitForEvents_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_WaitForEvents_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  FakeBluetoothChooser_WaitForEvents_Params.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_WaitForEvents_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.numOfEvents = decoder.decodeStruct(codec.Uint32);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    return val;
+  };
+
+  FakeBluetoothChooser_WaitForEvents_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_WaitForEvents_Params.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.Uint32, val.numOfEvents);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+  };
+  function FakeBluetoothChooser_WaitForEvents_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.prototype.initDefaults_ = function() {
+    this.events = null;
+  };
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate FakeBluetoothChooser_WaitForEvents_ResponseParams.events
+    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(FakeBluetoothChooserEvent), false, [0], 0);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
+
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_WaitForEvents_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.events = decoder.decodeArrayPointer(new codec.PointerTo(FakeBluetoothChooserEvent));
+    return val;
+  };
+
+  FakeBluetoothChooser_WaitForEvents_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_WaitForEvents_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeArrayPointer(new codec.PointerTo(FakeBluetoothChooserEvent), val.events);
+  };
+  function FakeBluetoothChooser_SelectPeripheral_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_SelectPeripheral_Params.prototype.initDefaults_ = function() {
+    this.peripheralAddress = null;
+  };
+  FakeBluetoothChooser_SelectPeripheral_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate FakeBluetoothChooser_SelectPeripheral_Params.peripheralAddress
+    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  FakeBluetoothChooser_SelectPeripheral_Params.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_SelectPeripheral_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.peripheralAddress = decoder.decodeStruct(codec.String);
+    return val;
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_SelectPeripheral_Params.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.String, val.peripheralAddress);
+  };
+  function FakeBluetoothChooser_SelectPeripheral_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.prototype.initDefaults_ = function() {
+  };
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.encodedSize = codec.kStructHeaderSize + 0;
+
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_SelectPeripheral_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  FakeBluetoothChooser_SelectPeripheral_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_SelectPeripheral_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function FakeBluetoothChooser_Cancel_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_Cancel_Params.prototype.initDefaults_ = function() {
+  };
+  FakeBluetoothChooser_Cancel_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_Cancel_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_Cancel_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  FakeBluetoothChooser_Cancel_Params.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_Cancel_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  FakeBluetoothChooser_Cancel_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_Cancel_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function FakeBluetoothChooser_Cancel_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_Cancel_ResponseParams.prototype.initDefaults_ = function() {
+  };
+  FakeBluetoothChooser_Cancel_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_Cancel_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_Cancel_ResponseParams.encodedSize = codec.kStructHeaderSize + 0;
+
+  FakeBluetoothChooser_Cancel_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_Cancel_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  FakeBluetoothChooser_Cancel_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_Cancel_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function FakeBluetoothChooser_Rescan_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_Rescan_Params.prototype.initDefaults_ = function() {
+  };
+  FakeBluetoothChooser_Rescan_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_Rescan_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_Rescan_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  FakeBluetoothChooser_Rescan_Params.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_Rescan_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  FakeBluetoothChooser_Rescan_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_Rescan_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function FakeBluetoothChooser_Rescan_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  FakeBluetoothChooser_Rescan_ResponseParams.prototype.initDefaults_ = function() {
+  };
+  FakeBluetoothChooser_Rescan_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  FakeBluetoothChooser_Rescan_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  FakeBluetoothChooser_Rescan_ResponseParams.encodedSize = codec.kStructHeaderSize + 0;
+
+  FakeBluetoothChooser_Rescan_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new FakeBluetoothChooser_Rescan_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  FakeBluetoothChooser_Rescan_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(FakeBluetoothChooser_Rescan_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+  };
+  var kFakeBluetoothChooser_WaitForEvents_Name = 457051710;
+  var kFakeBluetoothChooser_SelectPeripheral_Name = 1924310743;
+  var kFakeBluetoothChooser_Cancel_Name = 1388880682;
+  var kFakeBluetoothChooser_Rescan_Name = 2112671529;
+
+  function FakeBluetoothChooserPtr(handleOrPtrInfo) {
+    this.ptr = new bindings.InterfacePtrController(FakeBluetoothChooser,
+                                                   handleOrPtrInfo);
+  }
+
+  function FakeBluetoothChooserAssociatedPtr(associatedInterfacePtrInfo) {
+    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
+        FakeBluetoothChooser, associatedInterfacePtrInfo);
+  }
+
+  FakeBluetoothChooserAssociatedPtr.prototype =
+      Object.create(FakeBluetoothChooserPtr.prototype);
+  FakeBluetoothChooserAssociatedPtr.prototype.constructor =
+      FakeBluetoothChooserAssociatedPtr;
+
+  function FakeBluetoothChooserProxy(receiver) {
+    this.receiver_ = receiver;
+  }
+  FakeBluetoothChooserPtr.prototype.waitForEvents = function() {
+    return FakeBluetoothChooserProxy.prototype.waitForEvents
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  FakeBluetoothChooserProxy.prototype.waitForEvents = function(numOfEvents) {
+    var params = new FakeBluetoothChooser_WaitForEvents_Params();
+    params.numOfEvents = numOfEvents;
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kFakeBluetoothChooser_WaitForEvents_Name,
+          codec.align(FakeBluetoothChooser_WaitForEvents_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(FakeBluetoothChooser_WaitForEvents_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(FakeBluetoothChooser_WaitForEvents_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+  FakeBluetoothChooserPtr.prototype.selectPeripheral = function() {
+    return FakeBluetoothChooserProxy.prototype.selectPeripheral
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  FakeBluetoothChooserProxy.prototype.selectPeripheral = function(peripheralAddress) {
+    var params = new FakeBluetoothChooser_SelectPeripheral_Params();
+    params.peripheralAddress = peripheralAddress;
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kFakeBluetoothChooser_SelectPeripheral_Name,
+          codec.align(FakeBluetoothChooser_SelectPeripheral_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(FakeBluetoothChooser_SelectPeripheral_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(FakeBluetoothChooser_SelectPeripheral_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+  FakeBluetoothChooserPtr.prototype.cancel = function() {
+    return FakeBluetoothChooserProxy.prototype.cancel
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  FakeBluetoothChooserProxy.prototype.cancel = function() {
+    var params = new FakeBluetoothChooser_Cancel_Params();
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kFakeBluetoothChooser_Cancel_Name,
+          codec.align(FakeBluetoothChooser_Cancel_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(FakeBluetoothChooser_Cancel_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(FakeBluetoothChooser_Cancel_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+  FakeBluetoothChooserPtr.prototype.rescan = function() {
+    return FakeBluetoothChooserProxy.prototype.rescan
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  FakeBluetoothChooserProxy.prototype.rescan = function() {
+    var params = new FakeBluetoothChooser_Rescan_Params();
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kFakeBluetoothChooser_Rescan_Name,
+          codec.align(FakeBluetoothChooser_Rescan_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(FakeBluetoothChooser_Rescan_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(FakeBluetoothChooser_Rescan_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+
+  function FakeBluetoothChooserStub(delegate) {
+    this.delegate_ = delegate;
+  }
+  FakeBluetoothChooserStub.prototype.waitForEvents = function(numOfEvents) {
+    return this.delegate_ && this.delegate_.waitForEvents && this.delegate_.waitForEvents(numOfEvents);
+  }
+  FakeBluetoothChooserStub.prototype.selectPeripheral = function(peripheralAddress) {
+    return this.delegate_ && this.delegate_.selectPeripheral && this.delegate_.selectPeripheral(peripheralAddress);
+  }
+  FakeBluetoothChooserStub.prototype.cancel = function() {
+    return this.delegate_ && this.delegate_.cancel && this.delegate_.cancel();
+  }
+  FakeBluetoothChooserStub.prototype.rescan = function() {
+    return this.delegate_ && this.delegate_.rescan && this.delegate_.rescan();
+  }
+
+  FakeBluetoothChooserStub.prototype.accept = function(message) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    default:
+      return false;
+    }
+  };
+
+  FakeBluetoothChooserStub.prototype.acceptWithResponder =
+      function(message, responder) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    case kFakeBluetoothChooser_WaitForEvents_Name:
+      var params = reader.decodeStruct(FakeBluetoothChooser_WaitForEvents_Params);
+      this.waitForEvents(params.numOfEvents).then(function(response) {
+        var responseParams =
+            new FakeBluetoothChooser_WaitForEvents_ResponseParams();
+        responseParams.events = response.events;
+        var builder = new codec.MessageV1Builder(
+            kFakeBluetoothChooser_WaitForEvents_Name,
+            codec.align(FakeBluetoothChooser_WaitForEvents_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(FakeBluetoothChooser_WaitForEvents_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    case kFakeBluetoothChooser_SelectPeripheral_Name:
+      var params = reader.decodeStruct(FakeBluetoothChooser_SelectPeripheral_Params);
+      this.selectPeripheral(params.peripheralAddress).then(function(response) {
+        var responseParams =
+            new FakeBluetoothChooser_SelectPeripheral_ResponseParams();
+        var builder = new codec.MessageV1Builder(
+            kFakeBluetoothChooser_SelectPeripheral_Name,
+            codec.align(FakeBluetoothChooser_SelectPeripheral_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(FakeBluetoothChooser_SelectPeripheral_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    case kFakeBluetoothChooser_Cancel_Name:
+      var params = reader.decodeStruct(FakeBluetoothChooser_Cancel_Params);
+      this.cancel().then(function(response) {
+        var responseParams =
+            new FakeBluetoothChooser_Cancel_ResponseParams();
+        var builder = new codec.MessageV1Builder(
+            kFakeBluetoothChooser_Cancel_Name,
+            codec.align(FakeBluetoothChooser_Cancel_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(FakeBluetoothChooser_Cancel_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    case kFakeBluetoothChooser_Rescan_Name:
+      var params = reader.decodeStruct(FakeBluetoothChooser_Rescan_Params);
+      this.rescan().then(function(response) {
+        var responseParams =
+            new FakeBluetoothChooser_Rescan_ResponseParams();
+        var builder = new codec.MessageV1Builder(
+            kFakeBluetoothChooser_Rescan_Name,
+            codec.align(FakeBluetoothChooser_Rescan_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(FakeBluetoothChooser_Rescan_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    default:
+      return false;
+    }
+  };
+
+  function validateFakeBluetoothChooserRequest(messageValidator) {
+    var message = messageValidator.message;
+    var paramsClass = null;
+    switch (message.getName()) {
+      case kFakeBluetoothChooser_WaitForEvents_Name:
+        if (message.expectsResponse())
+          paramsClass = FakeBluetoothChooser_WaitForEvents_Params;
+      break;
+      case kFakeBluetoothChooser_SelectPeripheral_Name:
+        if (message.expectsResponse())
+          paramsClass = FakeBluetoothChooser_SelectPeripheral_Params;
+      break;
+      case kFakeBluetoothChooser_Cancel_Name:
+        if (message.expectsResponse())
+          paramsClass = FakeBluetoothChooser_Cancel_Params;
+      break;
+      case kFakeBluetoothChooser_Rescan_Name:
+        if (message.expectsResponse())
+          paramsClass = FakeBluetoothChooser_Rescan_Params;
+      break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  function validateFakeBluetoothChooserResponse(messageValidator) {
+   var message = messageValidator.message;
+   var paramsClass = null;
+   switch (message.getName()) {
+      case kFakeBluetoothChooser_WaitForEvents_Name:
+        if (message.isResponse())
+          paramsClass = FakeBluetoothChooser_WaitForEvents_ResponseParams;
+        break;
+      case kFakeBluetoothChooser_SelectPeripheral_Name:
+        if (message.isResponse())
+          paramsClass = FakeBluetoothChooser_SelectPeripheral_ResponseParams;
+        break;
+      case kFakeBluetoothChooser_Cancel_Name:
+        if (message.isResponse())
+          paramsClass = FakeBluetoothChooser_Cancel_ResponseParams;
+        break;
+      case kFakeBluetoothChooser_Rescan_Name:
+        if (message.isResponse())
+          paramsClass = FakeBluetoothChooser_Rescan_ResponseParams;
+        break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  var FakeBluetoothChooser = {
+    name: 'content::mojom::FakeBluetoothChooser',
+    kVersion: 0,
+    ptrClass: FakeBluetoothChooserPtr,
+    proxyClass: FakeBluetoothChooserProxy,
+    stubClass: FakeBluetoothChooserStub,
+    validateRequest: validateFakeBluetoothChooserRequest,
+    validateResponse: validateFakeBluetoothChooserResponse,
+  };
+  FakeBluetoothChooserStub.prototype.validator = validateFakeBluetoothChooserRequest;
+  FakeBluetoothChooserProxy.prototype.validator = validateFakeBluetoothChooserResponse;
+  exports.ChooserEventType = ChooserEventType;
+  exports.FakeBluetoothChooserEvent = FakeBluetoothChooserEvent;
+  exports.FakeBluetoothChooser = FakeBluetoothChooser;
+  exports.FakeBluetoothChooserPtr = FakeBluetoothChooserPtr;
+  exports.FakeBluetoothChooserAssociatedPtr = FakeBluetoothChooserAssociatedPtr;
+})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js.headers
new file mode 100644
index 00000000000..6805c323df5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js.headers
@@ -0,0 +1 @@
+Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js b/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
index 42656d3f756..c10685f376c 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js
@@ -65,7 +65,7 @@ class FakeBluetooth {
   constructor() {
     this.fake_bluetooth_ptr_ = new bluetooth.mojom.FakeBluetoothPtr();
     Mojo.bindInterface(bluetooth.mojom.FakeBluetooth.name,
-        mojo.makeRequest(this.fake_bluetooth_ptr_).handle, "process");
+        mojo.makeRequest(this.fake_bluetooth_ptr_).handle, 'process');
   }
 
   // Set it to indicate whether the platform supports BLE. For example,
@@ -102,6 +102,15 @@ class FakeBluetooth {
     let {consumed} = await this.fake_bluetooth_ptr_.allResponsesConsumed();
     return consumed;
   }
+
+  // Returns a promise that resolves with a FakeChooser that clients can use to
+  // simulate chooser events.
+  async getManualChooser() {
+    if (typeof this.fake_chooser_ === 'undefined') {
+      this.fake_chooser_ = new FakeChooser();
+    }
+    return this.fake_chooser_;
+  }
 }
 
 // FakeCentral allows clients to simulate events that a device in the
@@ -437,6 +446,17 @@ class FakeRemoteGATTDescriptor {
   }
 }
 
+// FakeChooser allows clients to simulate events that a user would trigger when
+// using the Bluetooth chooser, and monitor the events that are produced.
+class FakeChooser {
+  constructor() {
+    this.fake_bluetooth_chooser_ptr_ =
+        new content.mojom.FakeBluetoothChooserPtr();
+    Mojo.bindInterface(content.mojom.FakeBluetoothChooser.name,
+        mojo.makeRequest(this.fake_bluetooth_chooser_ptr_).handle, 'process');
+  }
+}
+
 // If this line fails, it means that current environment does not support the
 // Web Bluetooth Test API.
 try {
diff --git a/tests/wpt/web-platform-tests/sensors/generic-sensor-tests.js b/tests/wpt/web-platform-tests/sensors/generic-sensor-tests.js
index 86ce7fe1f39..ece481bf4c4 100644
--- a/tests/wpt/web-platform-tests/sensors/generic-sensor-tests.js
+++ b/tests/wpt/web-platform-tests/sensors/generic-sensor-tests.js
@@ -251,6 +251,30 @@ function runGenericSensorTests(sensorType) {
   }, `${sensorType.name}: sensor receives suspend / resume notifications when\
   cross-origin subframe is focused`);
 
+  test(() => {
+     assert_throws("NotSupportedError", () => { new sensorType({invalid: 1}) });
+     assert_throws("NotSupportedError", () => { new sensorType({frequency: 60, invalid: 1}) });
+     if (spatialSensors.indexOf(sensorType.name) == -1) {
+       assert_throws("NotSupportedError", () => { new sensorType({referenceFrame: "screen"}) });
+     }
+  }, `${sensorType.name}: throw 'NotSupportedError' for an unsupported sensor option`);
+
+  test(() => {
+    const invalidFreqs = [
+      "invalid",
+      NaN,
+      Infinity,
+      -Infinity,
+      {},
+      undefined
+    ];
+    invalidFreqs.map(freq => {
+      assert_throws(new TypeError(),
+                    () => { new sensorType({frequency: freq}) },
+                    `when freq is ${freq}`);
+    });
+  }, `${sensorType.name}: throw 'TypeError' if frequency is invalid`);
+
   if (spatialSensors.indexOf(sensorType.name) == -1) {
     // The sensorType does not represent a spatial sensor.
     return;
@@ -268,6 +292,23 @@ function runGenericSensorTests(sensorType) {
 
     sensor.stop();
   }, `${sensorType.name}: sensor reading is correct when options.referenceFrame is 'screen'`);
+
+  test(() => {
+    const invalidRefFrames = [
+      "invalid",
+      null,
+      123,
+      {},
+      "",
+      true,
+      undefined
+    ];
+    invalidRefFrames.map(refFrame => {
+      assert_throws(new TypeError(),
+                    () => { new sensorType({referenceFrame: refFrame}) },
+                    `when refFrame is ${refFrame}`);
+    });
+  }, `${sensorType.name}: throw 'TypeError' if referenceFrame is not one of enumeration values`);
 }
 
 function runGenericSensorInsecureContext(sensorType) {
diff --git a/tests/wpt/web-platform-tests/staticrange/OWNERS b/tests/wpt/web-platform-tests/staticrange/OWNERS
deleted file mode 100644
index 5692d1b94a2..00000000000
--- a/tests/wpt/web-platform-tests/staticrange/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-@garykac
-@siusin
diff --git a/tests/wpt/web-platform-tests/staticrange/idlharness.html b/tests/wpt/web-platform-tests/staticrange/idlharness.html
deleted file mode 100644
index e35bca1e7e4..00000000000
--- a/tests/wpt/web-platform-tests/staticrange/idlharness.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<title>Static Range IDL tests</title>
-<link rel="help" href="http://garykac.github.io/staticrange/index.html#interface-staticrange"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-
-<pre id="untested_idl">
-interface Node {
-};
-</pre>
-
-<pre id='idl'>
-interface StaticRange {
-    readonly attribute Node startContainer;
-    readonly attribute unsigned long startOffset;
-    readonly attribute Node endContainer;
-    readonly attribute unsigned long endOffset;
-    readonly attribute boolean collapsed;
-};
-</pre>
-
-<script>
-(function(){
-    "use strict";
-    const idl_array = new IdlArray();
-    idl_array.add_untested_idls(document.getElementById("untested_idl").textContent);
-    idl_array.add_idls(document.getElementById("idl").textContent);
-    idl_array.test();
-})();
-</script>
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js b/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
index b6be0a78895..9fb175f2b53 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
@@ -1345,4 +1345,31 @@ promise_test(t => {
   });
 }, 'sink abort() should not be called if stream was erroring due to bad strategy before abort() was called');
 
+promise_test(t => {
+  const ws = new WritableStream();
+  return ws.abort().then(() => {
+    const writer = ws.getWriter();
+    return writer.closed.then(t.unreached_func('closed promise should not fulfill'),
+                              e => assert_equals(e, undefined, 'e should be undefined'));
+  });
+}, 'abort with no arguments should set the stored error to undefined');
+
+promise_test(t => {
+  const ws = new WritableStream();
+  return ws.abort(undefined).then(() => {
+    const writer = ws.getWriter();
+    return writer.closed.then(t.unreached_func('closed promise should not fulfill'),
+                              e => assert_equals(e, undefined, 'e should be undefined'));
+  });
+}, 'abort with an undefined argument should set the stored error to undefined');
+
+promise_test(t => {
+  const ws = new WritableStream();
+  return ws.abort('string argument').then(() => {
+    const writer = ws.getWriter();
+    return writer.closed.then(t.unreached_func('closed promise should not fulfill'),
+                              e => assert_equals(e, 'string argument', 'e should be \'string argument\''));
+  });
+}, 'abort with a string argument should set the stored error to that argument');
+
 done();
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_stability.sh b/tests/wpt/web-platform-tests/tools/ci/ci_stability.sh
index 1b814ee58e3..a23b0573853 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_stability.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_stability.sh
@@ -8,15 +8,23 @@ cd $WPT_ROOT
 source tools/ci/lib.sh
 
 test_stability() {
-    ./wpt check-stability $PRODUCT --output-bytes $((1024 * 1024 * 3)) --metadata ~/meta/ --install-fonts
+    local extra_arg=$1
+    ./wpt check-stability $PRODUCT $extra_arg --output-bytes $((1024 * 1024 * 3)) --metadata ~/meta/ --install-fonts
 }
 
 main() {
     hosts_fixup
+    local extra_arg=""
     if [ $(echo $PRODUCT | grep '^chrome:') ]; then
-       install_chrome $(echo $PRODUCT | grep --only-matching '\w\+$')
+        local channel=$(echo $PRODUCT | grep --only-matching '\w\+$')
+        if [[ $channel == "dev" ]]; then
+            # The package name for Google Chrome Dev uses "unstable", not "dev".
+            channel="unstable"
+        fi
+        install_chrome $channel
+        extra_arg="--binary=$(which google-chrome-$channel)"
     fi
-    test_stability
+    test_stability $extra_arg
 }
 
 main
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_wpt.sh b/tests/wpt/web-platform-tests/tools/ci/ci_wpt.sh
index 2e572b2a65b..2b634137605 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_wpt.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_wpt.sh
@@ -10,7 +10,7 @@ source tools/ci/lib.sh
 main() {
     git fetch --unshallow https://github.com/w3c/web-platform-tests.git +refs/heads/*:refs/remotes/origin/*
     hosts_fixup
-    install_chrome dev
+    install_chrome unstable
     pip install -U tox codecov
     cd tools/wpt
     tox
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh b/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
index cb03b7063ae..d6d6803974f 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
@@ -11,6 +11,8 @@ test_infrastructure() {
     local ARGS="";
     if [ $PRODUCT == "firefox" ]; then
         ARGS="--install-browser"
+    else
+        ARGS=$1
     fi
     ./wpt run --yes --manifest ~/meta/MANIFEST.json --metadata infrastructure/metadata/ --install-fonts $ARGS $PRODUCT infrastructure/
 }
@@ -24,9 +26,11 @@ main() {
             hosts_fixup
         fi
         if [ "$PRODUCT" == "chrome" ]; then
-            install_chrome dev
+            install_chrome unstable
+            test_infrastructure "--binary=$(which google-chrome-unstable)"
+        else
+            test_infrastructure
         fi
-        test_infrastructure
     done
 }
 
diff --git a/tests/wpt/web-platform-tests/tools/ci/lib.sh b/tests/wpt/web-platform-tests/tools/ci/lib.sh
index 2273793ba32..7c0b8253a90 100644
--- a/tests/wpt/web-platform-tests/tools/ci/lib.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/lib.sh
@@ -15,12 +15,8 @@ hosts_fixup() {
 
 install_chrome() {
     channel=$1
-    # The package name for Google Chrome Dev uses "unstable", not "dev".
-    if [[ $channel == "dev" ]]; then
-        channel="unstable"
-    fi
     deb_archive=google-chrome-${channel}_current_amd64.deb
-    wget https://dl.google.com/linux/direct/$deb_archive
+    wget -q https://dl.google.com/linux/direct/$deb_archive
 
     # If the environment provides an installation of Google Chrome, the
     # existing binary may take precedence over the one introduced in this
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index b47637a227f..7eb3d4ac7ec 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -9,6 +9,7 @@ import os
 import re
 import subprocess
 import sys
+import tempfile
 
 from collections import defaultdict
 
@@ -58,9 +59,13 @@ you could add the following line to the lint.whitelist file.
 
 %s: %s"""
 
-def all_filesystem_paths(repo_root):
+def all_filesystem_paths(repo_root, subdir=None):
     path_filter = PathFilter(repo_root, extras=[".git/*"])
-    for dirpath, dirnames, filenames in os.walk(repo_root):
+    if subdir:
+        expanded_path = subdir
+    else:
+        expanded_path = repo_root
+    for dirpath, dirnames, filenames in os.walk(expanded_path):
         for filename in filenames:
             path = os.path.relpath(os.path.join(dirpath, filename), repo_root)
             if path_filter(path):
@@ -134,6 +139,28 @@ def check_ahem_copy(repo_root, path):
     return []
 
 
+def check_git_ignore(repo_root, paths):
+    errors = []
+    with tempfile.TemporaryFile('w+') as f:
+        f.write('\n'.join(paths))
+        f.seek(0)
+        try:
+            matches = subprocess.check_output(
+                ["git", "check-ignore", "--verbose", "--no-index", "--stdin"], stdin=f)
+            for match in matches.strip().split('\n'):
+                match_filter, path = match.split()
+                _, _, filter_string = match_filter.split(':')
+                # If the matching filter reported by check-ignore is a special-case exception,
+                # that's fine. Otherwise, it requires a new special-case exception.
+                if filter_string[0] != '!':
+                    errors += [("IGNORED PATH", "%s matches an ignore filter in .gitignore - "
+                                "please add a .gitignore exception" % path, path, None)]
+        except subprocess.CalledProcessError as e:
+            # Nonzero return code means that no match exists.
+            pass
+    return errors
+
+
 drafts_csswg_re = re.compile(r"https?\:\/\/drafts\.csswg\.org\/([^/?#]+)")
 w3c_tr_re = re.compile(r"https?\:\/\/www\.w3c?\.org\/TR\/([^/?#]+)")
 w3c_dev_re = re.compile(r"https?\:\/\/dev\.w3c?\.org\/[^/?#]+\/([^/?#]+)")
@@ -278,7 +305,9 @@ def filter_whitelist_errors(data, errors):
 
     for i, (error_type, msg, path, line) in enumerate(errors):
         normpath = os.path.normcase(path)
-        if error_type in data:
+        # Allow whitelisting all lint errors except the IGNORED PATH lint,
+        # which explains how to fix it correctly and shouldn't be ignored.
+        if error_type in data and error_type != "IGNORED PATH":
             wl_files = data[error_type]
             for file_match, allowed_lines in iteritems(wl_files):
                 if None in allowed_lines or line in allowed_lines:
@@ -722,14 +751,20 @@ def changed_files(wpt_root):
 
 def lint_paths(kwargs, wpt_root):
     if kwargs.get("paths"):
-        r = os.path.realpath(wpt_root)
-        paths = [os.path.relpath(os.path.realpath(x), r) for x in kwargs["paths"]]
+        paths = []
+        for path in kwargs.get("paths"):
+            if os.path.isdir(path):
+                path_dir = list(all_filesystem_paths(wpt_root, path))
+                paths.extend(path_dir)
+            elif os.path.isfile(path):
+                paths.append(os.path.relpath(os.path.abspath(path), wpt_root))
+
+
     elif kwargs["all"]:
         paths = list(all_filesystem_paths(wpt_root))
     else:
         changed_paths = changed_files(wpt_root)
         force_all = False
-        # If we changed the lint itself ensure that we retest everything
         for path in changed_paths:
             path = path.replace(os.path.sep, "/")
             if path == "lint.whitelist" or path.startswith("tools/lint/"):
@@ -840,6 +875,13 @@ path_lints = [check_path_length, check_worker_collision, check_ahem_copy]
 all_paths_lints = [check_css_globally_unique]
 file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata]
 
+# Don't break users of the lint that don't have git installed.
+try:
+    subprocess.check_output(["git", "--version"])
+    all_paths_lints += [check_git_ignore]
+except subprocess.CalledProcessError:
+    print('No git present; skipping .gitignore lint.')
+
 if __name__ == "__main__":
     args = create_parser().parse_args()
     error_count = main(**vars(args))
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
index ed552472733..0a96b2968bb 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
@@ -398,12 +398,14 @@ def test_main_with_args():
     orig_argv = sys.argv
     try:
         sys.argv = ['./lint', 'a', 'b', 'c']
-        with _mock_lint('lint', return_value=True) as m:
-            lint_mod.main(**vars(create_parser().parse_args()))
-            m.assert_called_once_with(repo_root,
-                                      [os.path.relpath(os.path.join(os.getcwd(), x), repo_root)
-                                       for x in ['a', 'b', 'c']],
-                                      "normal")
+        with mock.patch(lint_mod.__name__ + ".os.path.isfile") as mock_isfile:
+            mock_isfile.return_value = True
+            with _mock_lint('lint', return_value=True) as m:
+                lint_mod.main(**vars(create_parser().parse_args()))
+                m.assert_called_once_with(repo_root,
+                                          [os.path.relpath(os.path.join(os.getcwd(), x), repo_root)
+                                           for x in ['a', 'b', 'c']],
+                                          "normal")
     finally:
         sys.argv = orig_argv
 
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index bb403e27529..e1c629538fe 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -387,19 +387,19 @@ class ServerProc(object):
         self.daemon = None
         self.stop = Event()
 
-    def start(self, init_func, host, port, paths, routes, bind_hostname, config,
+    def start(self, init_func, host, port, paths, routes, bind_address, config,
               ssl_config, **kwargs):
         self.proc = Process(target=self.create_daemon,
-                            args=(init_func, host, port, paths, routes, bind_hostname,
+                            args=(init_func, host, port, paths, routes, bind_address,
                                   config, ssl_config),
                             kwargs=kwargs)
         self.proc.daemon = True
         self.proc.start()
 
-    def create_daemon(self, init_func, host, port, paths, routes, bind_hostname,
+    def create_daemon(self, init_func, host, port, paths, routes, bind_address,
                       config, ssl_config, **kwargs):
         try:
-            self.daemon = init_func(host, port, paths, routes, bind_hostname, config,
+            self.daemon = init_func(host, port, paths, routes, bind_address, config,
                                     ssl_config, **kwargs)
         except socket.error:
             print("Socket error on port %s" % port, file=sys.stderr)
@@ -432,12 +432,12 @@ class ServerProc(object):
         return self.proc.is_alive()
 
 
-def check_subdomains(host, paths, bind_hostname, ssl_config, aliases):
+def check_subdomains(host, paths, bind_address, ssl_config, aliases):
     port = get_port()
     subdomains = get_subdomains(host)
 
     wrapper = ServerProc()
-    wrapper.start(start_http_server, host, port, paths, build_routes(aliases), bind_hostname,
+    wrapper.start(start_http_server, host, port, paths, build_routes(aliases), bind_address,
                   None, ssl_config)
 
     connected = False
@@ -490,7 +490,7 @@ def make_hosts_file(config, host):
     return "".join(rv)
 
 
-def start_servers(host, ports, paths, routes, bind_hostname, config, ssl_config,
+def start_servers(host, ports, paths, routes, bind_address, config, ssl_config,
                   **kwargs):
     servers = defaultdict(list)
     for scheme, ports in ports.iteritems():
@@ -505,21 +505,21 @@ def start_servers(host, ports, paths, routes, bind_hostname, config, ssl_config,
                          "wss":start_wss_server}[scheme]
 
             server_proc = ServerProc()
-            server_proc.start(init_func, host, port, paths, routes, bind_hostname,
+            server_proc.start(init_func, host, port, paths, routes, bind_address,
                               config, ssl_config, **kwargs)
             servers[scheme].append((port, server_proc))
 
     return servers
 
 
-def start_http_server(host, port, paths, routes, bind_hostname, config, ssl_config,
+def start_http_server(host, port, paths, routes, bind_address, config, ssl_config,
                       **kwargs):
     return wptserve.WebTestHttpd(host=host,
                                  port=port,
                                  doc_root=paths["doc_root"],
                                  routes=routes,
                                  rewrites=rewrites,
-                                 bind_hostname=bind_hostname,
+                                 bind_address=bind_address,
                                  config=config,
                                  use_ssl=False,
                                  key_file=None,
@@ -527,14 +527,14 @@ def start_http_server(host, port, paths, routes, bind_hostname, config, ssl_conf
                                  latency=kwargs.get("latency"))
 
 
-def start_https_server(host, port, paths, routes, bind_hostname, config, ssl_config,
+def start_https_server(host, port, paths, routes, bind_address, config, ssl_config,
                        **kwargs):
     return wptserve.WebTestHttpd(host=host,
                                  port=port,
                                  doc_root=paths["doc_root"],
                                  routes=routes,
                                  rewrites=rewrites,
-                                 bind_hostname=bind_hostname,
+                                 bind_address=bind_address,
                                  config=config,
                                  use_ssl=True,
                                  key_file=ssl_config["key_path"],
@@ -544,7 +544,7 @@ def start_https_server(host, port, paths, routes, bind_hostname, config, ssl_con
 
 
 class WebSocketDaemon(object):
-    def __init__(self, host, port, doc_root, handlers_root, log_level, bind_hostname,
+    def __init__(self, host, port, doc_root, handlers_root, log_level, bind_address,
                  ssl_config):
         self.host = host
         cmd_args = ["-p", port,
@@ -569,7 +569,7 @@ class WebSocketDaemon(object):
                          "--certificate", ssl_config["cert_path"],
                          "--tls-module", tls_module]
 
-        if (bind_hostname):
+        if (bind_address):
             cmd_args = ["-H", host] + cmd_args
         opts, args = pywebsocket._parse_args_and_config(cmd_args)
         opts.cgi_directories = []
@@ -608,25 +608,25 @@ class WebSocketDaemon(object):
         self.server = None
 
 
-def start_ws_server(host, port, paths, routes, bind_hostname, config, ssl_config,
+def start_ws_server(host, port, paths, routes, bind_address, config, ssl_config,
                     **kwargs):
     return WebSocketDaemon(host,
                            str(port),
                            repo_root,
                            paths["ws_doc_root"],
                            "debug",
-                           bind_hostname,
+                           bind_address,
                            ssl_config = None)
 
 
-def start_wss_server(host, port, paths, routes, bind_hostname, config, ssl_config,
+def start_wss_server(host, port, paths, routes, bind_address, config, ssl_config,
                      **kwargs):
     return WebSocketDaemon(host,
                            str(port),
                            repo_root,
                            paths["ws_doc_root"],
                            "debug",
-                           bind_hostname,
+                           bind_address,
                            ssl_config)
 
 
@@ -662,9 +662,11 @@ def normalise_config(config, ports):
 
     domains[""] = host
 
-    ports_ = {}
-    for scheme, ports_used in ports.iteritems():
-        ports_[scheme] = ports_used
+    if "bind_hostname" in config:
+        logger.warning("bind_hostname in config is deprecated; use bind_address instead")
+        bind_address = config["bind_hostname"]
+    else:
+        bind_address = config["bind_address"]
 
     # make a (shallow) copy of the config and update that, so that the
     # normalized config can be used in place of the original one.
@@ -672,6 +674,7 @@ def normalise_config(config, ports):
     config_["domains"] = domains
     config_["not_domains"] = not_domains
     config_["ports"] = ports_
+    config_["bind_address"] = bind_address
     return config_
 
 
@@ -692,10 +695,10 @@ def start(config, ssl_environment, routes, **kwargs):
     host = config.get("host_ip") or config["host"]
     ports = get_ports(config, ssl_environment)
     paths = get_paths(config)
-    bind_hostname = config["bind_hostname"]
+    bind_address = config["bind_address"]
     ssl_config = get_ssl_config(config, ssl_environment)
 
-    servers = start_servers(host, ports, paths, routes, bind_hostname, config,
+    servers = start_servers(host, ports, paths, routes, bind_address, config,
                             ssl_config, **kwargs)
 
     return servers
@@ -813,15 +816,15 @@ def run(**kwargs):
         ports = get_ports(config, ssl_env)
         config = normalise_config(config, ports)
         host = config["host"]
-        bind_hostname = config["bind_hostname"]
+        bind_address = config["bind_address"]
 
         if config["check_subdomains"]:
             paths = get_paths(config)
             ssl_config = get_ssl_config(config, ssl_env)
-            check_subdomains(host, paths, bind_hostname, ssl_config, config["aliases"])
+            check_subdomains(host, paths, bind_address, ssl_config, config["aliases"])
 
         stash_address = None
-        if bind_hostname:
+        if bind_address:
             stash_address = (host, get_port())
 
         with stash.StashServer(stash_address, authkey=str(uuid.uuid4())):
diff --git a/tests/wpt/web-platform-tests/tools/six/documentation/index.rst b/tests/wpt/web-platform-tests/tools/six/documentation/index.rst
index 7851421a90e..9827e6695b5 100644
--- a/tests/wpt/web-platform-tests/tools/six/documentation/index.rst
+++ b/tests/wpt/web-platform-tests/tools/six/documentation/index.rst
@@ -104,7 +104,7 @@ Here's example usage of the module::
 Object model compatibility
 >>>>>>>>>>>>>>>>>>>>>>>>>>
 
-Python 3 renamed the attributes of several intepreter data structures.  The
+Python 3 renamed the attributes of several interpreter data structures.  The
 following accessors are available.  Note that the recommended way to inspect
 functions and methods is the stdlib :mod:`py3:inspect` module.
 
@@ -459,7 +459,7 @@ For the most part, :mod:`six.moves` aliases are the names of the modules in
 Python 3.  When the new Python 3 name is a package, the components of the name
 are separated by underscores.  For example, ``html.parser`` becomes
 ``html_parser``.  In some cases where several modules have been combined, the
-Python 2 name is retained.  This is so the appropiate modules can be found when
+Python 2 name is retained.  This is so the appropriate modules can be found when
 running on Python 2.  For example, ``BaseHTTPServer`` which is in
 ``http.server`` in Python 3 is aliased as ``BaseHTTPServer``.
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 5dfcfa55727..d52feb03576 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -65,29 +65,10 @@ class Firefox(Browser):
     """
 
     product = "firefox"
-    binary = "firefox/firefox"
-    platform_ini = "firefox/platform.ini"
+    binary = "browsers/firefox/firefox"
+    platform_ini = "browsers/firefox/platform.ini"
     requirements = "requirements_firefox.txt"
 
-    def platform_string(self):
-        platform = {
-            "Linux": "linux",
-            "Windows": "win",
-            "Darwin": "mac"
-        }.get(uname[0])
-
-        if platform is None:
-            raise ValueError("Unable to construct a valid Firefox package name for current platform")
-
-        if platform == "linux":
-            bits = "-%s" % uname[4]
-        elif platform == "win":
-            bits = "64" if uname[4] == "x86_64" else "32"
-        else:
-            bits = ""
-
-        return "%s%s" % (platform, bits)
-
     def platform_string_geckodriver(self):
         platform = {
             "Linux": "linux",
@@ -111,38 +92,69 @@ class Firefox(Browser):
         from mozdownload import FactoryScraper
         import mozinstall
 
-        if dest is None:
-            dest = os.getcwd()
+        platform = {
+            "Linux": "linux",
+            "Windows": "win",
+            "Darwin": "mac"
+        }.get(uname[0])
 
-        filename = FactoryScraper('daily', branch='mozilla-central', destination=dest).download()
+        if platform is None:
+            raise ValueError("Unable to construct a valid Firefox package name for current platform")
+
+        if dest is None:
+            # os.getcwd() doesn't include the venv path
+            dest = os.path.join(os.getcwd(), "_venv")
+
+        dest = os.path.join(dest, "browsers")
+
+        filename = FactoryScraper("daily", branch="mozilla-central", destination=dest).download()
 
         try:
             mozinstall.install(filename, dest)
         except mozinstall.mozinstall.InstallError as e:
-            if uname[0] == "Darwin":
-                # mozinstall will fail here if nightly is already installed in the venv
-                # This only occurs on macOS because shutil.copy_tree() is called in
-                # mozinstall._install_dmg and will fail if the file already exists.
-                # copytree isn't used while installing on Windows/linux, so the same error
-                # won't be thrown if we try to rewrite there.
-                mozinstall.uninstall(dest+'/Firefox Nightly.app')
+            if platform == "mac" and os.path.exists(os.path.join(dest, "Firefox Nightly.app")):
+                # mozinstall will fail if nightly is already installed in the venv because
+                # mac installation uses shutil.copy_tree
+                mozinstall.uninstall(os.path.join(dest, "Firefox Nightly.app"))
                 mozinstall.install(filename, dest)
             else:
                 raise
 
         os.remove(filename)
-        return find_executable("firefox", os.path.join(dest, "firefox"))
+        return self.find_binary_path(dest)
+
+    def find_binary_path(self, path=None):
+        """Looks for the firefox binary in the virtual environment"""
 
-    def find_binary(self):
         platform = {
             "Linux": "linux",
             "Windows": "win",
-            "Darwin": "macos"
+            "Darwin": "mac"
         }.get(uname[0])
 
-        path = find_executable("firefox")
+        if path is None:
+            #os.getcwd() doesn't include the venv path
+            path = os.path.join(os.getcwd(), "_venv", "browsers")
 
-        if not path and platform == "macos":
+        binary = None
+
+        if platform == "linux":
+            binary = find_executable("firefox", os.path.join(path, "firefox"))
+        elif platform == "win":
+            import mozinstall
+            binary = mozinstall.get_binary(path, "firefox")
+        elif platform == "mac":
+            binary = find_executable("firefox", os.path.join(path, "Firefox Nightly.app", "Contents", "MacOS"))
+
+        return binary
+
+    def find_binary(self, venv_path=None):
+        if venv_path is None:
+            venv_path = os.path.join(os.getcwd(), venv_path)
+
+        binary = self.find_binary_path(os.path.join(venv_path, "browsers"))
+
+        if not binary and uname[0] == "Darwin":
             macpaths = ["/Applications/FirefoxNightly.app/Contents/MacOS",
                         os.path.expanduser("~/Applications/FirefoxNightly.app/Contents/MacOS"),
                         "/Applications/Firefox Developer Edition.app/Contents/MacOS",
@@ -151,7 +163,10 @@ class Firefox(Browser):
                         os.path.expanduser("~/Applications/Firefox.app/Contents/MacOS")]
             return find_executable("firefox", os.pathsep.join(macpaths))
 
-        return path
+        if binary is None:
+            return find_executable("firefox")
+
+        return binary
 
     def find_certutil(self):
         path = find_executable("certutil")
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index b9f5aadeea6..98a609e7174 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -163,7 +163,7 @@ class Firefox(BrowserSetup):
 
     def setup_kwargs(self, kwargs):
         if kwargs["binary"] is None:
-            binary = self.browser.find_binary()
+            binary = self.browser.find_binary(self.venv.path)
             if binary is None:
                 raise WptrunError("""Firefox binary not found on $PATH.
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index fade7024f4a..5d6280d7230 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -65,8 +65,6 @@ def test_help():
 
 @pytest.mark.slow
 @pytest.mark.remote_network
-@pytest.mark.xfail(sys.platform == "darwin",
-                   reason="https://github.com/w3c/web-platform-tests/issues/9090")
 @pytest.mark.xfail(sys.platform == "win32",
                    reason="Tests currently don't work on Windows for path reasons")
 def test_run_firefox(manifest_dir):
@@ -77,7 +75,10 @@ def test_run_firefox(manifest_dir):
 
     os.environ["MOZ_HEADLESS"] = "1"
     try:
-        fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "firefox")
+        if sys.platform == "darwin":
+            fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "browsers", "Firefox Nightly.app")
+        else:
+            fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "browsers", "firefox")
         if os.path.exists(fx_path):
             shutil.rmtree(fx_path)
         with pytest.raises(SystemExit) as excinfo:
@@ -122,12 +123,14 @@ def test_install_chromedriver():
 
 @pytest.mark.slow
 @pytest.mark.remote_network
-@pytest.mark.xfail(sys.platform == "darwin",
-                   reason="https://github.com/w3c/web-platform-tests/issues/9090")
 @pytest.mark.xfail(sys.platform == "win32",
                    reason="Tests currently don't work on Windows for path reasons")
 def test_install_firefox():
-    fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "firefox")
+
+    if sys.platform == "darwin":
+        fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "browsers", "Firefox Nightly.app")
+    else:
+        fx_path = os.path.join(wpt.localpaths.repo_root, "_venv", "browsers", "firefox")
     if os.path.exists(fx_path):
         shutil.rmtree(fx_path)
     with pytest.raises(SystemExit) as excinfo:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/README.rst b/tests/wpt/web-platform-tests/tools/wptrunner/README.rst
index 4890e3a6e03..89179228272 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/README.rst
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/README.rst
@@ -179,7 +179,7 @@ Simple key-value pairs are of the form::
 
   key: value
 
-Note that unlike ini files, only `:` is a valid seperator; `=` will
+Note that unlike ini files, only `:` is a valid separator; `=` will
 not work as expected. Key-value pairs may also have conditional
 values of the form::
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index e59cd90b0a3..796fcc89b12 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -124,7 +124,7 @@ def env_options():
     # https://github.com/w3c/web-platform-tests/pull/9480
     return {"host_ip": "127.0.0.1",
             "host": "web-platform.test",
-            "bind_hostname": False,
+            "bind_address": False,
             "certificate_domain": "web-platform.test",
             "supports_debugger": True}
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py
index 81b80e41640..e14e18ad452 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py
@@ -54,7 +54,7 @@ def env_extras(**kwargs):
 def env_options():
     return {"host": "web-platform.test",
             "host_ip": "127.0.0.1",
-            "bind_hostname": False,
+            "bind_address": False,
             "testharnessreport": "testharnessreport-servo.js",
             "supports_debugger": True}
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py
index b5fdb052849..7d95d4355d5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py
@@ -61,7 +61,7 @@ def env_extras(**kwargs):
 
 
 def env_options():
-    return {"bind_hostname": "true"}
+    return {}
 
 
 class WebKitBrowser(Browser):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
index bd5838fd008..5866b60de40 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
@@ -150,8 +150,8 @@ class TestEnvironment(object):
         if "host" in self.options:
             local_config["host"] = self.options["host"]
 
-        if "bind_hostname" in self.options:
-            local_config["bind_hostname"] = self.options["bind_hostname"]
+        if "bind_address" in self.options:
+            local_config["bind_address"] = self.options["bind_address"]
 
         with open(default_config_path) as f:
             default_config = json.load(f)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 7178b2e28c3..a19af3da914 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -8,6 +8,7 @@ import urlparse
 from abc import ABCMeta, abstractmethod
 
 from ..testrunner import Stop
+from protocol import Protocol
 
 here = os.path.split(__file__)[0]
 
@@ -199,6 +200,9 @@ class TestExecutor(object):
         message += traceback.format_exc(e)
         return test.result_cls(status, message), []
 
+    def wait(self):
+        self.protocol.base.wait()
+
 
 class TestharnessExecutor(TestExecutor):
     convert_result = testharness_result_converter
@@ -367,25 +371,6 @@ class WdspecExecutor(TestExecutor):
         from . import pytestrunner
 
 
-class Protocol(object):
-    def __init__(self, executor, browser):
-        self.executor = executor
-        self.browser = browser
-
-    @property
-    def logger(self):
-        return self.executor.logger
-
-    def setup(self, runner):
-        pass
-
-    def teardown(self):
-        pass
-
-    def wait(self):
-        pass
-
-
 class WdspecRun(object):
     def __init__(self, func, session, path, timeout):
         self.func = func
@@ -426,6 +411,14 @@ class WdspecRun(object):
             self.result_flag.set()
 
 
+class ConnectionlessProtocol(Protocol):
+    def connect(self):
+        pass
+
+    def after_connect(self):
+        pass
+
+
 class WebDriverProtocol(Protocol):
     server_cls = None
 
@@ -437,24 +430,21 @@ class WebDriverProtocol(Protocol):
         self.session_config = None
         self.server = None
 
-    def setup(self, runner):
+    def connect(self):
         """Connect to browser via the HTTP server."""
-        try:
-            self.server = self.server_cls(
-                self.logger,
-                binary=self.webdriver_binary,
-                args=self.webdriver_args)
-            self.server.start(block=False)
-            self.logger.info(
-                "WebDriver HTTP server listening at %s" % self.server.url)
-            self.session_config = {"host": self.server.host,
-                                   "port": self.server.port,
-                                   "capabilities": self.capabilities}
-        except Exception:
-            self.logger.error(traceback.format_exc())
-            self.executor.runner.send_message("init_failed")
-        else:
-            self.executor.runner.send_message("init_succeeded")
+        self.server = self.server_cls(
+            self.logger,
+            binary=self.webdriver_binary,
+            args=self.webdriver_args)
+        self.server.start(block=False)
+        self.logger.info(
+            "WebDriver HTTP server listening at %s" % self.server.url)
+        self.session_config = {"host": self.server.host,
+                               "port": self.server.port,
+                               "capabilities": self.capabilities}
+
+    def after_connect(self):
+        pass
 
     def teardown(self):
         if self.server is not None and self.server.is_alive:
@@ -476,3 +466,80 @@ class WebDriverProtocol(Protocol):
         conn.request("HEAD", self.server.base_path + "invalid")
         res = conn.getresponse()
         return res.status == 404
+
+
+class CallbackHandler(object):
+    """Handle callbacks from testdriver-using tests.
+
+    The default implementation here makes sense for things that are roughly like
+    WebDriver. Things that are more different to WebDriver may need to create a
+    fully custom implementation."""
+
+    def __init__(self, logger, protocol, test_window):
+        self.protocol = protocol
+        self.test_window = test_window
+        self.logger = logger
+        self.callbacks = {
+            "action": self.process_action,
+            "complete": self.process_complete
+        }
+
+        self.actions = {
+            "click": ClickAction(self.logger, self.protocol)
+        }
+
+    def __call__(self, result):
+        url, command, payload = result
+        self.logger.debug("Got async callback: %s" % result[1])
+        try:
+            callback = self.callbacks[command]
+        except KeyError:
+            raise ValueError("Unknown callback type %r" % result[1])
+        return callback(url, payload)
+
+    def process_complete(self, url, payload):
+        rv = [url] + payload
+        return True, rv
+
+    def process_action(self, url, payload):
+        parent = self.protocol.base.current_window
+        try:
+            self.protocol.base.set_window(self.test_window)
+            action = payload["action"]
+            self.logger.debug("Got action: %s" % action)
+            try:
+                action_handler = self.actions[action]
+            except KeyError:
+                raise ValueError("Unknown action %s" % action)
+            try:
+                action_handler(payload)
+            except Exception as e:
+                self.logger.warning("Action %s failed" % action)
+                self.logger.warning(traceback.format_exc())
+                self._send_message("complete", "failure")
+            else:
+                self.logger.debug("Action %s completed" % action)
+                self._send_message("complete", "success")
+        finally:
+            self.protocol.base.set_window(parent)
+
+        return False, None
+
+    def _send_message(self, message_type, status, message=None):
+        self.protocol.testdriver.send_message(message_type, status, message=message)
+
+
+class ClickAction(object):
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        selector = payload["selector"]
+        elements = self.protocol.select.elements_by_selector(selector)
+        if len(elements) == 0:
+            raise ValueError("Selector matches no elements")
+        elif len(elements) > 1:
+            raise ValueError("Selector matches multiple elements")
+        self.logger.debug("Clicking element: %s" % selector)
+        self.protocol.click.element(elements[0])
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index faf087b7a96..4e7370333c9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -1,3 +1,4 @@
+import json
 import os
 import socket
 import threading
@@ -11,8 +12,8 @@ pytestrunner = None
 
 here = os.path.join(os.path.split(__file__)[0])
 
-from .base import (ExecutorException,
-                   Protocol,
+from .base import (CallbackHandler,
+                   ExecutorException,
                    RefTestExecutor,
                    RefTestImplementation,
                    TestExecutor,
@@ -24,12 +25,18 @@ from .base import (ExecutorException,
                    testharness_result_converter,
                    reftest_result_converter,
                    strip_server)
-
+from .protocol import (BaseProtocolPart,
+                       TestharnessProtocolPart,
+                       PrefsProtocolPart,
+                       Protocol,
+                       StorageProtocolPart,
+                       SelectorProtocolPart,
+                       ClickProtocolPart,
+                       TestDriverProtocolPart)
 from ..testrunner import Stop
 from ..webdriver_server import GeckoDriverServer
 
 
-
 def do_delayed_imports():
     global errors, marionette
 
@@ -42,78 +49,17 @@ def do_delayed_imports():
         from marionette_driver import marionette, errors
 
 
-class MarionetteProtocol(Protocol):
-    def __init__(self, executor, browser, capabilities=None, timeout_multiplier=1):
-        do_delayed_imports()
-
-        Protocol.__init__(self, executor, browser)
-        self.marionette = None
-        self.marionette_port = browser.marionette_port
-        self.capabilities = capabilities
-        self.timeout_multiplier = timeout_multiplier
+class MarionetteBaseProtocolPart(BaseProtocolPart):
+    def __init__(self, parent):
+        super(MarionetteBaseProtocolPart, self).__init__(parent)
         self.timeout = None
-        self.runner_handle = None
 
-    def setup(self, runner):
-        """Connect to browser via Marionette."""
-        Protocol.setup(self, runner)
+    def setup(self):
+        self.marionette = self.parent.marionette
 
-        self.logger.debug("Connecting to Marionette on port %i" % self.marionette_port)
-        startup_timeout = marionette.Marionette.DEFAULT_STARTUP_TIMEOUT * self.timeout_multiplier
-        self.marionette = marionette.Marionette(host='localhost',
-                                                port=self.marionette_port,
-                                                socket_timeout=None,
-                                                startup_timeout=startup_timeout)
-        try:
-            self.logger.debug("Waiting for Marionette connection")
-            while True:
-                try:
-                    self.marionette.raise_for_port()
-                    break
-                except IOError:
-                    # When running in a debugger wait indefinitely for Firefox to start
-                    if self.executor.debug_info is None:
-                        raise
-
-            self.logger.debug("Starting Marionette session")
-            self.marionette.start_session()
-            self.logger.debug("Marionette session started")
-
-        except Exception as e:
-            self.logger.warning("Failed to start a Marionette session: %s" % e)
-            self.executor.runner.send_message("init_failed")
-
-        else:
-            try:
-                self.after_connect()
-            except Exception:
-                self.logger.warning("Post-connection steps failed")
-                self.logger.error(traceback.format_exc())
-                self.executor.runner.send_message("init_failed")
-            else:
-                self.executor.runner.send_message("init_succeeded")
-
-    def teardown(self):
-        try:
-            self.marionette._request_in_app_shutdown()
-            self.marionette.delete_session(send_request=False)
-        except Exception:
-            # This is typically because the session never started
-            pass
-        if self.marionette is not None:
-            del self.marionette
-
-    @property
-    def is_alive(self):
-        """Check if the Marionette connection is still active."""
-        try:
-            self.marionette.current_window_handle
-        except Exception:
-            return False
-        return True
-
-    def after_connect(self):
-        self.load_runner(self.executor.last_environment["protocol"])
+    def execute_script(self, script, async=False):
+        method = self.marionette.execute_async_script if async else self.marionette.execute_script
+        return method(script, new_sandbox=False)
 
     def set_timeout(self, timeout):
         """Set the Marionette script timeout.
@@ -121,13 +67,60 @@ class MarionetteProtocol(Protocol):
         :param timeout: Script timeout in seconds
 
         """
-        self.marionette.timeout.script = timeout
-        self.timeout = timeout
+        if timeout != self.timeout:
+            self.marionette.timeout.script = timeout
+            self.timeout = timeout
 
-    def load_runner(self, protocol):
+    @property
+    def current_window(self):
+        return self.marionette.current_window_handle
+
+    def set_window(self, handle):
+        self.marionette.switch_to_window(handle)
+
+    def wait(self):
+        try:
+            socket_timeout = self.marionette.client.socket_timeout
+        except AttributeError:
+            # This can happen if there was a crash
+            return
+        if socket_timeout:
+            try:
+                self.marionette.timeout.script = socket_timeout / 2
+            except (socket.error, IOError):
+                self.logger.debug("Socket closed")
+                return
+
+        while True:
+            try:
+                self.marionette.execute_async_script("")
+            except errors.NoSuchWindowException:
+                # The window closed
+                break
+            except errors.ScriptTimeoutException:
+                self.logger.debug("Script timed out")
+                pass
+            except (socket.timeout, IOError):
+                self.logger.debug("Socket closed")
+                break
+            except Exception as e:
+                self.logger.warning(traceback.format_exc(e))
+                break
+
+
+class MarionetteTestharnessProtocolPart(TestharnessProtocolPart):
+    def __init__(self, parent):
+        super(MarionetteTestharnessProtocolPart, self).__init__(parent)
+        self.runner_handle = None
+
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def load_runner(self, url_protocol):
         # Check if we previously had a test window open, and if we did make sure it's closed
         self.marionette.execute_script("if (window.wrappedJSObject.win) {window.wrappedJSObject.win.close()}")
-        url = urlparse.urljoin(self.executor.server_url(protocol), "/testharness_runner.html")
+        url = urlparse.urljoin(self.parent.executor.server_url(url_protocol),
+                               "/testharness_runner.html")
         self.logger.debug("Loading %s" % url)
         self.runner_handle = self.marionette.current_window_handle
         try:
@@ -142,7 +135,7 @@ class MarionetteProtocol(Protocol):
         self.marionette.execute_script(
             "document.title = '%s'" % threading.current_thread().name.replace("'", '"'))
 
-    def close_old_windows(self, protocol):
+    def close_old_windows(self, url_protocol):
         handles = self.marionette.window_handles
         runner_handle = None
         try:
@@ -168,7 +161,8 @@ class MarionetteProtocol(Protocol):
 
         self.marionette.switch_to_window(runner_handle)
         if runner_handle != self.runner_handle:
-            self.load_runner(protocol)
+            self.load_runner(url_protocol)
+        return self.runner_handle
 
     def dismiss_alert(self, f):
         while True:
@@ -183,50 +177,36 @@ class MarionetteProtocol(Protocol):
             else:
                 break
 
-    def wait(self):
-        try:
-            socket_timeout = self.marionette.client.socket_timeout
-        except AttributeError:
-            # This can happen if there was a crash
-            return
-        if socket_timeout:
+    def get_test_window(self, window_id, parent):
+        test_window = None
+        if window_id:
             try:
-                self.marionette.timeout.script = socket_timeout / 2
-            except (socket.error, IOError):
-                self.logger.debug("Socket closed")
-                return
-
-        self.marionette.switch_to_window(self.runner_handle)
-        while True:
-            try:
-                self.marionette.execute_async_script("")
-            except errors.NoSuchWindowException:
-                # The window closed
-                break
-            except errors.ScriptTimeoutException:
-                self.logger.debug("Script timed out")
+                # Try this, it's in Level 1 but nothing supports it yet
+                win_s = self.marionette.execute_script("return window['%s'];" % self.window_id)
+                win_obj = json.loads(win_s)
+                test_window = win_obj["window-fcc6-11e5-b4f8-330a88ab9d7f"]
+            except Exception:
                 pass
-            except (socket.timeout, IOError):
-                self.logger.debug("Socket closed")
-                break
-            except Exception as e:
-                self.logger.warning(traceback.format_exc(e))
-                break
 
-    def on_environment_change(self, old_environment, new_environment):
-        #Unset all the old prefs
-        for name in old_environment.get("prefs", {}).iterkeys():
-            value = self.executor.original_pref_values[name]
-            if value is None:
-                self.clear_user_pref(name)
+        if test_window is None:
+            after = self.marionette.window_handles
+            if len(after) == 2:
+                test_window = next(iter(set(after) - set([parent])))
+            elif after[0] == parent and len(after) > 2:
+                # Hope the first one here is the test window
+                test_window = after[1]
             else:
-                self.set_pref(name, value)
+                raise Exception("unable to find test window")
 
-        for name, value in new_environment.get("prefs", {}).iteritems():
-            self.executor.original_pref_values[name] = self.get_pref(name)
-            self.set_pref(name, value)
+        assert test_window != parent
+        return test_window
 
-    def set_pref(self, name, value):
+
+class MarionettePrefsProtocolPart(PrefsProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def set(self, name, value):
         if value.lower() not in ("true", "false"):
             try:
                 int(value)
@@ -258,7 +238,7 @@ class MarionetteProtocol(Protocol):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             self.marionette.execute_script(script)
 
-    def clear_user_pref(self, name):
+    def clear(self, name):
         self.logger.info("Clearing pref %s" % (name))
         script = """
             let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
@@ -269,7 +249,7 @@ class MarionetteProtocol(Protocol):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             self.marionette.execute_script(script)
 
-    def get_pref(self, name):
+    def get(self, name):
         script = """
             let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
                                           .getService(Components.interfaces.nsIPrefBranch);
@@ -289,6 +269,11 @@ class MarionetteProtocol(Protocol):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             self.marionette.execute_script(script)
 
+
+class MarionetteStorageProtocolPart(StorageProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
     def clear_origin(self, url):
         self.logger.info("Clearing origin %s" % (url))
         script = """
@@ -307,12 +292,118 @@ class MarionetteProtocol(Protocol):
             self.marionette.execute_script(script)
 
 
+class MarionetteSelectorProtocolPart(SelectorProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def elements_by_selector(self, selector):
+        return self.marionette.find_elements("css selector", selector)
+
+
+class MarionetteClickProtocolPart(ClickProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def element(self, element):
+        return element.click()
+
+
+class MarionetteTestDriverProtocolPart(TestDriverProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def send_message(self, message_type, status, message=None):
+        obj = {
+            "type": "testdriver-%s" % str(message_type),
+            "status": str(status)
+        }
+        if message:
+            obj["message"] = str(message)
+        self.marionette.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
+
+
+class MarionetteProtocol(Protocol):
+    implements = [MarionetteBaseProtocolPart,
+                  MarionetteTestharnessProtocolPart,
+                  MarionettePrefsProtocolPart,
+                  MarionetteStorageProtocolPart,
+                  MarionetteSelectorProtocolPart,
+                  MarionetteClickProtocolPart,
+                  MarionetteTestDriverProtocolPart]
+
+    def __init__(self, executor, browser, capabilities=None, timeout_multiplier=1):
+        do_delayed_imports()
+
+        super(MarionetteProtocol, self).__init__(executor, browser)
+        self.marionette = None
+        self.marionette_port = browser.marionette_port
+        self.capabilities = capabilities
+        self.timeout_multiplier = timeout_multiplier
+        self.runner_handle = None
+
+    def connect(self):
+        self.logger.debug("Connecting to Marionette on port %i" % self.marionette_port)
+        startup_timeout = marionette.Marionette.DEFAULT_STARTUP_TIMEOUT * self.timeout_multiplier
+        self.marionette = marionette.Marionette(host='localhost',
+                                                port=self.marionette_port,
+                                                socket_timeout=None,
+                                                startup_timeout=startup_timeout)
+
+        self.logger.debug("Waiting for Marionette connection")
+        while True:
+            try:
+                self.marionette.raise_for_port()
+                break
+            except IOError:
+                # When running in a debugger wait indefinitely for Firefox to start
+                if self.executor.debug_info is None:
+                    raise
+
+        self.logger.debug("Starting Marionette session")
+        self.marionette.start_session()
+        self.logger.debug("Marionette session started")
+
+    def after_connect(self):
+        self.testharness.load_runner(self.executor.last_environment["protocol"])
+
+    def teardown(self):
+        try:
+            self.marionette._request_in_app_shutdown()
+            self.marionette.delete_session(send_request=False)
+        except Exception:
+            # This is typically because the session never started
+            pass
+        if self.marionette is not None:
+            del self.marionette
+        super(MarionetteProtocol, self).teardown()
+
+    @property
+    def is_alive(self):
+        try:
+            self.marionette.current_window_handle
+        except Exception:
+            return False
+        return True
+
+    def on_environment_change(self, old_environment, new_environment):
+        #Unset all the old prefs
+        for name in old_environment.get("prefs", {}).iterkeys():
+            value = self.executor.original_pref_values[name]
+            if value is None:
+                self.prefs.clear(name)
+            else:
+                self.prefs.set(name, value)
+
+        for name, value in new_environment.get("prefs", {}).iteritems():
+            self.executor.original_pref_values[name] = self.get_pref(name)
+            self.prefs.set(name, value)
+
+
 class ExecuteAsyncScriptRun(object):
     def __init__(self, logger, func, protocol, url, timeout):
         self.logger = logger
         self.result = (None, None)
         self.protocol = protocol
-        self.marionette = protocol.marionette
         self.func = func
         self.url = url
         self.timeout = timeout
@@ -322,19 +413,18 @@ class ExecuteAsyncScriptRun(object):
         index = self.url.rfind("/storage/")
         if index != -1:
             # Clear storage
-            self.protocol.clear_origin(self.url)
+            self.protocol.storage.clear_origin(self.url)
 
         timeout = self.timeout
 
         try:
             if timeout is not None:
-                if timeout + extra_timeout != self.protocol.timeout:
-                    self.protocol.set_timeout(timeout + extra_timeout)
+                self.protocol.base.set_timeout(timeout + extra_timeout)
             else:
                 # We just want it to never time out, really, but marionette doesn't
                 # make that possible. It also seems to time out immediately if the
                 # timeout is set too high. This works at least.
-                self.protocol.set_timeout(2**28 - 1)
+                self.protocol.base.set_timeout(2**28 - 1)
         except IOError:
             self.logger.error("Lost marionette connection before starting test")
             return Stop
@@ -363,7 +453,7 @@ class ExecuteAsyncScriptRun(object):
 
     def _run(self):
         try:
-            self.result = True, self.func(self.marionette, self.url, self.timeout)
+            self.result = True, self.func(self.protocol, self.url, self.timeout)
         except errors.ScriptTimeoutException:
             self.logger.debug("Got a marionette timeout")
             self.result = False, ("EXTERNAL-TIMEOUT", None)
@@ -384,6 +474,8 @@ class ExecuteAsyncScriptRun(object):
 
 
 class MarionetteTestharnessExecutor(TestharnessExecutor):
+    supports_testdriver = True
+
     def __init__(self, browser, server_config, timeout_multiplier=1,
                  close_after_done=True, debug_info=None, capabilities=None,
                  **kwargs):
@@ -394,6 +486,7 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
 
         self.protocol = MarionetteProtocol(self, browser, capabilities, timeout_multiplier)
         self.script = open(os.path.join(here, "testharness_marionette.js")).read()
+        self.script_resume = open(os.path.join(here, "testharness_marionette_resume.js")).read()
         self.close_after_done = close_after_done
         self.window_id = str(uuid.uuid4())
 
@@ -409,7 +502,7 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
         self.protocol.on_environment_change(self.last_environment, new_environment)
 
         if new_environment["protocol"] != self.last_environment["protocol"]:
-            self.protocol.load_runner(new_environment["protocol"])
+            self.protocol.testharness.load_runner(new_environment["protocol"])
 
     def do_test(self, test):
         timeout = (test.timeout * self.timeout_multiplier if self.debug_info is None
@@ -425,24 +518,34 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
 
         return (test.result_cls(*data), [])
 
-    def do_testharness(self, marionette, url, timeout):
-        if self.close_after_done:
-            marionette.execute_script("if (window.wrappedJSObject.win) {window.wrappedJSObject.win.close()}")
-            self.protocol.close_old_windows(self.protocol)
+    def do_testharness(self, protocol, url, timeout):
+        protocol.base.execute_script("if (window.wrappedJSObject.win) {window.wrappedJSObject.win.close()}")
+        parent_window = protocol.testharness.close_old_windows(protocol)
 
         if timeout is not None:
             timeout_ms = str(timeout * 1000)
         else:
             timeout_ms = "null"
 
-        script = self.script % {"abs_url": url,
-                                "url": strip_server(url),
-                                "window_id": self.window_id,
-                                "timeout_multiplier": self.timeout_multiplier,
-                                "timeout": timeout_ms,
-                                "explicit_timeout": timeout is None}
+        format_map = {"abs_url": url,
+                      "url": strip_server(url),
+                      "window_id": self.window_id,
+                      "timeout_multiplier": self.timeout_multiplier,
+                      "timeout": timeout_ms,
+                      "explicit_timeout": timeout is None}
 
-        rv = marionette.execute_async_script(script, new_sandbox=False)
+        script = self.script % format_map
+
+        rv = protocol.base.execute_script(script)
+        test_window = protocol.testharness.get_test_window(self.window_id, parent_window)
+
+        handler = CallbackHandler(self.logger, protocol, test_window)
+        while True:
+            result = protocol.base.execute_script(
+                self.script_resume % format_map, async=True)
+            done, rv = handler(result)
+            if done:
+                break
         return rv
 
 
@@ -506,8 +609,8 @@ class MarionetteRefTestExecutor(RefTestExecutor):
                 self.has_window = False
 
             if not self.has_window:
-                self.protocol.marionette.execute_script(self.script)
-                self.protocol.marionette.switch_to_window(self.protocol.marionette.window_handles[-1])
+                self.protocol.base.execute_script(self.script)
+                self.protocol.base.set_window(self.protocol.marionette.window_handles[-1])
                 self.has_window = True
 
         result = self.implementation.run_test(test)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index f905fac81e1..0b7118993d8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -8,12 +8,18 @@ import traceback
 import urlparse
 import uuid
 
-from .base import (Protocol,
+from .base import (CallbackHandler,
                    RefTestExecutor,
                    RefTestImplementation,
                    TestharnessExecutor,
                    extra_timeout,
                    strip_server)
+from .protocol import (BaseProtocolPart,
+                       TestharnessProtocolPart,
+                       Protocol,
+                       SelectorProtocolPart,
+                       ClickProtocolPart,
+                       TestDriverProtocolPart)
 from ..testrunner import Stop
 
 here = os.path.join(os.path.split(__file__)[0])
@@ -32,45 +38,142 @@ def do_delayed_imports():
     from selenium.webdriver.remote.remote_connection import RemoteConnection
 
 
+class SeleniumBaseProtocolPart(BaseProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def execute_script(self, script, async=False):
+        method = self.webdriver.execute_async_script if async else self.webdriver.execute_script
+        return method(script)
+
+    def set_timeout(self, timeout):
+        self.webdriver.set_script_timeout(timeout * 1000)
+
+    @property
+    def current_window(self):
+        return self.webdriver.current_window_handle
+
+    def set_window(self, handle):
+        self.webdriver.switch_to_window(handle)
+
+    def wait(self):
+        while True:
+            try:
+                self.webdriver.execute_async_script("")
+            except exceptions.TimeoutException:
+                pass
+            except (socket.timeout, exceptions.NoSuchWindowException,
+                    exceptions.ErrorInResponseException, IOError):
+                break
+            except Exception as e:
+                self.logger.error(traceback.format_exc(e))
+                break
+
+
+class SeleniumTestharnessProtocolPart(TestharnessProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def load_runner(self, url_protocol):
+        url = urlparse.urljoin(self.parent.executor.server_url(url_protocol),
+                               "/testharness_runner.html")
+        self.logger.debug("Loading %s" % url)
+        self.webdriver.get(url)
+        self.webdriver.execute_script("document.title = '%s'" %
+                                      threading.current_thread().name.replace("'", '"'))
+
+    def close_old_windows(self):
+        exclude = self.webdriver.current_window_handle
+        handles = [item for item in self.webdriver.window_handles if item != exclude]
+        for handle in handles:
+            try:
+                self.webdriver.switch_to_window(handle)
+                self.webdriver.close()
+            except exceptions.NoSuchWindowException:
+                pass
+        self.webdriver.switch_to_window(exclude)
+        return exclude
+
+    def get_test_window(self, window_id, parent):
+        test_window = None
+        if window_id:
+            try:
+                # Try this, it's in Level 1 but nothing supports it yet
+                win_s = self.webdriver.execute_script("return window['%s'];" % self.window_id)
+                win_obj = json.loads(win_s)
+                test_window = win_obj["window-fcc6-11e5-b4f8-330a88ab9d7f"]
+            except Exception:
+                pass
+
+        if test_window is None:
+            after = self.webdriver.window_handles
+            if len(after) == 2:
+                test_window = next(iter(set(after) - set([parent])))
+            elif after[0] == parent and len(after) > 2:
+                # Hope the first one here is the test window
+                test_window = after[1]
+            else:
+                raise Exception("unable to find test window")
+
+        assert test_window != parent
+        return test_window
+
+
+class SeleniumSelectorProtocolPart(SelectorProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def elements_by_selector(self, selector):
+        return self.webdriver.find_elements_by_css_selector(selector)
+
+
+class SeleniumClickProtocolPart(ClickProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def element(self, element):
+        return element.click()
+
+
+class SeleniumTestDriverProtocolPart(TestDriverProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def send_message(self, message_type, status, message=None):
+        obj = {
+            "type": "testdriver-%s" % str(message_type),
+            "status": str(status)
+        }
+        if message:
+            obj["message"] = str(message)
+        self.webdriver.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
+
+
 class SeleniumProtocol(Protocol):
+    implements = [SeleniumBaseProtocolPart,
+                  SeleniumTestharnessProtocolPart,
+                  SeleniumSelectorProtocolPart,
+                  SeleniumClickProtocolPart,
+                  SeleniumTestDriverProtocolPart]
+
     def __init__(self, executor, browser, capabilities, **kwargs):
         do_delayed_imports()
 
-        Protocol.__init__(self, executor, browser)
+        super(SeleniumProtocol, self).__init__(executor, browser)
         self.capabilities = capabilities
         self.url = browser.webdriver_url
         self.webdriver = None
 
-    def setup(self, runner):
+    def connect(self):
         """Connect to browser via Selenium's WebDriver implementation."""
-        self.runner = runner
         self.logger.debug("Connecting to Selenium on URL: %s" % self.url)
 
-        session_started = False
-        try:
-            self.webdriver = webdriver.Remote(command_executor=RemoteConnection(self.url.strip("/"),
-                                                                                resolve_ip=False),
-                                              desired_capabilities=self.capabilities)
-        except Exception:
-            self.logger.warning(
-                "Connecting to Selenium failed:\n%s" % traceback.format_exc())
-        else:
-            self.logger.debug("Selenium session started")
-            session_started = True
+        self.webdriver = webdriver.Remote(command_executor=RemoteConnection(self.url.strip("/"),
+                                                                            resolve_ip=False),
+                                          desired_capabilities=self.capabilities)
 
-        if not session_started:
-            self.logger.warning("Failed to connect to Selenium")
-            self.executor.runner.send_message("init_failed")
-        else:
-            try:
-                self.after_connect()
-            except Exception:
-                print >> sys.stderr, traceback.format_exc()
-                self.logger.warning(
-                    "Failed to connect to navigate initial page")
-                self.executor.runner.send_message("init_failed")
-            else:
-                self.executor.runner.send_message("init_succeeded")
+    def after_conect(self):
+        pass
 
     def teardown(self):
         self.logger.debug("Hanging up on Selenium session")
@@ -90,35 +193,14 @@ class SeleniumProtocol(Protocol):
         return True
 
     def after_connect(self):
-        self.load_runner("http")
-
-    def load_runner(self, protocol):
-        url = urlparse.urljoin(self.executor.server_url(protocol),
-                               "/testharness_runner.html")
-        self.logger.debug("Loading %s" % url)
-        self.webdriver.get(url)
-        self.webdriver.execute_script("document.title = '%s'" %
-                                      threading.current_thread().name.replace("'", '"'))
-
-    def wait(self):
-        while True:
-            try:
-                self.webdriver.execute_async_script("")
-            except exceptions.TimeoutException:
-                pass
-            except (socket.timeout, exceptions.NoSuchWindowException,
-                    exceptions.ErrorInResponseException, IOError):
-                break
-            except Exception as e:
-                self.logger.error(traceback.format_exc(e))
-                break
+        self.testharness.load_runner(self.executor.last_environment["protocol"])
 
 
 class SeleniumRun(object):
-    def __init__(self, func, webdriver, url, timeout):
+    def __init__(self, func, protocol, url, timeout):
         self.func = func
         self.result = None
-        self.webdriver = webdriver
+        self.protocol = protocol
         self.url = url
         self.timeout = timeout
         self.result_flag = threading.Event()
@@ -127,7 +209,7 @@ class SeleniumRun(object):
         timeout = self.timeout
 
         try:
-            self.webdriver.set_script_timeout((timeout + extra_timeout) * 1000)
+            self.protocol.base.set_timeout((timeout + extra_timeout))
         except exceptions.ErrorInResponseException:
             self.logger.error("Lost WebDriver connection")
             return Stop
@@ -144,7 +226,7 @@ class SeleniumRun(object):
 
     def _run(self):
         try:
-            self.result = True, self.func(self.webdriver, self.url, self.timeout)
+            self.result = True, self.func(self.protocol, self.url, self.timeout)
         except exceptions.TimeoutException:
             self.result = False, ("EXTERNAL-TIMEOUT", None)
         except (socket.timeout, exceptions.ErrorInResponseException):
@@ -182,13 +264,13 @@ class SeleniumTestharnessExecutor(TestharnessExecutor):
 
     def on_environment_change(self, new_environment):
         if new_environment["protocol"] != self.last_environment["protocol"]:
-            self.protocol.load_runner(new_environment["protocol"])
+            self.protocol.testharness.load_runner(new_environment["protocol"])
 
     def do_test(self, test):
         url = self.test_url(test)
 
         success, data = SeleniumRun(self.do_testharness,
-                                    self.protocol.webdriver,
+                                    self.protocol,
                                     url,
                                     test.timeout * self.timeout_multiplier).run()
 
@@ -197,111 +279,28 @@ class SeleniumTestharnessExecutor(TestharnessExecutor):
 
         return (test.result_cls(*data), [])
 
-    def do_testharness(self, webdriver, url, timeout):
+    def do_testharness(self, protocol, url, timeout):
         format_map = {"abs_url": url,
                       "url": strip_server(url),
                       "window_id": self.window_id,
                       "timeout_multiplier": self.timeout_multiplier,
                       "timeout": timeout * 1000}
 
-        parent = webdriver.current_window_handle
-        handles = [item for item in webdriver.window_handles if item != parent]
-        for handle in handles:
-            try:
-                webdriver.switch_to_window(handle)
-                webdriver.close()
-            except exceptions.NoSuchWindowException:
-                pass
-        webdriver.switch_to_window(parent)
+        parent_window = protocol.testharness.close_old_windows()
+        # Now start the test harness
+        protocol.base.execute_script(self.script % format_map)
+        test_window = protocol.testharness.get_test_window(webdriver, parent_window)
 
-        webdriver.execute_script(self.script % format_map)
-        try:
-            # Try this, it's in Level 1 but nothing supports it yet
-            win_s = webdriver.execute_script("return window['%s'];" % self.window_id)
-            win_obj = json.loads(win_s)
-            test_window = win_obj["window-fcc6-11e5-b4f8-330a88ab9d7f"]
-        except Exception:
-            after = webdriver.window_handles
-            if len(after) == 2:
-                test_window = next(iter(set(after) - set([parent])))
-            elif after[0] == parent and len(after) > 2:
-                # Hope the first one here is the test window
-                test_window = after[1]
-            else:
-                raise Exception("unable to find test window")
-        assert test_window != parent
-
-        handler = CallbackHandler(webdriver, test_window, self.logger)
+        handler = CallbackHandler(self.logger, protocol, test_window)
         while True:
-            result = webdriver.execute_async_script(
-                self.script_resume % format_map)
+            result = protocol.base.execute_script(
+                self.script_resume % format_map, async=True)
             done, rv = handler(result)
             if done:
                 break
         return rv
 
 
-class CallbackHandler(object):
-    def __init__(self, webdriver, test_window, logger):
-        self.webdriver = webdriver
-        self.test_window = test_window
-        self.logger = logger
-
-    def __call__(self, result):
-        self.logger.debug("Got async callback: %s" % result[1])
-        try:
-            attr = getattr(self, "process_%s" % result[1])
-        except AttributeError:
-            raise ValueError("Unknown callback type %r" % result[1])
-        else:
-            return attr(result)
-
-    def process_complete(self, result):
-        rv = [result[0]] + result[2]
-        return True, rv
-
-    def process_action(self, result):
-        parent = self.webdriver.current_window_handle
-        try:
-            self.webdriver.switch_to.window(self.test_window)
-            action = result[2]["action"]
-            self.logger.debug("Got action: %s" % action)
-            if action == "click":
-                selector = result[2]["selector"]
-                elements = self.webdriver.find_elements_by_css_selector(selector)
-                if len(elements) == 0:
-                    raise ValueError("Selector matches no elements")
-                elif len(elements) > 1:
-                    raise ValueError("Selector matches multiple elements")
-                self.logger.debug("Clicking element: %s" % selector)
-                try:
-                    elements[0].click()
-                except (exceptions.ElementNotInteractableException,
-                        exceptions.ElementNotVisibleException) as e:
-                    self._send_message("complete",
-                                       "failure",
-                                       e)
-                    self.logger.debug("Clicking element failed: %s" % str(e))
-                else:
-                    self._send_message("complete",
-                                       "success")
-                    self.logger.debug("Clicking element succeeded")
-        finally:
-            self.webdriver.switch_to.window(parent)
-
-        return False, None
-
-    def _send_message(self, message_type, status, message=None):
-        obj = {
-            "type": "testdriver-%s" % str(message_type),
-            "status": str(status)
-        }
-        if message:
-            obj["message"] = str(message)
-        self.webdriver.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
-
-
-
 class SeleniumRefTestExecutor(RefTestExecutor):
     def __init__(self, browser, server_config, timeout_multiplier=1,
                  screenshot_cache=None, close_after_done=True,
@@ -342,11 +341,12 @@ class SeleniumRefTestExecutor(RefTestExecutor):
         assert dpi is None
 
         return SeleniumRun(self._screenshot,
-                           self.protocol.webdriver,
+                           self.protocol,
                            self.test_url(test),
                            test.timeout).run()
 
-    def _screenshot(self, webdriver, url, timeout):
+    def _screenshot(self, protocol, url, timeout):
+        webdriver = protocol.webdriver
         webdriver.get(url)
 
         webdriver.execute_async_script(self.wait_script)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
index e66d34170a1..fb79cf24d93 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
@@ -16,11 +16,12 @@ from mozprocess import ProcessHandler
 from serve.serve import make_hosts_file
 
 from .base import (ExecutorException,
-                   Protocol,
+                   ConnectionlessProtocol,
                    RefTestImplementation,
                    testharness_result_converter,
                    reftest_result_converter,
-                   WdspecExecutor, WebDriverProtocol)
+                   WdspecExecutor,
+                   WebDriverProtocol)
 from .process import ProcessTestExecutor
 from ..browsers.base import browser_command
 from ..wpttest import WdspecResult, WdspecSubtestResult
@@ -50,7 +51,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
         self.pause_after_test = pause_after_test
         self.result_data = None
         self.result_flag = None
-        self.protocol = Protocol(self, browser)
+        self.protocol = ConnectionlessProtocol(self, browser)
         self.hosts_path = write_hosts_file(server_config)
 
     def teardown(self):
@@ -181,7 +182,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
                                      timeout_multiplier=timeout_multiplier,
                                      debug_info=debug_info)
 
-        self.protocol = Protocol(self, browser)
+        self.protocol = ConnectionlessProtocol(self, browser)
         self.screenshot_cache = screenshot_cache
         self.implementation = RefTestImplementation(self)
         self.tempdir = tempfile.mkdtemp()
@@ -284,5 +285,6 @@ class ServoRefTestExecutor(ProcessTestExecutor):
 class ServoDriverProtocol(WebDriverProtocol):
     server_cls = ServoDriverServer
 
+
 class ServoWdspecExecutor(WdspecExecutor):
     protocol_cls = ServoDriverProtocol
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
index ed7afaf1028..8f2964a7d3a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
@@ -33,28 +33,15 @@ class ServoWebDriverProtocol(Protocol):
         self.port = browser.webdriver_port
         self.session = None
 
-    def setup(self, runner):
+    def connect(self):
         """Connect to browser via WebDriver."""
-        self.runner = runner
-
         url = "http://%s:%d" % (self.host, self.port)
-        session_started = False
-        try:
-            self.session = webdriver.Session(self.host, self.port,
-                extension=webdriver.servo.ServoCommandExtensions)
-            self.session.start()
-        except Exception:
-            self.logger.warning(
-                "Connecting with WebDriver failed:\n%s" % traceback.format_exc())
-        else:
-            self.logger.debug("session started")
-            session_started = True
+        self.session = webdriver.Session(self.host, self.port,
+                                         extension=webdriver.servo.ServoCommandExtensions)
+        self.session.start()
 
-        if not session_started:
-            self.logger.warning("Failed to connect via WebDriver")
-            self.executor.runner.send_message("init_failed")
-        else:
-            self.executor.runner.send_message("init_succeeded")
+    def after_connect(self):
+        pass
 
     def teardown(self):
         self.logger.debug("Hanging up on WebDriver session")
@@ -72,9 +59,6 @@ class ServoWebDriverProtocol(Protocol):
             return False
         return True
 
-    def after_connect(self):
-        pass
-
     def wait(self):
         while True:
             try:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
new file mode 100644
index 00000000000..dc69d24f523
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -0,0 +1,278 @@
+import traceback
+from abc import ABCMeta, abstractmethod
+
+
+class Protocol(object):
+    """Backend for a specific browser-control protocol.
+
+    Each Protocol is composed of a set of ProtocolParts that implement
+    the APIs required for specific interactions. This reflects the fact
+    that not all implementaions will support exactly the same feature set.
+    Each ProtocolPart is exposed directly on the protocol through an accessor
+    attribute with a name given by its `name` property.
+
+    :param Executor executor: The Executor instance that's using this Protocol
+    :param Browser browser: The Browser using this protocol"""
+    __metaclass__ = ABCMeta
+
+    implements = []
+
+    def __init__(self, executor, browser):
+        self.executor = executor
+        self.browser = browser
+
+        for cls in self.implements:
+            name = cls.name
+            assert not hasattr(self, name)
+            setattr(self, name, cls(self))
+
+    @property
+    def logger(self):
+        """:returns: Current logger"""
+        return self.executor.logger
+
+    @property
+    def is_alive(self):
+        """Is the browser connection still active
+
+        :returns: A boolean indicating whether the connection is still active."""
+        return True
+
+    def setup(self, runner):
+        """Handle protocol setup, and send a message to the runner to indicate
+        success or failure."""
+        msg = None
+        try:
+            msg = "Failed to start protocol connection"
+            self.connect()
+
+            msg = None
+
+            for cls in self.implements:
+                getattr(self, cls.name).setup()
+
+            msg = "Post-connection steps failed"
+            self.after_connect()
+        except Exception:
+            if msg is not None:
+                self.logger.warning(msg)
+            self.logger.error(traceback.format_exc())
+            self.executor.runner.send_message("init_failed")
+            return
+        else:
+            self.executor.runner.send_message("init_succeeded")
+
+    @abstractmethod
+    def connect(self):
+        """Make a connection to the remote browser"""
+        pass
+
+    @abstractmethod
+    def after_connect(self):
+        """Run any post-connection steps. This happens after the ProtocolParts are
+        initalized so can depend on a fully-populated object."""
+        pass
+
+    def teardown(self):
+        """Run cleanup steps after the tests are finished."""
+        for cls in self.implements:
+            getattr(self, cls.name).teardown()
+
+
+class ProtocolPart(object):
+    """Base class  for all ProtocolParts.
+
+    :param Protocol parent: The parent protocol"""
+    __metaclass__ = ABCMeta
+
+    name = None
+
+    def __init__(self, parent):
+        self.parent = parent
+
+    @property
+    def logger(self):
+        """:returns: Current logger"""
+        return self.parent.logger
+
+    def setup(self):
+        """Run any setup steps required for the ProtocolPart."""
+        pass
+
+    def teardown(self):
+        """Run any teardown steps required for the ProtocolPart."""
+        pass
+
+
+class BaseProtocolPart(ProtocolPart):
+    """Generic bits of protocol that are required for multiple test types"""
+    __metaclass__ = ABCMeta
+
+    name = "base"
+
+    @abstractmethod
+    def execute_script(self, script, async=False):
+        """Execute javascript in the current Window.
+
+        :param str script: The js source to execute. This is implicitly wrapped in a function.
+        :param bool async: Whether the script is asynchronous in the webdriver
+                           sense i.e. whether the return value is the result of
+                           the initial function call or if it waits for some callback.
+        :returns: The result of the script execution.
+        """
+        pass
+
+    @abstractmethod
+    def set_timeout(self, timeout):
+        """Set the timeout for script execution.
+
+        :param timeout: Script timeout in seconds"""
+        pass
+
+    @abstractmethod
+    def wait(self):
+        """Wait indefinitely for the browser to close"""
+        pass
+
+    @property
+    def current_window(self):
+        """Return a handle identifying the current top level browsing context
+
+        :returns: A protocol-specific handle"""
+        pass
+
+    @abstractmethod
+    def set_window(self, handle):
+        """Set the top level browsing context to one specified by a given handle.
+
+        :param handle: A protocol-specific handle identifying a top level browsing
+                       context."""
+        pass
+
+
+class TestharnessProtocolPart(ProtocolPart):
+    """Protocol part required to run testharness tests."""
+    __metaclass__ = ABCMeta
+
+    name = "testharness"
+
+    @abstractmethod
+    def load_runner(self, url_protocol):
+        """Load the initial page used to control the tests.
+
+        :param str url_protocol: "https" or "http" depending on the test metadata.
+        """
+        pass
+
+    @abstractmethod
+    def close_old_windows(self, url_protocol):
+        """Close existing windows except for the initial runner window.
+        After calling this method there must be exactly one open window that
+        contains the initial runner page.
+
+        :param str url_protocol: "https" or "http" depending on the test metadata.
+        """
+        pass
+
+    @abstractmethod
+    def get_test_window(self, window_id, parent):
+        """Get the window handle dorresponding to the window containing the
+        currently active test.
+
+        :param window_id: A string containing the DOM name of the Window that
+        contains the test, or None.
+        :param parent: The handle of the runner window.
+        :returns: A protocol-specific window handle.
+        """
+        pass
+
+
+class PrefsProtocolPart(ProtocolPart):
+    """Protocol part that allows getting and setting browser prefs."""
+    __metaclass__ = ABCMeta
+
+    name = "prefs"
+
+    @abstractmethod
+    def set(self, name, value):
+        """Set the named pref to value.
+
+        :param name: A pref name of browser-specific type
+        :param value: A pref value of browser-specific type"""
+        pass
+
+    @abstractmethod
+    def get(self, name):
+        """Get the current value of a named pref
+
+        :param name: A pref name of browser-specific type
+        :returns: A pref value of browser-specific type"""
+        pass
+
+    @abstractmethod
+    def clear(self, name):
+        """Reset the value of a named pref back to the default.
+
+        :param name: A pref name of browser-specific type"""
+        pass
+
+
+class StorageProtocolPart(ProtocolPart):
+    """Protocol part for manipulating browser storage."""
+    __metaclass__ = ABCMeta
+
+    name = "storage"
+
+    @abstractmethod
+    def clear_origin(self, url):
+        """Clear all the storage for a specified origin.
+
+        :param url: A url belonging to the origin"""
+        pass
+
+
+class SelectorProtocolPart(ProtocolPart):
+    """Protocol part for selecting elements on the page."""
+    __metaclass__ = ABCMeta
+
+    name = "select"
+
+    @abstractmethod
+    def elements_by_selector(self, selector):
+        """Select elements matching a CSS selector
+
+        :param str selector: The CSS selector
+        :returns: A list of protocol-specific handles to elements"""
+        pass
+
+
+class ClickProtocolPart(ProtocolPart):
+    """Protocol part for performing trusted clicks"""
+    __metaclass__ = ABCMeta
+
+    name = "click"
+
+    @abstractmethod
+    def element(self, element):
+        """Perform a trusted click somewhere on a specific element.
+
+        :param element: A protocol-specific handle to an element."""
+        pass
+
+
+class TestDriverProtocolPart(ProtocolPart):
+    """Protocol part that implements the basic functionality required for
+    all testdriver-based tests."""
+    __metaclass__ = ABCMeta
+
+    name = "testdriver"
+
+    @abstractmethod
+    def send_message(self, message_type, status, message=None):
+        """Send a testdriver message to the browser.
+
+        :param str message_type: The kind of the message.
+        :param str status: Either "failure" or "success" depending on whether the
+                           previous command succeeded.
+        :param str message: Additional data to add to the message."""
+        pass
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js
index e2b70a0ad8f..d1899ea6947 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js
@@ -1,31 +1,24 @@
 window.wrappedJSObject.timeout_multiplier = %(timeout_multiplier)d;
 window.wrappedJSObject.explicit_timeout = %(explicit_timeout)d;
 
-window.wrappedJSObject.addEventListener("message", function listener(event) {
-    if (event.data.type != "complete") {
-        return;
-    }
-    window.wrappedJSObject.removeEventListener("message", listener);
-    clearTimeout(timer);
-    var tests = event.data.tests;
-    var status = event.data.status;
+window.wrappedJSObject.message_queue = [];
 
-    var subtest_results = tests.map(function (x) {
-        return [x.name, x.status, x.message, x.stack]
-    });
+window.wrappedJSObject.setMessageListener = function(func) {
+  window.wrappedJSObject.current_listener = func;
+  window.wrappedJSObject.addEventListener(
+    "message",
+    func,
+    false
+  );
+};
 
-    marionetteScriptFinished(["%(url)s",
-                              status.status,
-                              status.message,
-                              status.stack,
-                              subtest_results]);
-}, false);
+window.wrappedJSObject.setMessageListener(function(event) {
+  window.wrappedJSObject.message_queue.push(event);
+});
 
-window.wrappedJSObject.win = window.open("%(abs_url)s", "%(window_id)s");
+window.wrappedJSObject.win = window.wrappedJSObject.open("%(abs_url)s", "%(window_id)s");
 
-var timer = null;
-if (%(timeout)s) {
-    timer = setTimeout(function() {
-        window.wrappedJSObject.win.timeout();
-    }, %(timeout)s);
-}
+window.wrappedJSObject.timer = setTimeout(function() {
+  window.wrappedJSObject.win.timeout();
+  window.wrappedJSObject.win.close();
+}, %(timeout)s);
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js
new file mode 100644
index 00000000000..749d19d0fc5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js
@@ -0,0 +1,46 @@
+var callback = arguments[arguments.length - 1];
+
+function process_event(event) {
+  var data = event.data;
+
+  var payload = undefined;
+
+  switch(data.type) {
+  case "complete":
+    var tests = event.data.tests;
+    var status = event.data.status;
+
+    var subtest_results = tests.map(function(x) {
+      return [x.name, x.status, x.message, x.stack];
+    });
+    payload = [status.status,
+               status.message,
+               status.stack,
+               subtest_results];
+    clearTimeout(window.wrappedJSObject.timer);
+    break;
+
+  case "action":
+    window.wrappedJSObject.setMessageListener(function(event) {
+      window.wrappedJSObject.message_queue.push(event);
+    });
+    payload = data;
+    break;
+  default:
+    return;
+  }
+
+  callback(["%(url)s", data.type, payload]);
+}
+
+window.wrappedJSObject.removeEventListener("message", window.wrappedJSObject.current_listener);
+if (window.wrappedJSObject.message_queue.length) {
+  var next = window.wrappedJSObject.message_queue.shift();
+  process_event(next);
+} else {
+  window.wrappedJSObject.addEventListener(
+    "message", function f(event) {
+      window.wrappedJSObject.removeEventListener("message", f);
+      process_event(event);
+    }, false);
+}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
index 7229777b32e..7a2df98ed4e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
@@ -26,6 +26,8 @@ function process_event(event) {
     });
     payload = data;
     break;
+  default:
+    return;
   }
 
   callback(["%(url)s", data.type, payload]);
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index 16623f76867..1d2d768bfa7 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -108,7 +108,7 @@ class TestRunner(object):
             raise
 
     def wait(self):
-        self.executor.protocol.wait()
+        self.executor.wait()
         self.send_message("wait_finished")
 
     def send_message(self, command, *args):
@@ -304,6 +304,7 @@ class TestRunnerManager(threading.Thread):
         # This is started in the actual new thread
         self.logger = None
 
+        self.test_count = 0
         self.unexpected_count = 0
 
         # This may not really be what we want
@@ -569,6 +570,7 @@ class TestRunnerManager(threading.Thread):
             if self.browser.check_for_crashes():
                 status = "CRASH"
 
+        self.test_count += 1
         is_unexpected = expected != status
         if is_unexpected:
             self.unexpected_count += 1
@@ -789,5 +791,8 @@ class ManagerGroup(object):
         self.stop_flag.set()
         self.logger.debug("Stop flag set in ManagerGroup")
 
+    def test_count(self):
+        return sum(item.test_count for item in self.pool)
+
     def unexpected_count(self):
         return sum(item.unexpected_count for item in self.pool)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
index 7eef2c69013..6c7310b5282 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
@@ -60,4 +60,4 @@ def test_server_start_config(product):
             config = args[0][0]
             if "host" in env_options:
                 assert config["host"] == env_options["host"]
-            assert isinstance(config["bind_hostname"], bool)
+            assert isinstance(config["bind_address"], bool)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index d3d9d074254..951eea3faf7 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -173,6 +173,7 @@ def run_tests(config, test_paths, product, **kwargs):
 
         logger.info("Using %i client processes" % kwargs["processes"])
 
+        test_total = 0
         unexpected_total = 0
 
         kwargs["pause_after_test"] = get_pause_after_test(test_loader, **kwargs)
@@ -200,6 +201,7 @@ def run_tests(config, test_paths, product, **kwargs):
                 elif repeat > 1:
                     logger.info("Repetition %i / %i" % (repeat_count, repeat))
 
+                test_count = 0
                 unexpected_count = 0
                 logger.suite_start(test_loader.test_ids, name='web-platform-test', run_info=run_info)
                 for test_type in kwargs["test_types"]:
@@ -267,13 +269,20 @@ def run_tests(config, test_paths, product, **kwargs):
                             logger.critical("Main thread got signal")
                             manager_group.stop()
                             raise
+                    test_count += manager_group.test_count()
                     unexpected_count += manager_group.unexpected_count()
 
+                test_total += test_count
                 unexpected_total += unexpected_count
                 logger.info("Got %i unexpected results" % unexpected_count)
                 if repeat_until_unexpected and unexpected_total > 0:
                     break
                 logger.suite_end()
+
+    if test_total == 0:
+        logger.error("No tests ran")
+        return False
+
     return unexpected_total == 0
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst b/tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst
index 821c2d34455..49846f21061 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst
+++ b/tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst
@@ -3,7 +3,7 @@ Stash
 
 Object for storing cross-request state. This is unusual in that keys
 must be UUIDs, in order to prevent different clients setting the same
-key, and values are write-once, read-once to minimise the chances of
+key, and values are write-once, read-once to minimize the chances of
 state persisting indefinitely. The stash defines two operations;
 `put`, to add state and `take` to remove state. Furthermore, the view
 of the stash is path-specific; by default a request will only see the
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 f9ed238624b..86dc5a61bc2 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -111,7 +111,7 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
     daemon_threads = True
 
     def __init__(self, server_address, request_handler_cls,
-                 router, rewriter, bind_hostname,
+                 router, rewriter, bind_address,
                  config=None, use_ssl=False, key_file=None, certificate=None,
                  encrypt_after_connect=False, latency=None, **kwargs):
         """Server for HTTP(s) Requests
@@ -141,10 +141,10 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
                                       This enables the server to act as a
                                       self-proxy.
 
-        :param bind_hostname True to bind the server to both the hostname and
-                             port specified in the server_address parameter.
-                             False to bind the server only to the port in the
-                             server_address parameter, but not to the hostname.
+        :param bind_address True to bind the server to both the IP address and
+                            port specified in the server_address parameter.
+                            False to bind the server only to the port in the
+                            server_address parameter, but not to the address.
         :param latency: Delay in ms to wait before seving each response, or
                         callable that returns a delay in ms
         """
@@ -156,7 +156,7 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
 
         self.latency = latency
 
-        if bind_hostname:
+        if bind_address:
             hostname_port = server_address
         else:
             hostname_port = ("",server_address[1])
@@ -343,7 +343,7 @@ class WebTestHttpd(object):
     :param rewrites: List of rewrites with which to initialize the rewriter_cls
     :param config: Dictionary holding environment configuration settings for
                    handlers to read, or None to use the default values.
-    :param bind_hostname: Boolean indicating whether to bind server to hostname.
+    :param bind_address: Boolean indicating whether to bind server to IP address.
     :param latency: Delay in ms to wait before seving each response, or
                     callable that returns a delay in ms
 
@@ -381,7 +381,7 @@ class WebTestHttpd(object):
                  server_cls=None, handler_cls=WebTestRequestHandler,
                  use_ssl=False, key_file=None, certificate=None, encrypt_after_connect=False,
                  router_cls=Router, doc_root=os.curdir, routes=None,
-                 rewriter_cls=RequestRewriter, bind_hostname=True, rewrites=None,
+                 rewriter_cls=RequestRewriter, bind_address=True, rewrites=None,
                  latency=None, config=None):
 
         if routes is None:
@@ -409,7 +409,7 @@ class WebTestHttpd(object):
                                     self.router,
                                     self.rewriter,
                                     config=config,
-                                    bind_hostname=bind_hostname,
+                                    bind_address=bind_address,
                                     use_ssl=use_ssl,
                                     key_file=key_file,
                                     certificate=certificate,
diff --git a/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html b/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html
index dc355a9ab99..6c06f5e9d52 100644
--- a/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html
+++ b/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html
@@ -24,8 +24,8 @@ for (var i in timingAttributes) {
 
 function emit_test2(attrName) {
     test(function() {
-        assert_throws("SyntaxError", function() { window.performance.measure(attrName); });
-    }, "performance.measure should throw if used with timing attribute " + attrName);
+        window.performance.measure(attrName);
+    }, "performance.measure should not throw if used with timing attribute " + attrName);
 }
 for (var i in timingAttributes) {
   emit_test2(timingAttributes[i]);
diff --git a/tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html b/tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html
index 77c1e48e3f9..1633221198c 100644
--- a/tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html
+++ b/tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html
@@ -59,7 +59,7 @@ test(function () {
                               "attribute with a value of 0, throws a InvalidAccessError exception.");
     </script>
     </head>
-    <body onload="onload_test();">
+    <body>
         <h1>Description</h1>
         <p><code>window.performance.measure()</code> method throws a InvalidAccessError
            whenever a navigation timing attribute with a value of zero is provided as the startMark or endMark.
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html b/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html
index c2e9702cb73..142d49d265c 100644
--- a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html
@@ -20,13 +20,13 @@ test(t => {
                   iterations: 10,
                   iterationComposite: 'accumulate' });
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).alignContent, 'flex-end',
     'Animated align-content style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).alignContent, 'flex-start',
     'Animated align-content style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).alignContent, 'flex-end',
     'Animated align-content style at 50s of the third iteration');
 }, 'iteration composition of discrete type animation (align-content)');
@@ -41,13 +41,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '5px',
     'Animated margin-left style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).marginLeft, '20px',
     'Animated margin-left style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '25px',
     'Animated margin-left style at 50s of the third iteration');
 }, 'iteration composition of <length> type animation');
@@ -66,13 +66,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width, '25px',
     'Animated width style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).width, '100px',
     'Animated width style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width, '125px',
     'Animated width style at 50s of the third iteration');
 }, 'iteration composition of <percentage> type animation');
@@ -87,13 +87,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).color, 'rgb(60, 60, 60)',
     'Animated color style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).color, 'rgb(240, 240, 240)',
     'Animated color style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).color, 'rgb(255, 255, 255)',
     'Animated color style at 50s of the third iteration');
 }, 'iteration composition of <color> type animation');
@@ -108,13 +108,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).color, 'rgb(30, 90, 30)',
     'Animated color style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).color, 'rgb(120, 240, 120)',
     'Animated color style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   // The green color is (240 + 180) / 2 = 210
   assert_equals(getComputedStyle(div).color, 'rgb(150, 210, 150)',
     'Animated color style at 50s of the third iteration');
@@ -131,13 +131,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).flexGrow, '5',
     'Animated flex-grow style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).flexGrow, '20',
     'Animated flex-grow style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).flexGrow, '25',
     'Animated flex-grow style at 50s of the third iteration');
 }, 'iteration composition of <number> type animation');
@@ -154,13 +154,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).clip, 'rect(5px, 5px, 5px, 5px)',
     'Animated clip style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).clip, 'rect(20px, 20px, 20px, 20px)',
     'Animated clip style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).clip, 'rect(25px, 25px, 25px, 25px)',
     'Animated clip style at 50s of the third iteration');
 }, 'iteration composition of <shape> type animation');
@@ -175,13 +175,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width, '5px',
     'Animated calc width style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).width, '20px',
     'Animated calc width style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width, '25px',
     'Animated calc width style at 50s of the third iteration');
 }, 'iteration composition of <calc()> value animation');
@@ -200,15 +200,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width, '10px',
     // 100px * 5% + 5px
     'Animated calc width style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).width,
     '40px', // 100px * (10% + 10%) + (10px + 10px)
     'Animated calc width style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).width,
     '50px', // (40px + 60px) / 2
     'Animated calc width style at 50s of the third iteration');
@@ -225,13 +225,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).opacity, '0.2',
     'Animated opacity style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).opacity, '0.8',
     'Animated opacity style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).opacity, '1', // (0.8 + 1.2) * 0.5
     'Animated opacity style at 50s of the third iteration');
 }, 'iteration composition of opacity animation');
@@ -247,15 +247,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).boxShadow,
     'rgb(60, 60, 60) 5px 5px 5px 0px',
     'Animated box-shadow style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).boxShadow,
     'rgb(240, 240, 240) 20px 20px 20px 0px',
     'Animated box-shadow style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).boxShadow,
     'rgb(255, 255, 255) 25px 25px 25px 0px',
     'Animated box-shadow style at 50s of the third iteration');
@@ -271,13 +271,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter, 'blur(5px)',
     'Animated filter blur style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter, 'blur(20px)',
     'Animated filter blur style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter, 'blur(25px)',
     'Animated filter blur style at 50s of the third iteration');
 }, 'iteration composition of filter blur animation');
@@ -293,15 +293,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(1.4)',
     'Animated filter brightness style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(2.6)', // brightness(1) + brightness(0.8) + brightness(0.8)
     'Animated filter brightness style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(3)', // (brightness(2.6) + brightness(3.4)) * 0.5
     'Animated filter brightness style at 50s of the third iteration');
@@ -318,15 +318,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(0.5)',
     'Animated filter brightness style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(0)', // brightness(1) is an identity element, not accumulated.
     'Animated filter brightness style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(0.5)', // brightness(1) is an identity element, not accumulated.
     'Animated filter brightness style at 50s of the third iteration');
@@ -343,15 +343,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'drop-shadow(rgb(60, 60, 60) 5px 5px 5px)',
     'Animated filter drop-shadow style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     'drop-shadow(rgb(240, 240, 240) 20px 20px 20px)',
     'Animated filter drop-shadow style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'drop-shadow(rgb(255, 255, 255) 25px 25px 25px)',
     'Animated filter drop-shadow style at 50s of the third iteration');
@@ -368,15 +368,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(1.5) contrast(1.5)',
     'Animated filter list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(3) contrast(3)',
     'Animated filter list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'brightness(3.5) contrast(3.5)',
     'Animated filter list at 50s of the third iteration');
@@ -393,18 +393,18 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'contrast(2) brightness(2)', // discrete
     'Animated filter list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     // We can't accumulate 'contrast(2) brightness(2)' onto
     // the first list 'brightness(1) contrast(1)' because of
     // mismatch of the order.
     'brightness(1) contrast(1)',
     'Animated filter list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     // We *can* accumulate 'contrast(2) brightness(2)' onto
     // the same list 'contrast(2) brightness(2)' here.
@@ -424,15 +424,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'sepia(0.5) contrast(1.5)',
     'Animated filter list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).filter,
     'sepia(2) contrast(3)',
     'Animated filter list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).filter,
     'sepia(2.5) contrast(3.5)',
     'Animated filter list at 50s of the third iteration');
@@ -448,15 +448,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0, 1, -1, 0, 0, 0)', // rotate(90deg)
     'Animated transform(rotate) style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(1, 0, 0, 1, 0, 0)', // rotate(360deg)
     'Animated transform(rotate) style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0, 1, -1, 0, 0, 0)', // rotate(450deg)
     'Animated transform(rotate) style at 50s of the third iteration');
@@ -472,16 +472,16 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0.5, 0, 0, 0.5, 0, 0)', // scale(0.5)
     'Animated transform(scale) style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0, 0, 0, 0, 0, 0)', // scale(0); scale(1) is an identity element,
                                 // not accumulated.
     'Animated transform(scale) style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0.5, 0, 0, 0.5, 0, 0)', // scale(0.5); scale(1) an identity
                                     // element, not accumulated.
@@ -498,15 +498,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(1.5, 0, 0, 1.5, 0, 0)', // scale(1.5)
     'Animated transform(scale) style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(3, 0, 0, 3, 0, 0)', // scale(1 + (2 -1) + (2 -1))
     'Animated transform(scale) style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(3.5, 0, 0, 3.5, 0, 0)', // (scale(3) + scale(4)) * 0.5
     'Animated transform(scale) style at 50s of the third iteration');
@@ -522,15 +522,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(1, 0, 0, 1, 0, 0)', // scale(1)
     'Animated transform(scale) style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(2, 0, 0, 2, 0, 0)', // (scale(0) + scale(2-1)*2)
     'Animated transform(scale) style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(3, 0, 0, 3, 0, 0)', // (scale(2) + scale(4)) * 0.5
     'Animated transform(scale) style at 50s of the third iteration');
@@ -547,15 +547,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0, 1, -1, 0, 0, 5)', // rotate(90deg) translateX(5px)
     'Animated transform list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(1, 0, 0, 1, 20, 0)', // rotate(360deg) translateX(20px)
     'Animated transform list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(0, 1, -1, 0, 0, 25)', // rotate(450deg) translateX(25px)
     'Animated transform list at 50s of the third iteration');
@@ -572,16 +572,16 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(2.5, 0, 0, 2.5, 15, 0)',
     'Animated transform of matrix function at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // scale(2) + (scale(3-1)*2) + translateX(30px)*2
     'matrix(6, 0, 0, 6, 60, 0)',
     'Animated transform of matrix function at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // from: matrix(6, 0, 0, 6, 60, 0)
     // to:   matrix(7, 0, 0, 7, 90, 0)
@@ -601,20 +601,20 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // Interpolate between matrix(2, 0, 0, 2,  0, 0) = translateX(0px) scale(2)
     //                 and matrix(3, 0, 0, 3, 30, 0) = scale(3) translateX(10px)
     'matrix(2.5, 0, 0, 2.5, 15, 0)',
     'Animated transform list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // 'from' and 'to' value are mismatched, so accumulate
     // matrix(2, 0, 0, 2, 0, 0) onto matrix(3, 0, 0, 3, 30, 0) * 2
     //  = scale(2) + (scale(3-1)*2) + translateX(30px)*2
     'matrix(6, 0, 0, 6, 60, 0)',
     'Animated transform list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // Interpolate between matrix(6, 0, 0, 6, 60, 0)
     //                 and matrix(7, 0, 0, 7, 210, 0) = scale(7) translate(30px)
@@ -636,20 +636,20 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // Interpolate between matrix(1, 0, 0, 1,  0, 0) = translateX(0px)
     //                 and matrix(2, 0, 0, 2, 20, 0) = scale(2) translateX(10px)
     'matrix(1.5, 0, 0, 1.5, 10, 0)',
     'Animated transform list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // 'from' and 'to' value are mismatched, so accumulate
     // matrix(1, 0, 0, 1, 0, 0) onto matrix(2, 0, 0, 2, 20, 0) * 2
     //  = scale(1) + (scale(2-1)*2) + translateX(20px)*2
     'matrix(3, 0, 0, 3, 40, 0)',
     'Animated transform list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // Interpolate between matrix(3, 0, 0, 3, 40, 0)
     //                 and matrix(4, 0, 0, 4, 120, 0) =
@@ -670,17 +670,17 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // translateX(none) -> translateX(10px) @ 50%
     'matrix(1, 0, 0, 1, 5, 0)',
     'Animated transform list at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // translateX(10px * 2 + none) -> translateX(10px * 2 + 10px) @ 0%
     'matrix(1, 0, 0, 1, 20, 0)',
     'Animated transform list at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // translateX(10px * 2 + none) -> translateX(10px * 2 + 10px) @ 50%
     'matrix(1, 0, 0, 1, 25, 0)',
@@ -704,16 +704,16 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 40, 1)',
     'Animated transform of matrix3d function at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // translateZ(30px) + (translateZ(50px)*2)
     'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 130, 1)',
     'Animated transform of matrix3d function at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     // from: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 130, 1)
     // to:   matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 150, 1)
@@ -736,11 +736,11 @@ test(t => {
   assert_matrix_equals(getComputedStyle(div).transform,
     'matrix(1, 0, 0, 1, 0, 0)', // Actually not rotated at all.
     'Animated transform of rotate3d function at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     rotate3dToMatrix3d(1, 1, 0, Math.PI), // 180deg
     'Animated transform of rotate3d function at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_matrix_equals(getComputedStyle(div).transform,
     rotate3dToMatrix3d(1, 1, 0, 225 * Math.PI / 180), //((270 + 180) * 0.5)deg
     'Animated transform of rotate3d function at 50s of the third iteration');
@@ -756,13 +756,13 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '15px',
     'Animated margin-left style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).marginLeft, '50px', // 10px + 20px + 20px
     'Animated margin-left style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '55px', // (50px + 60px) * 0.5
     'Animated margin-left style at 50s of the third iteration');
 }, 'iteration composition starts with non-zero value animation');
@@ -777,15 +777,15 @@ test(t => {
                   iterationComposite: 'accumulate' });
   anim.pause();
 
-  anim.currentTime = anim.effect.timing.duration / 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft,
     '0px',
     'Animated margin-left style at 50s of the first iteration');
-  anim.currentTime = anim.effect.timing.duration * 2;
+  anim.currentTime = anim.effect.getComputedTiming().duration * 2;
   assert_equals(getComputedStyle(div).marginLeft,
     '-10px', // 10px + -10px + -10px
     'Animated margin-left style at 0s of the third iteration');
-  anim.currentTime += anim.effect.timing.duration / 2;
+  anim.currentTime += anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft,
     '-20px', // (-10px + -30px) * 0.5
     'Animated margin-left style at 50s of the third iteration');
@@ -801,17 +801,22 @@ test(t => {
   anim.pause();
 
   anim.currentTime =
-    anim.effect.timing.duration * 2 + anim.effect.timing.duration / 2;
+    anim.effect.getComputedTiming().duration * 2 +
+    anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '25px',
     'Animated style at 50s of the third iteration');
 
   // double its duration.
-  anim.effect.timing.duration = anim.effect.timing.duration * 2;
+  anim.effect.updateTiming({
+    duration: anim.effect.getComputedTiming().duration * 2
+  });
   assert_equals(getComputedStyle(div).marginLeft, '12.5px',
     'Animated style at 25s of the first iteration');
 
   // half of original.
-  anim.effect.timing.duration = anim.effect.timing.duration / 4;
+  anim.effect.updateTiming({
+    duration: anim.effect.getComputedTiming().duration / 4
+  });
   assert_equals(getComputedStyle(div).marginLeft, '50px',
       'Animated style at 50s of the fourth iteration');
 }, 'duration changes with an iteration composition operation of accumulate');
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
index 36c4ee148e8..c7b7b25a75c 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
@@ -8,6 +8,8 @@
 <script src="../../resources/easing-tests.js"></script>
 <script src="../../resources/keyframe-utils.js"></script>
 <script src="../../resources/keyframe-tests.js"></script>
+<script src="../../resources/timing-utils.js"></script>
+<script src="../../resources/timing-tests.js"></script>
 <body>
 <div id="log"></div>
 <iframe width="10" height="10" id="iframe"></iframe>
@@ -17,8 +19,7 @@
 // Tests on Element
 
 test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null);
+  const anim = createDiv(t).animate(null);
   assert_class_string(anim, 'Animation', 'Returned object is an Animation');
 }, 'Element.animate() creates an Animation object');
 
@@ -57,26 +58,9 @@ test(t => {
 }, 'Element.animate() creates an Animation object with a KeyframeEffect'
    + ' that is created in the relevant realm of the target element');
 
-test(t => {
-  const iframe = window.frames[0];
-  const div = createDiv(t, iframe.document);
-  const anim = div.animate(null);
-  assert_equals(Object.getPrototypeOf(anim.effect.timing),
-                iframe.AnimationEffectTiming.prototype,
-                'The prototype of the created AnimationEffectTiming is that'
-                + ' defined on the relevant global for the target element');
-  assert_not_equals(Object.getPrototypeOf(anim.effect.timing),
-                    AnimationEffectTiming.prototype,
-                    'The prototype of the created AnimationEffectTiming is NOT'
-                    + ' that of the current global');
-}, 'Element.animate() creates an Animation object with a KeyframeEffect'
-   + ' whose AnimationEffectTiming object is created in the relevant realm'
-   + ' of the target element');
-
 for (const subtest of gEmptyKeyframeListTests) {
   test(t => {
-    const div = createDiv(t);
-    const anim = div.animate(subtest, 2000);
+    const anim = createDiv(t).animate(subtest, 2000);
     assert_not_equals(anim, null);
   }, 'Element.animate() accepts empty keyframe lists ' +
      `(input: ${JSON.stringify(subtest)})`);
@@ -84,8 +68,7 @@ for (const subtest of gEmptyKeyframeListTests) {
 
 for (const subtest of gKeyframesTests) {
   test(t => {
-    const div = createDiv(t);
-    const anim = div.animate(subtest.input, 2000);
+    const anim = createDiv(t).animate(subtest.input, 2000);
     assert_frame_lists_equal(anim.effect.getKeyframes(), subtest.output);
   }, `Element.animate() accepts ${subtest.desc}`);
 }
@@ -99,54 +82,101 @@ for (const subtest of gInvalidKeyframesTests) {
   }, `Element.animate() does not accept ${subtest.desc}`);
 }
 
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  assert_equals(anim.effect.getTiming().duration, 2000);
+  assert_default_timing_except(anim.effect, ['duration']);
+}, 'Element.animate() accepts a double as an options argument');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { duration: Infinity, fill: 'forwards' });
+  assert_equals(anim.effect.getTiming().duration, Infinity);
+  assert_equals(anim.effect.getTiming().fill, 'forwards');
+  assert_default_timing_except(anim.effect, ['duration', 'fill']);
+}, 'Element.animate() accepts a KeyframeAnimationOptions argument');
+
+test(t => {
+  const anim = createDiv(t).animate(null);
+  assert_default_timing_except(anim.effect, []);
+}, 'Element.animate() accepts an absent options argument');
+
+for (const invalid of gBadDelayValues) {
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, { delay: invalid });
+    });
+  }, `Element.animate() does not accept invalid delay value: ${invalid}`);
+}
+
+test(t => {
+  const anim = createDiv(t).animate(null, { duration: 'auto' });
+  assert_equals(anim.effect.getTiming().duration, 'auto', 'set duration \'auto\'');
+  assert_equals(anim.effect.getComputedTiming().duration, 0,
+                'getComputedTiming() after set duration \'auto\'');
+}, 'Element.animate() accepts a duration of \'auto\' using a dictionary'
+   + ' object');
+
+for (const invalid of gBadDurationValues) {
+  if (typeof invalid === 'string' && !isNaN(parseFloat(invalid))) {
+    continue;
+  }
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, invalid);
+    });
+  }, 'Element.animate() does not accept invalid duration value: '
+     + (typeof invalid === 'string' ? `"${invalid}"` : invalid));
+}
+
+for (const invalid of gBadDurationValues) {
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, { duration: invalid });
+    });
+  }, 'Element.animate() does not accept invalid duration value: '
+     + (typeof invalid === 'string' ? `"${invalid}"` : invalid)
+     + ' using a dictionary object');
+}
+
 for (const invalidEasing of gInvalidEasings) {
   test(t => {
-    const div = createDiv(t);
     assert_throws(new TypeError, () => {
-      div.animate({ easing: invalidEasing }, 2000);
+      createDiv(t).animate({ easing: invalidEasing }, 2000);
     });
   }, `Element.animate() does not accept invalid easing: '${invalidEasing}'`);
 }
 
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_equals(anim.effect.timing.duration, 2000);
-  // Also check that unspecified parameters receive their default values
-  assert_equals(anim.effect.timing.fill, 'auto');
-}, 'Element.animate() accepts a double as an options argument');
+for (const invalid of gBadIterationStartValues) {
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, { iterationStart: invalid });
+    });
+  }, 'Element.animate() does not accept invalid iterationStart value: ' +
+     invalid);
+}
+
+for (const invalid of gBadIterationsValues) {
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, { iterations: invalid });
+    });
+  }, 'Element.animate() does not accept invalid iterations value: ' +
+     invalid);
+}
 
 test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { duration: Infinity, fill: 'forwards' });
-  assert_equals(anim.effect.timing.duration, Infinity);
-  assert_equals(anim.effect.timing.fill, 'forwards');
-  // Also check that unspecified parameters receive their default values
-  assert_equals(anim.effect.timing.direction, 'normal');
-}, 'Element.animate() accepts a KeyframeAnimationOptions argument');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] });
-  assert_equals(anim.effect.timing.duration, 'auto');
-}, 'Element.animate() accepts an absent options argument');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
+  const anim = createDiv(t).animate(null, 2000);
   assert_equals(anim.id, '');
 }, 'Element.animate() correctly sets the id attribute when no id is specified');
 
 test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, { id: 'test' });
+  const anim = createDiv(t).animate(null, { id: 'test' });
   assert_equals(anim.id, 'test');
 }, 'Element.animate() correctly sets the id attribute');
 
 test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
+  const anim = createDiv(t).animate(null, 2000);
   assert_equals(anim.timeline, document.timeline);
 }, 'Element.animate() correctly sets the Animation\'s timeline');
 
@@ -157,7 +187,7 @@ async_test(t => {
 
   iframe.addEventListener('load', t.step_func(() => {
     const div = createDiv(t, iframe.contentDocument);
-    const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
+    const anim = div.animate(null, 2000);
     assert_equals(anim.timeline, iframe.contentDocument.timeline);
     iframe.remove();
     t.done();
@@ -168,8 +198,7 @@ async_test(t => {
    'triggered on an element in a different document');
 
 test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
+  const anim = createDiv(t).animate(null, 2000);
   assert_equals(anim.playState, 'running');
 }, 'Element.animate() calls play on the Animation');
 
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
index d05e2aa50b9..182b5cbe533 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
@@ -75,12 +75,14 @@ test(t => {
   assert_array_equals(div.getAnimations(), [],
                       'Animation should not be returned when it is finished');
 
-  animation.effect.timing.duration += 100 * MS_PER_SEC;
+  animation.effect.updateTiming({
+    duration: animation.effect.getTiming().duration + 100 * MS_PER_SEC,
+  });
   assert_array_equals(div.getAnimations(), [animation],
                       'Animation should be returned after extending the'
                       + ' duration');
 
-  animation.effect.timing.duration = 0;
+  animation.effect.updateTiming({ duration: 0 });
   assert_array_equals(div.getAnimations(), [],
                       'Animation should not be returned after setting the'
                       + ' duration to zero');
@@ -91,13 +93,13 @@ test(t => {
   const div = createDiv(t);
   const animation = div.animate(null, 100 * MS_PER_SEC);
 
-  animation.effect.timing.endDelay = -200 * MS_PER_SEC;
+  animation.effect.updateTiming({ endDelay: -200 * MS_PER_SEC });
   assert_array_equals(div.getAnimations(), [],
                       'Animation should not be returned after setting a'
                       + ' negative end delay such that the end time is less'
                       + ' than the current time');
 
-  animation.effect.timing.endDelay = 100 * MS_PER_SEC;
+  animation.effect.updateTiming({ endDelay: 100 * MS_PER_SEC });
   assert_array_equals(div.getAnimations(), [animation],
                       'Animation should be returned after setting a positive'
                       + ' end delay such that the end time is more than the'
@@ -113,17 +115,17 @@ test(t => {
   assert_array_equals(div.getAnimations(), [],
                       'Animation should not be returned when it is finished');
 
-  animation.effect.timing.iterations = 10;
+  animation.effect.updateTiming({ iterations: 10 });
   assert_array_equals(div.getAnimations(), [animation],
                       'Animation should be returned after inreasing the'
                       + ' number of iterations');
 
-  animation.effect.timing.iterations = 0;
+  animation.effect.updateTiming({ iterations: 0 });
   assert_array_equals(div.getAnimations(), [],
                       'Animations should not be returned after setting the'
                       + ' iteration count to zero');
 
-  animation.effect.timing.iterations = Infinity;
+  animation.effect.updateTiming({ iterations: Infinity });
   assert_array_equals(div.getAnimations(), [animation],
                       'Animation should be returned after inreasing the'
                       + ' number of iterations to infinity');
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html
index be1bb5d7847..711a33905a9 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html
@@ -29,7 +29,7 @@ test(t => {
   const div = createDiv(t);
   const animation = div.animate({ marginLeft: ['100px', '200px'] },
                                 100 * MS_PER_SEC);
-  animation.effect.timing.easing = 'linear';
+  animation.effect.updateTiming({ easing: 'linear' });
   animation.cancel();
   assert_equals(getComputedStyle(div).marginLeft, '0px',
                 'margin-left style is not animated after cancelling');
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html
index c00c66ea1d4..fcbaab1e8db 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html
@@ -14,7 +14,7 @@
 const gTarget = document.getElementById('target');
 
 function createEffect() {
-  return new KeyframeEffectReadOnly(gTarget, { opacity: [0, 1] });
+  return new KeyframeEffect(gTarget, { opacity: [0, 1] });
 }
 
 function createNull() {
@@ -82,10 +82,9 @@ for (const args of gTestArguments) {
 }
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(null,
-                                            { left: ['10px', '20px'] },
-                                            { duration: 10000,
-                                              fill: 'forwards' });
+  const effect = new KeyframeEffect(null,
+                                    { left: ['10px', '20px'] },
+                                    { duration: 10000, fill: 'forwards' });
   const anim = new Animation(effect, document.timeline);
   anim.pause();
   assert_equals(effect.getComputedTiming().progress, 0.0);
@@ -100,7 +99,7 @@ async_test(t => {
 
   iframe.addEventListener('load', t.step_func(() => {
     const div = createDiv(t, iframe.contentDocument);
-    const effect = new KeyframeEffectReadOnly(div, null, 10000);
+    const effect = new KeyframeEffect(div, null, 10000);
     const anim = new Animation(effect);
     assert_equals(anim.timeline, document.timeline);
     iframe.remove();
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html
index 175fc31341b..cb8bc09c366 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html
@@ -14,7 +14,7 @@ test(t => {
   const anim = new Animation();
   assert_equals(anim.effect, null, 'initial effect is null');
 
-  const newEffect = new KeyframeEffectReadOnly(createDiv(t), null);
+  const newEffect = new KeyframeEffect(createDiv(t), null);
   anim.effect = newEffect;
   assert_equals(anim.effect, newEffect, 'new effect is set');
 }, 'effect is set correctly.');
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html
index 79700f317ec..563d4ba6dd4 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html
@@ -189,7 +189,7 @@ promise_test(t => {
   animation.currentTime = HALF_DUR;
   return animation.ready.then(() => {
     currentTimeBeforeShortening = animation.currentTime;
-    animation.effect.timing.duration = QUARTER_DUR;
+    animation.effect.updateTiming({ duration: QUARTER_DUR });
     // Below we use gotNextFrame to check that shortening of the animation
     // duration causes the finished promise to resolve, rather than it just
     // getting resolved on the next animation frame. This relies on the fact
@@ -206,7 +206,7 @@ promise_test(t => {
     assert_equals(animation.currentTime, currentTimeBeforeShortening,
                   'currentTime should be unchanged when duration shortened');
     const previousFinishedPromise = animation.finished;
-    animation.effect.timing.duration = 100 * MS_PER_SEC;
+    animation.effect.updateTiming({ duration: 100 * MS_PER_SEC });
     assert_not_equals(animation.finished, previousFinishedPromise,
                       'Finished promise should change after lengthening the ' +
                       'duration causes the animation to become active');
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
index bf7c9f39beb..20fca1361e7 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
@@ -10,11 +10,11 @@
 <script type="text/plain" id="Animation-IDL">
 enum AnimationPlayState { "idle", "pending", "running", "paused", "finished" };
 
-[Constructor (optional AnimationEffectReadOnly? effect = null,
+[Constructor (optional AnimationEffect? effect = null,
               optional AnimationTimeline? timeline)]
 interface Animation : EventTarget {
              attribute DOMString                id;
-             attribute AnimationEffectReadOnly? effect;
+             attribute AnimationEffect?         effect;
              attribute AnimationTimeline?       timeline;
              attribute double?                  startTime;
              attribute double?                  currentTime;
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
similarity index 99%
rename from tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html
rename to tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
index 9a92880a606..e0e4fc2f84f 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/getComputedTiming.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
@@ -195,7 +195,5 @@ for (const stest of gEndTimeTests) {
 
   }, `getComputedTiming().endTime for ${stest.desc}`);
 }
-
-done();
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html
new file mode 100644
index 00000000000..746f0d74f19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html
@@ -0,0 +1,475 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>AnimationEffect.updateTiming</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations-1/#dom-animationeffect-updatetiming">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="../../resources/easing-tests.js"></script>
+<script src="../../resources/timing-tests.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+// ------------------------------
+//  delay
+// ------------------------------
+
+test(t => {
+  const anim = createDiv(t).animate(null, 100);
+  anim.effect.updateTiming({ delay: 100 });
+  assert_equals(anim.effect.getTiming().delay, 100, 'set delay 100');
+  assert_equals(anim.effect.getComputedTiming().delay, 100,
+                  'getComputedTiming() after set delay 100');
+}, 'Allows setting the delay to a positive number');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 100);
+  anim.effect.updateTiming({ delay: -100 });
+  assert_equals(anim.effect.getTiming().delay, -100, 'set delay -100');
+  assert_equals(anim.effect.getComputedTiming().delay, -100,
+                'getComputedTiming() after set delay -100');
+}, 'Allows setting the delay to a negative number');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 100);
+  anim.effect.updateTiming({ delay: 100 });
+  assert_equals(anim.effect.getComputedTiming().progress, null);
+  assert_equals(anim.effect.getComputedTiming().currentIteration, null);
+}, 'Allows setting the delay of an animation in progress: positive delay that'
+   + ' causes the animation to be no longer in-effect');
+
+test(t => {
+  const anim = createDiv(t).animate(null, { fill: 'both', duration: 100 });
+  anim.effect.updateTiming({ delay: -50 });
+  assert_equals(anim.effect.getComputedTiming().progress, 0.5);
+}, 'Allows setting the delay of an animation in progress: negative delay that'
+   + ' seeks into the active interval');
+
+test(t => {
+  const anim = createDiv(t).animate(null, { fill: 'both', duration: 100 });
+  anim.effect.updateTiming({ delay: -100 });
+  assert_equals(anim.effect.getComputedTiming().progress, 1);
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 0);
+}, 'Allows setting the delay of an animation in progress: large negative delay'
+   + ' that causes the animation to be finished');
+
+for (const invalid of gBadDelayValues) {
+  test(t => {
+    const anim = createDiv(t).animate(null);
+    assert_throws({ name: 'TypeError' }, () => {
+      anim.effect.updateTiming({ delay: invalid });
+    });
+  }, `Throws when setting invalid delay value: ${invalid}`);
+}
+
+
+// ------------------------------
+//  endDelay
+// ------------------------------
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  anim.effect.updateTiming({ endDelay: 123.45 });
+  assert_time_equals_literal(anim.effect.getTiming().endDelay, 123.45,
+                             'set endDelay 123.45');
+  assert_time_equals_literal(anim.effect.getComputedTiming().endDelay, 123.45,
+                             'getComputedTiming() after set endDelay 123.45');
+}, 'Allows setting the endDelay to a positive number');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  anim.effect.updateTiming({ endDelay: -1000 });
+  assert_equals(anim.effect.getTiming().endDelay, -1000, 'set endDelay -1000');
+  assert_equals(anim.effect.getComputedTiming().endDelay, -1000,
+                'getComputedTiming() after set endDelay -1000');
+}, 'Allows setting the endDelay to a negative number');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  assert_throws({ name: 'TypeError' }, () => {
+    anim.effect.updateTiming({ endDelay: Infinity });
+  });
+}, 'Throws when setting the endDelay to infinity');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  assert_throws({ name: 'TypeError' }, () => {
+    anim.effect.updateTiming({ endDelay: -Infinity });
+  });
+}, 'Throws when setting the endDelay to negative infinity');
+
+
+// ------------------------------
+//  fill
+// ------------------------------
+
+for (const fill of ['none', 'forwards', 'backwards', 'both']) {
+  test(t => {
+    const anim = createDiv(t).animate(null, 100);
+    anim.effect.updateTiming({ fill });
+    assert_equals(anim.effect.getTiming().fill, fill, 'set fill ' + fill);
+    assert_equals(anim.effect.getComputedTiming().fill, fill,
+                  'getComputedTiming() after set fill ' + fill);
+  }, `Allows setting the fill to '${fill}'`);
+}
+
+
+// ------------------------------
+//  iterationStart
+// ------------------------------
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { iterationStart: 0.2,
+                                      iterations: 1,
+                                      fill: 'both',
+                                      duration: 100,
+                                      delay: 1 });
+  anim.effect.updateTiming({ iterationStart: 2.5 });
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
+}, 'Allows setting the iterationStart of an animation in progress:'
+   + ' backwards-filling');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { iterationStart: 0.2,
+                                      iterations: 1,
+                                      fill: 'both',
+                                      duration: 100,
+                                      delay: 0 });
+  anim.effect.updateTiming({ iterationStart: 2.5 });
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
+}, 'Allows setting the iterationStart of an animation in progress:'
+   + ' active phase');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { iterationStart: 0.2,
+                                      iterations: 1,
+                                      fill: 'both',
+                                      duration: 100,
+                                      delay: 0 });
+  anim.finish();
+  anim.effect.updateTiming({ iterationStart: 2.5 });
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 3);
+}, 'Allows setting the iterationStart of an animation in progress:'
+   + ' forwards-filling');
+
+for (const invalid of gBadIterationStartValues) {
+  test(t => {
+    const anim = createDiv(t).animate(null);
+    assert_throws({ name: 'TypeError' }, () => {
+      anim.effect.updateTiming({ iterationStart: invalid });
+    }, `setting ${invalid}`);
+  }, `Throws when setting invalid iterationStart value: ${invalid}`);
+}
+
+// ------------------------------
+//  iterations
+// ------------------------------
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  anim.effect.updateTiming({ iterations: 2 });
+  assert_equals(anim.effect.getTiming().iterations, 2, 'set duration 2');
+  assert_equals(anim.effect.getComputedTiming().iterations, 2,
+                       'getComputedTiming() after set iterations 2');
+}, 'Allows setting iterations to a double value');
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+  anim.effect.updateTiming({ iterations: Infinity });
+  assert_equals(anim.effect.getTiming().iterations, Infinity,
+                'set duration Infinity');
+  assert_equals(anim.effect.getComputedTiming().iterations, Infinity,
+                       'getComputedTiming() after set iterations Infinity');
+}, 'Allows setting iterations to infinity');
+
+for (const invalid of gBadIterationsValues) {
+  test(t => {
+    const anim = createDiv(t).animate(null);
+    assert_throws({ name: 'TypeError' }, () => {
+      anim.effect.updateTiming({ iterations: invalid });
+    });
+  }, `Throws when setting invalid iterations value: ${invalid}`);
+}
+
+test(t => {
+  const anim = createDiv(t).animate(null, { duration: 100000, fill: 'both' });
+
+  anim.finish();
+
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress when animation is finished');
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 0,
+                'current iteration when animation is finished');
+
+  anim.effect.updateTiming({ iterations: 2 });
+
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress,
+                             0,
+                             'progress after adding an iteration');
+  assert_time_equals_literal(anim.effect.getComputedTiming().currentIteration,
+                             1,
+                             'current iteration after adding an iteration');
+
+  anim.effect.updateTiming({ iterations: 0 });
+
+  assert_equals(anim.effect.getComputedTiming().progress, 0,
+                'progress after setting iterations to zero');
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 0,
+                'current iteration after setting iterations to zero');
+
+  anim.effect.updateTiming({ iterations: Infinity });
+
+  assert_equals(anim.effect.getComputedTiming().progress, 0,
+                'progress after setting iterations to Infinity');
+  assert_equals(anim.effect.getComputedTiming().currentIteration, 1,
+                'current iteration after setting iterations to Infinity');
+}, 'Allows setting the iterations of an animation in progress');
+
+
+// ------------------------------
+//  duration
+// ------------------------------
+
+for (const duration of gGoodDurationValues) {
+  test(t => {
+    const anim = createDiv(t).animate(null, 2000);
+    anim.effect.updateTiming({ duration: duration.specified });
+    if (typeof duration.specified === 'number') {
+      assert_time_equals_literal(anim.effect.getTiming().duration,
+                                 duration.specified,
+                                 'Updates specified duration');
+    } else {
+      assert_equals(anim.effect.getTiming().duration, duration.specified,
+                    'Updates specified duration');
+    }
+    assert_time_equals_literal(anim.effect.getComputedTiming().duration,
+                               duration.computed,
+                               'Updates computed duration');
+  }, `Allows setting the duration to ${duration.specified}`);
+}
+
+for (const invalid of gBadDurationValues) {
+  test(t => {
+    assert_throws(new TypeError, () => {
+      createDiv(t).animate(null, { duration: invalid });
+    });
+  }, 'Throws when setting invalid duration: '
+     + (typeof invalid === 'string' ? `"${invalid}"` : invalid));
+}
+
+test(t => {
+  const anim = createDiv(t).animate(null, { duration: 100000, fill: 'both' });
+  anim.finish();
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress when animation is finished');
+  anim.effect.updateTiming({ duration: anim.effect.getTiming().duration * 2 });
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5,
+                             'progress after doubling the duration');
+  anim.effect.updateTiming({ duration: 0 });
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress after setting duration to zero');
+  anim.effect.updateTiming({ duration: 'auto' });
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress after setting duration to \'auto\'');
+}, 'Allows setting the duration of an animation in progress');
+
+promise_test(t => {
+  const anim = createDiv(t).animate(null, 100 * MS_PER_SEC);
+  return anim.ready.then(() => {
+    const originalStartTime   = anim.startTime;
+    const originalCurrentTime = anim.currentTime;
+    assert_time_equals_literal(
+      anim.effect.getComputedTiming().duration,
+      100 * MS_PER_SEC,
+      'Initial duration should be as set on KeyframeEffect'
+    );
+
+    anim.effect.updateTiming({ duration: 200 * MS_PER_SEC });
+    assert_time_equals_literal(
+      anim.effect.getComputedTiming().duration,
+      200 * MS_PER_SEC,
+      'Effect duration should have been updated'
+    );
+    assert_times_equal(anim.startTime, originalStartTime,
+                       'startTime should be unaffected by changing effect ' +
+                       'duration');
+    assert_times_equal(anim.currentTime, originalCurrentTime,
+                       'currentTime should be unaffected by changing effect ' +
+                       'duration');
+  });
+}, 'Allows setting the duration of an animation in progress such that the' +
+   ' the start and current time do not change');
+
+
+// ------------------------------
+//  direction
+// ------------------------------
+
+test(t => {
+  const anim = createDiv(t).animate(null, 2000);
+
+  const directions = ['normal', 'reverse', 'alternate', 'alternate-reverse'];
+  for (const direction of directions) {
+    anim.effect.updateTiming({ direction: direction });
+    assert_equals(anim.effect.getTiming().direction, direction,
+                  `set direction to ${direction}`);
+  }
+}, 'Allows setting the direction to each of the possible keywords');
+
+test(t => {
+  const anim = createDiv(t).animate(null, {
+    duration: 10000,
+    direction: 'normal',
+  });
+  anim.currentTime = 7000;
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
+                             'progress before updating direction');
+
+  anim.effect.updateTiming({ direction: 'reverse' });
+
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
+                             'progress after updating direction');
+}, 'Allows setting the direction of an animation in progress from \'normal\' to'
+   + ' \'reverse\'');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { duration: 10000, direction: 'normal' });
+  assert_equals(anim.effect.getComputedTiming().progress, 0,
+                'progress before updating direction');
+
+  anim.effect.updateTiming({ direction: 'reverse' });
+
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress after updating direction');
+}, 'Allows setting the direction of an animation in progress from \'normal\' to'
+   + ' \'reverse\' while at start of active interval');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { fill: 'backwards',
+                                      duration: 10000,
+                                      delay: 10000,
+                                      direction: 'normal' });
+  assert_equals(anim.effect.getComputedTiming().progress, 0,
+                'progress before updating direction');
+
+  anim.effect.updateTiming({ direction: 'reverse' });
+
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'progress after updating direction');
+}, 'Allows setting the direction of an animation in progress from \'normal\' to'
+   + ' \'reverse\' while filling backwards');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { iterations: 2,
+                                      duration: 10000,
+                                      direction: 'normal' });
+  anim.currentTime = 17000;
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
+                             'progress before updating direction');
+
+  anim.effect.updateTiming({ direction: 'alternate' });
+
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
+                             'progress after updating direction');
+}, 'Allows setting the direction of an animation in progress from \'normal\' to'
+   + ' \'alternate\'');
+
+test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { iterations: 2,
+                                      duration: 10000,
+                                      direction: 'alternate' });
+  anim.currentTime = 17000;
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
+                             'progress before updating direction');
+
+  anim.effect.updateTiming({ direction: 'alternate-reverse' });
+
+  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
+                             'progress after updating direction');
+}, 'Allows setting the direction of an animation in progress from \'alternate\''
+   + ' to \'alternate-reverse\'');
+
+
+// ------------------------------
+//  easing
+// ------------------------------
+
+function assert_progress(animation, currentTime, easingFunction) {
+  animation.currentTime = currentTime;
+  const portion = currentTime / animation.effect.getTiming().duration;
+  assert_approx_equals(animation.effect.getComputedTiming().progress,
+                       easingFunction(portion),
+                       0.01,
+                       'The progress of the animation should be approximately'
+                       + ` ${easingFunction(portion)} at ${currentTime}ms`);
+}
+
+for (const options of gEasingTests) {
+  test(t => {
+    const target = createDiv(t);
+    const anim = target.animate(null,
+                                { duration: 1000 * MS_PER_SEC,
+                                  fill: 'forwards' });
+    anim.effect.updateTiming({ easing: options.easing });
+    assert_equals(anim.effect.getTiming().easing,
+                  options.serialization || options.easing);
+
+    const easing = options.easingFunction;
+    assert_progress(anim, 0, easing);
+    assert_progress(anim, 250 * MS_PER_SEC, easing);
+    assert_progress(anim, 500 * MS_PER_SEC, easing);
+    assert_progress(anim, 750 * MS_PER_SEC, easing);
+    assert_progress(anim, 1000 * MS_PER_SEC, easing);
+  }, `Allows setting the easing to a ${options.desc}`);
+}
+
+for (const easing of gRoundtripEasings) {
+  test(t => {
+    const anim = createDiv(t).animate(null);
+    anim.effect.updateTiming({ easing: easing });
+    assert_equals(anim.effect.getTiming().easing, easing);
+  }, `Updates the specified value when setting the easing to '${easing}'`);
+}
+
+test(t => {
+  const delay = 1000 * MS_PER_SEC;
+
+  const target = createDiv(t);
+  const anim = target.animate(null,
+                              { duration: 1000 * MS_PER_SEC,
+                                fill: 'both',
+                                delay: delay,
+                                easing: 'steps(2, start)' });
+
+  anim.effect.updateTiming({ easing: 'steps(2, end)' });
+  assert_equals(anim.effect.getComputedTiming().progress, 0,
+                'easing replace to steps(2, end) at before phase');
+
+  anim.currentTime = delay + 750 * MS_PER_SEC;
+  assert_equals(anim.effect.getComputedTiming().progress, 0.5,
+                'change currentTime to active phase');
+
+  anim.effect.updateTiming({ easing: 'steps(2, start)' });
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'easing replace to steps(2, start) at active phase');
+
+  anim.currentTime = delay + 1500 * MS_PER_SEC;
+  anim.effect.updateTiming({ easing: 'steps(2, end)' });
+  assert_equals(anim.effect.getComputedTiming().progress, 1,
+                'easing replace to steps(2, end) again at after phase');
+}, 'Allows setting the easing of an animation in progress');
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/delay.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/delay.html
deleted file mode 100644
index 41f099b86b2..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/delay.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.delay</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-delay">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.delay, 0);
-}, 'Has the default value 0');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 100);
-  anim.effect.timing.delay = 100;
-  assert_equals(anim.effect.timing.delay, 100, 'set delay 100');
-  assert_equals(anim.effect.getComputedTiming().delay, 100,
-                  'getComputedTiming() after set delay 100');
-}, 'Can be set to a positive number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 100);
-  anim.effect.timing.delay = -100;
-  assert_equals(anim.effect.timing.delay, -100, 'set delay -100');
-  assert_equals(anim.effect.getComputedTiming().delay, -100,
-                'getComputedTiming() after set delay -100');
-}, 'Can be set to a negative number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 100);
-  anim.effect.timing.delay = 100;
-  assert_equals(anim.effect.getComputedTiming().progress, null);
-  assert_equals(anim.effect.getComputedTiming().currentIteration, null);
-}, 'Can set a positive delay on an animation without a backwards fill to'
-   + ' make it no longer active');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { fill: 'both',
-                             duration: 100 });
-  anim.effect.timing.delay = -50;
-  assert_equals(anim.effect.getComputedTiming().progress, 0.5);
-}, 'Can set a negative delay to seek into the active interval');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { fill: 'both',
-                             duration: 100 });
-  anim.effect.timing.delay = -100;
-  assert_equals(anim.effect.getComputedTiming().progress, 1);
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 0);
-}, 'Can set a large negative delay to finishing an animation');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null);
-  for (let invalid of [NaN, Infinity]) {
-    assert_throws({ name: 'TypeError' }, () => {
-      anim.effect.timing.delay = invalid;
-    }, `setting ${invalid}`);
-    assert_throws({ name: 'TypeError' }, () => {
-      div.animate({}, { delay: invalid });
-    }, `animate() with ${invalid}`);
-  }
-}, 'Throws when setting invalid values');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/direction.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/direction.html
deleted file mode 100644
index 3238f5d7a5e..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/direction.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.direction</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-direction">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.direction, 'normal');
-}, 'Has the default value \'normal\'');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-
-  const directions = ['normal', 'reverse', 'alternate', 'alternate-reverse'];
-  for (const direction of directions) {
-    anim.effect.timing.direction = direction;
-    assert_equals(anim.effect.timing.direction, direction,
-                  `set direction to ${direction}`);
-  }
-}, 'Can be set to each of the possible keywords');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null, { duration: 10000, direction: 'normal' });
-  anim.currentTime = 7000;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
-                             'progress before updating direction');
-
-  anim.effect.timing.direction = 'reverse';
-
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
-                             'progress after updating direction');
-}, 'Can be changed from \'normal\' to \'reverse\' while in progress');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { duration: 10000,
-                             direction: 'normal' });
-  assert_equals(anim.effect.getComputedTiming().progress, 0,
-                'progress before updating direction');
-
-  anim.effect.timing.direction = 'reverse';
-
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress after updating direction');
-}, 'Can be changed from \'normal\' to \'reverse\' while at start of active'
-   + ' interval');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { fill: 'backwards',
-                             duration: 10000,
-                             delay: 10000,
-                             direction: 'normal' });
-  assert_equals(anim.effect.getComputedTiming().progress, 0,
-                'progress before updating direction');
-
-  anim.effect.timing.direction = 'reverse';
-
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress after updating direction');
-}, 'Can be changed from \'normal\' to \'reverse\' while filling backwards');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { iterations: 2,
-                             duration: 10000,
-                             direction: 'normal' });
-  anim.currentTime = 17000;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
-                             'progress before updating direction');
-
-  anim.effect.timing.direction = 'alternate';
-
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
-                             'progress after updating direction');
-}, 'Can be changed from \'normal\' to \'alternate\' while in progress');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { iterations: 2,
-                             duration: 10000,
-                             direction: 'alternate' });
-  anim.currentTime = 17000;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.3,
-                             'progress before updating direction');
-
-  anim.effect.timing.direction = 'alternate-reverse';
-
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.7,
-                             'progress after updating direction');
-}, 'Can be changed from \'alternate\' to \'alternate-reverse\' while in'
-   + ' progress');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/duration.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/duration.html
deleted file mode 100644
index 42913f552dd..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/duration.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.duration</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-duration">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.duration, 'auto');
-}, 'Has the default value \'auto\'');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.duration = 123.45;
-  assert_time_equals_literal(anim.effect.timing.duration, 123.45,
-                             'set duration 123.45');
-  assert_time_equals_literal(anim.effect.getComputedTiming().duration, 123.45,
-                             'getComputedTiming() after set duration 123.45');
-}, 'Can be set to a double value');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.duration = 'auto';
-  assert_equals(anim.effect.timing.duration, 'auto', 'set duration \'auto\'');
-  assert_equals(anim.effect.getComputedTiming().duration, 0,
-                'getComputedTiming() after set duration \'auto\'');
-}, 'Can be set to the string \'auto\'');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, { duration: 'auto' });
-  assert_equals(anim.effect.timing.duration, 'auto', 'set duration \'auto\'');
-  assert_equals(anim.effect.getComputedTiming().duration, 0,
-                'getComputedTiming() after set duration \'auto\'');
-}, 'Can be set to \'auto\' using a dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.duration = Infinity;
-  assert_equals(anim.effect.timing.duration, Infinity, 'set duration Infinity');
-  assert_equals(anim.effect.getComputedTiming().duration, Infinity,
-                'getComputedTiming() after set duration Infinity');
-}, 'Can be set to Infinity');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, -1);
-  });
-}, 'animate() throws when passed a negative number');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, -Infinity);
-  });
-}, 'animate() throws when passed negative Infinity');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, NaN);
-  });
-}, 'animate() throws when passed a NaN value');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, { duration: -1 });
-  });
-}, 'animate() throws when passed a negative number using a dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, { duration: -Infinity });
-  });
-}, 'animate() throws when passed negative Infinity using a dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, { duration: NaN });
-  });
-}, 'animate() throws when passed a NaN value using a dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, { duration: 'abc' });
-  });
-}, 'animate() throws when passed a string other than \'auto\' using a'
-   + ' dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  assert_throws({ name: 'TypeError' }, () => {
-    div.animate({ opacity: [ 0, 1 ] }, { duration: '100' });
-  });
-}, 'animate() throws when passed a string containing a number using a'
-   + ' dictionary object');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.duration = -1;
-  });
-}, 'Throws when setting a negative number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.duration = -Infinity;
-  });
-}, 'Throws when setting negative infinity');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.duration = NaN;
-  });
-}, 'Throws when setting a NaN value');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.duration = 'abc';
-  });
-}, 'Throws when setting a string other than \'auto\'');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.duration = '100';
-  });
-}, 'Throws when setting a string containing a number');
-
-promise_test(t => {
-  const anim = createDiv(t).animate(null, 100 * MS_PER_SEC);
-  return anim.ready.then(() => {
-    const originalStartTime   = anim.startTime;
-    const originalCurrentTime = anim.currentTime;
-    assert_equals(anim.effect.getComputedTiming().duration, 100 * MS_PER_SEC,
-                  'Initial duration should be as set on KeyframeEffect');
-
-    anim.effect.timing.duration = 200 * MS_PER_SEC;
-    assert_equals(anim.effect.getComputedTiming().duration, 200 * MS_PER_SEC,
-                  'Effect duration should have been updated');
-    assert_times_equal(anim.startTime, originalStartTime,
-                       'startTime should be unaffected by changing effect ' +
-                       'duration');
-    assert_times_equal(anim.currentTime, originalCurrentTime,
-                       'currentTime should be unaffected by changing effect ' +
-                       'duration');
-  });
-}, 'Extending an effect\'s duration does not change the start or current time');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null, { duration: 100000, fill: 'both' });
-  anim.finish();
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress when animation is finished');
-  anim.effect.timing.duration *= 2;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5,
-                             'progress after doubling the duration');
-  anim.effect.timing.duration = 0;
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress after setting duration to zero');
-  anim.effect.timing.duration = 'auto';
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress after setting duration to \'auto\'');
-}, 'Can be updated while the animation is in progress');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/easing.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/easing.html
deleted file mode 100644
index ec2b239fe52..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/easing.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.easing</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-easing">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<script src="../../resources/easing-tests.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.easing, 'linear');
-}, 'Has the default value \'linear\'');
-
-function assert_progress(animation, currentTime, easingFunction) {
-  animation.currentTime = currentTime;
-  const portion = currentTime / animation.effect.timing.duration;
-  assert_approx_equals(animation.effect.getComputedTiming().progress,
-                       easingFunction(portion),
-                       0.01,
-                       'The progress of the animation should be approximately'
-                       + ` ${easingFunction(portion)} at ${currentTime}ms`);
-}
-
-for (const options of gEasingTests) {
-  test(t => {
-    const target = createDiv(t);
-    const anim = target.animate([ { opacity: 0 }, { opacity: 1 } ],
-                                { duration: 1000 * MS_PER_SEC,
-                                  fill: 'forwards' });
-    anim.effect.timing.easing = options.easing;
-    assert_equals(anim.effect.timing.easing,
-                  options.serialization || options.easing);
-
-    const easing = options.easingFunction;
-    assert_progress(anim, 0, easing);
-    assert_progress(anim, 250 * MS_PER_SEC, easing);
-    assert_progress(anim, 500 * MS_PER_SEC, easing);
-    assert_progress(anim, 750 * MS_PER_SEC, easing);
-    assert_progress(anim, 1000 * MS_PER_SEC, easing);
-  }, options.desc);
-}
-
-for (const invalidEasing of gInvalidEasings) {
-  test(t => {
-    const div = createDiv(t);
-    const anim = div.animate({ opacity: [ 0, 1 ] }, 100 * MS_PER_SEC);
-    assert_throws({ name: 'TypeError' },
-                  () => {
-                    anim.effect.timing.easing = invalidEasing;
-                  });
-  }, `Throws on invalid easing: '${invalidEasing}'`);
-}
-
-for (const easing of gRoundtripEasings) {
-  test(t => {
-    const anim = createDiv(t).animate(null);
-    anim.effect.timing.easing = easing;
-    assert_equals(anim.effect.timing.easing, easing);
-  }, `Canonical easing '${easing}' is returned as set`);
-}
-
-test(t => {
-  const delay = 1000 * MS_PER_SEC;
-
-  const target = createDiv(t);
-  const anim = target.animate([ { opacity: 0 }, { opacity: 1 } ],
-                              { duration: 1000 * MS_PER_SEC,
-                                fill: 'both',
-                                delay: delay,
-                                easing: 'steps(2, start)' });
-
-  anim.effect.timing.easing = 'steps(2, end)';
-  assert_equals(anim.effect.getComputedTiming().progress, 0,
-                'easing replace to steps(2, end) at before phase');
-
-  anim.currentTime = delay + 750 * MS_PER_SEC;
-  assert_equals(anim.effect.getComputedTiming().progress, 0.5,
-                'change currentTime to active phase');
-
-  anim.effect.timing.easing = 'steps(2, start)';
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'easing replace to steps(2, start) at active phase');
-
-  anim.currentTime = delay + 1500 * MS_PER_SEC;
-  anim.effect.timing.easing = 'steps(2, end)';
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'easing replace to steps(2, end) again at after phase');
-}, 'Allows the easing to be changed while the animation is in progress');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/endDelay.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/endDelay.html
deleted file mode 100644
index 3062c8c1565..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/endDelay.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.endDelay</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-enddelay">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.endDelay, 0);
-}, 'Has the default value 0');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.endDelay = 123.45;
-  assert_time_equals_literal(anim.effect.timing.endDelay, 123.45,
-                             'set endDelay 123.45');
-  assert_time_equals_literal(anim.effect.getComputedTiming().endDelay, 123.45,
-                             'getComputedTiming() after set endDelay 123.45');
-}, 'Can be set to a positive number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.endDelay = -1000;
-  assert_equals(anim.effect.timing.endDelay, -1000, 'set endDelay -1000');
-  assert_equals(anim.effect.getComputedTiming().endDelay, -1000,
-                'getComputedTiming() after set endDelay -1000');
-}, 'Can be set to a negative number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.endDelay = Infinity;
-  }, 'we can not assign Infinity to timing.endDelay');
-}, 'Throws when setting infinity');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.endDelay = -Infinity;
-  }, 'we can not assign negative Infinity to timing.endDelay');
-}, 'Throws when setting negative infinity');
-
-async_test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { duration: 100000, endDelay: 50000 });
-  anim.onfinish = t.step_func(event => {
-    assert_unreached('finish event should not be fired');
-  });
-
-  anim.ready.then(() => {
-    anim.currentTime = 100000;
-    return waitForAnimationFrames(2);
-  }).then(t.step_func(() => {
-    t.done();
-  }));
-}, 'finish event is not fired at the end of the active interval when the'
-   + ' endDelay has not expired');
-
-async_test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { duration: 100000, endDelay: 30000 });
-  anim.ready.then(() => {
-    anim.currentTime = 110000; // during endDelay
-    anim.onfinish = t.step_func(event => {
-      assert_unreached('onfinish event should not be fired during endDelay');
-    });
-    return waitForAnimationFrames(2);
-  }).then(t.step_func(() => {
-    anim.onfinish = t.step_func(event => {
-      t.done();
-    });
-    anim.currentTime = 130000; // after endTime
-  }));
-}, 'finish event is fired after the endDelay has expired');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/fill.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/fill.html
deleted file mode 100644
index 01739478f47..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/fill.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.fill</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-fill">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.fill, 'auto');
-}, 'Has the default value \'auto\'');
-
-for (const fill of ['none', 'forwards', 'backwards', 'both']) {
-  test(t => {
-    const div = createDiv(t);
-    const anim = div.animate({ opacity: [ 0, 1 ] }, 100);
-    anim.effect.timing.fill = fill;
-    assert_equals(anim.effect.timing.fill, fill, 'set fill ' + fill);
-    assert_equals(anim.effect.getComputedTiming().fill, fill,
-                  'getComputedTiming() after set fill ' + fill);
-  }, `Can set fill to ${fill}`);
-}
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/idlharness.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/idlharness.html
deleted file mode 100644
index 7e537d1dd83..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/idlharness.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming and AnimationEffectTimingReadOnly IDL</title>
-<link rel="help"
-      href="https://drafts.csswg.org/web-animations/#animationeffecttiming">
-<link rel="help"
-      href="https://drafts.csswg.org/web-animations/#animationeffecttimingreadonly">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<div id="log"></div>
-<script type="text/plain" id="AnimationEffectTimingReadOnly-IDL">
-enum FillMode { "none", "forwards", "backwards", "both", "auto" };
-enum PlaybackDirection {
-  "normal",
-  "reverse",
-  "alternate",
-  "alternate-reverse"
-};
-
-dictionary AnimationEffectTimingProperties {
-  double                             delay = 0.0;
-  double                             endDelay = 0.0;
-  FillMode                           fill = "auto";
-  double                             iterationStart = 0.0;
-  unrestricted double                iterations = 1.0;
-  (unrestricted double or DOMString) duration = "auto";
-  PlaybackDirection                  direction = "normal";
-  DOMString                          easing = "linear";
-};
-
-[Exposed=Window]
-interface AnimationEffectTimingReadOnly {
-  readonly attribute double                             delay;
-  readonly attribute double                             endDelay;
-  readonly attribute FillMode                           fill;
-  readonly attribute double                             iterationStart;
-  readonly attribute unrestricted double                iterations;
-  readonly attribute (unrestricted double or DOMString) duration;
-  readonly attribute PlaybackDirection                  direction;
-  readonly attribute DOMString                          easing;
-};
-</script>
-<script type="text/plain" id="AnimationEffectTiming-IDL">
-[Exposed=Window]
-interface AnimationEffectTiming : AnimationEffectTimingReadOnly {
-  inherit attribute double                             delay;
-  inherit attribute double                             endDelay;
-  inherit attribute FillMode                           fill;
-  inherit attribute double                             iterationStart;
-  inherit attribute unrestricted double                iterations;
-  inherit attribute (unrestricted double or DOMString) duration;
-  inherit attribute PlaybackDirection                  direction;
-  inherit attribute DOMString                          easing;
-};
-</script>
-<script>
-'use strict';
-
-const idlArray = new IdlArray();
-
-idlArray.add_idls(
-  document.getElementById('AnimationEffectTimingReadOnly-IDL').textContent
-);
-idlArray.add_idls(
-  document.getElementById('AnimationEffectTiming-IDL').textContent
-);
-
-idlArray.add_objects({
-  AnimationEffectTiming: [
-    '(new KeyframeEffect(null, null)).timing'
-  ],
-  AnimationEffectTimingReadOnly: [
-    '(new KeyframeEffectReadOnly(null, null)).timing'
-  ],
-});
-idlArray.test();
-
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
deleted file mode 100644
index 73bc4810da1..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.iterationStart</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-iterationstart">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.iterationStart, 0);
-}, 'Has the default value 0');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { iterationStart: 0.2,
-                             iterations: 1,
-                             fill: 'both',
-                             duration: 100,
-                             delay: 1 });
-  anim.effect.timing.iterationStart = 2.5;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
-}, 'Changing the value updates computed timing when backwards-filling');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { iterationStart: 0.2,
-                             iterations: 1,
-                             fill: 'both',
-                             duration: 100,
-                             delay: 0 });
-  anim.effect.timing.iterationStart = 2.5;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
-}, 'Changing the value updates computed timing during the active phase');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] },
-                           { iterationStart: 0.2,
-                             iterations: 1,
-                             fill: 'both',
-                             duration: 100,
-                             delay: 0 });
-  anim.finish();
-  anim.effect.timing.iterationStart = 2.5;
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress, 0.5);
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 3);
-}, 'Changing the value updates computed timing when forwards-filling');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null);
-  for (let invalid of [-1, NaN, Infinity]) {
-    assert_throws({ name: 'TypeError' }, () => {
-      anim.effect.timing.iterationStart = invalid;
-    }, `setting ${invalid}`);
-    assert_throws({ name: 'TypeError' }, () => {
-      div.animate({}, { iterationStart: invalid });
-    }, `animate() with ${invalid}`);
-  }
-}, 'Throws when setting invalid values');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterations.html
deleted file mode 100644
index 3bfaf8e9920..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterations.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>AnimationEffectTiming.iterations</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffecttiming-iterations">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(t => {
-  const anim = createDiv(t).animate(null);
-  assert_equals(anim.effect.timing.iterations, 1);
-}, 'Has the default value 1');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.iterations = 2;
-  assert_equals(anim.effect.timing.iterations, 2, 'set duration 2');
-  assert_equals(anim.effect.getComputedTiming().iterations, 2,
-                       'getComputedTiming() after set iterations 2');
-}, 'Can be set to a double value');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  anim.effect.timing.iterations = Infinity;
-  assert_equals(anim.effect.timing.iterations, Infinity, 'set duration Infinity');
-  assert_equals(anim.effect.getComputedTiming().iterations, Infinity,
-                       'getComputedTiming() after set iterations Infinity');
-}, 'Can be set to infinity');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.iterations = -1;
-  });
-}, 'Throws when setting a negative number');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.iterations = -Infinity;
-  });
-}, 'Throws when setting negative infinity');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
-  assert_throws({ name: 'TypeError' }, () => {
-    anim.effect.timing.iterations = NaN;
-  });
-}, 'Throws when setting a NaN value');
-
-test(t => {
-  const div = createDiv(t);
-  const anim = div.animate(null, { duration: 100000, fill: 'both' });
-
-  anim.finish();
-
-  assert_equals(anim.effect.getComputedTiming().progress, 1,
-                'progress when animation is finished');
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 0,
-                'current iteration when animation is finished');
-
-  anim.effect.timing.iterations = 2;
-
-  assert_time_equals_literal(anim.effect.getComputedTiming().progress,
-                             0,
-                             'progress after adding an iteration');
-  assert_time_equals_literal(anim.effect.getComputedTiming().currentIteration,
-                             1,
-                             'current iteration after adding an iteration');
-
-  anim.effect.timing.iterations = 0;
-
-  assert_equals(anim.effect.getComputedTiming().progress, 0,
-                'progress after setting iterations to zero');
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 0,
-                'current iteration after setting iterations to zero');
-
-  anim.effect.timing.iterations = Infinity;
-
-  assert_equals(anim.effect.getComputedTiming().progress, 0,
-                'progress after setting iterations to Infinity');
-  assert_equals(anim.effect.getComputedTiming().currentIteration, 1,
-                'current iteration after setting iterations to Infinity');
-}, 'Can be updated while the animation is in progress');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
index 165626decc9..3a1d7beb9ec 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
@@ -42,7 +42,7 @@ test(t => {
 }, 'Test the order of document.getAnimations with script generated animations')
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(null, gKeyFrames, 100 * MS_PER_SEC);
+  const effect = new KeyframeEffect(null, gKeyFrames, 100 * MS_PER_SEC);
   const anim = new Animation(effect, document.timeline);
   anim.play();
 
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
index dfdebde2072..250a8c7a836 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>KeyframeEffect and KeyframeEffectReadOnly constructor</title>
+<title>KeyframeEffect constructor</title>
 <link rel="help"
       href="https://drafts.csswg.org/web-animations/#dom-keyframeeffect-keyframeeffect">
 <link rel="help"
@@ -21,49 +21,48 @@ const target = document.getElementById('target');
 
 test(t => {
   for (const frames of gEmptyKeyframeListTests) {
-    assert_equals(new KeyframeEffectReadOnly(target, frames)
-                        .getKeyframes().length,
+    assert_equals(new KeyframeEffect(target, frames).getKeyframes().length,
                   0, `number of frames for ${JSON.stringify(frames)}`);
   }
-}, 'A KeyframeEffectReadOnly can be constructed with no frames');
+}, 'A KeyframeEffect can be constructed with no frames');
 
 test(t => {
   for (const subtest of gEasingParsingTests) {
     const easing = subtest[0];
     const expected = subtest[1];
-    const effect = new KeyframeEffectReadOnly(target, {
+    const effect = new KeyframeEffect(target, {
       left: ['10px', '20px']
     }, { easing: easing });
-    assert_equals(effect.timing.easing, expected,
+    assert_equals(effect.getTiming().easing, expected,
                   `resulting easing for '${easing}'`);
   }
 }, 'easing values are parsed correctly when passed to the ' +
-   'KeyframeEffectReadOnly constructor in KeyframeEffectOptions');
+   'KeyframeEffect constructor in KeyframeEffectOptions');
 
 test(t => {
   for (const invalidEasing of gInvalidEasings) {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target, null, { easing: invalidEasing });
+      new KeyframeEffect(target, null, { easing: invalidEasing });
     }, `TypeError is thrown for easing '${invalidEasing}'`);
   }
 }, 'Invalid easing values are correctly rejected when passed to the ' +
-   'KeyframeEffectReadOnly constructor in KeyframeEffectOptions');
+   'KeyframeEffect constructor in KeyframeEffectOptions');
 
 test(t => {
   const getKeyframe =
     composite => ({ left: [ '10px', '20px' ], composite: composite });
   for (const composite of gGoodKeyframeCompositeValueTests) {
-    const effect = new KeyframeEffectReadOnly(target, getKeyframe(composite));
+    const effect = new KeyframeEffect(target, getKeyframe(composite));
     assert_equals(effect.getKeyframes()[0].composite, composite,
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadKeyframeCompositeValueTests) {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target, getKeyframe(composite));
+      new KeyframeEffect(target, getKeyframe(composite));
     });
   }
 }, 'composite values are parsed correctly when passed to the ' +
-   'KeyframeEffectReadOnly constructor in property-indexed keyframes');
+   'KeyframeEffect constructor in property-indexed keyframes');
 
 test(t => {
   const getKeyframes = composite =>
@@ -72,29 +71,29 @@ test(t => {
       { offset: 1, left: '20px' }
     ];
   for (const composite of gGoodKeyframeCompositeValueTests) {
-    const effect = new KeyframeEffectReadOnly(target, getKeyframes(composite));
+    const effect = new KeyframeEffect(target, getKeyframes(composite));
     assert_equals(effect.getKeyframes()[0].composite, composite,
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadKeyframeCompositeValueTests) {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target, getKeyframes(composite));
+      new KeyframeEffect(target, getKeyframes(composite));
     });
   }
 }, 'composite values are parsed correctly when passed to the ' +
-   'KeyframeEffectReadOnly constructor in regular keyframes');
+   'KeyframeEffect constructor in regular keyframes');
 
 test(t => {
   for (const composite of gGoodOptionsCompositeValueTests) {
-    const effect = new KeyframeEffectReadOnly(target, {
+    const effect = new KeyframeEffect(target, {
       left: ['10px', '20px']
-    }, { composite: composite });
+    }, { composite });
     assert_equals(effect.getKeyframes()[0].composite, null,
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadOptionsCompositeValueTests) {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target, {
+      new KeyframeEffect(target, {
         left: ['10px', '20px']
       }, { composite: composite });
     });
@@ -104,32 +103,30 @@ test(t => {
 
 for (const subtest of gKeyframesTests) {
   test(t => {
-    const effect = new KeyframeEffectReadOnly(target, subtest.input);
+    const effect = new KeyframeEffect(target, subtest.input);
     assert_frame_lists_equal(effect.getKeyframes(), subtest.output);
-  }, `A KeyframeEffectReadOnly can be constructed with ${subtest.desc}`);
+  }, `A KeyframeEffect can be constructed with ${subtest.desc}`);
 
   test(t => {
-    const effect = new KeyframeEffectReadOnly(target, subtest.input);
-    const secondEffect =
-      new KeyframeEffectReadOnly(target, effect.getKeyframes());
+    const effect = new KeyframeEffect(target, subtest.input);
+    const secondEffect = new KeyframeEffect(target, effect.getKeyframes());
     assert_frame_lists_equal(secondEffect.getKeyframes(),
                              effect.getKeyframes());
-  }, `A KeyframeEffectReadOnly constructed with ${subtest.desc} roundtrips`);
+  }, `A KeyframeEffect constructed with ${subtest.desc} roundtrips`);
 }
 
 for (const subtest of gInvalidKeyframesTests) {
   test(t => {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target, subtest.input);
+      new KeyframeEffect(target, subtest.input);
     });
-  }, `KeyframeEffectReadOnly constructor throws with ${subtest.desc}`);
+  }, `KeyframeEffect constructor throws with ${subtest.desc}`);
 }
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(target,
-                                            { left: ['10px', '20px'] });
+  const effect = new KeyframeEffect(target, { left: ['10px', '20px'] });
 
-  const timing = effect.timing;
+  const timing = effect.getTiming();
   assert_equals(timing.delay, 0, 'default delay');
   assert_equals(timing.endDelay, 0, 'default endDelay');
   assert_equals(timing.fill, 'auto', 'default fill');
@@ -142,14 +139,12 @@ test(t => {
   assert_equals(effect.composite, 'replace', 'default composite');
   assert_equals(effect.iterationComposite, 'replace',
                 'default iterationComposite');
-}, 'A KeyframeEffectReadOnly constructed without any ' +
-   'KeyframeEffectOptions object');
+}, 'A KeyframeEffect constructed without any KeyframeEffectOptions object');
 
 for (const subtest of gKeyframeEffectOptionTests) {
   test(t => {
-    const effect = new KeyframeEffectReadOnly(target,
-                                              { left: ['10px', '20px'] },
-                                              subtest.input);
+    const effect = new KeyframeEffect(target, { left: ['10px', '20px'] },
+                                      subtest.input);
 
     // Helper function to provide default expected values when the test does
     // not supply them.
@@ -157,7 +152,7 @@ for (const subtest of gKeyframeEffectOptionTests) {
       return field in subtest.expected ? subtest.expected[field] : defaultValue;
     };
 
-    const timing = effect.timing;
+    const timing = effect.getTiming();
     assert_equals(timing.delay, expected('delay', 0),
                   'timing delay');
     assert_equals(timing.fill, expected('fill', 'auto'),
@@ -169,27 +164,24 @@ for (const subtest of gKeyframeEffectOptionTests) {
     assert_equals(timing.direction, expected('direction', 'normal'),
                   'timing direction');
 
-  }, `A KeyframeEffectReadOnly constructed by ${subtest.desc}`);
+  }, `A KeyframeEffect constructed by ${subtest.desc}`);
 }
 
 for (const subtest of gInvalidKeyframeEffectOptionTests) {
   test(t => {
     assert_throws(new TypeError, () => {
-      new KeyframeEffectReadOnly(target,
-                                 { left: ['10px', '20px'] },
-                                 subtest.input);
+      new KeyframeEffect(target, { left: ['10px', '20px'] }, subtest.input);
     });
-  }, `Invalid KeyframeEffectReadOnly option by ${subtest.desc}`);
+  }, `Invalid KeyframeEffect option by ${subtest.desc}`);
 }
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(null,
-                                            { left: ['10px', '20px'] },
-                                            { duration: 100 * MS_PER_SEC,
-                                              fill: 'forwards' });
+  const effect = new KeyframeEffect(null, { left: ['10px', '20px'] },
+                                    { duration: 100 * MS_PER_SEC,
+                                      fill: 'forwards' });
   assert_equals(effect.target, null,
                 'Effect created with null target has correct target');
-}, 'A KeyframeEffectReadOnly constructed with null target');
+}, 'A KeyframeEffect constructed with null target');
 
 test(t => {
   const test_error = { name: 'test' };
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html
index c4e8a8ec37c..e3bc0db00a7 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>KeyframeEffect and KeyframeEffectReadOnly copy constructor</title>
+<title>KeyframeEffect copy constructor</title>
 <link rel="help"
       href="https://drafts.csswg.org/web-animations/#dom-keyframeeffect-keyframeeffect-source">
 <link rel="help"
@@ -14,21 +14,21 @@
 'use strict';
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(createDiv(t), null);
-  const copiedEffect = new KeyframeEffectReadOnly(effect);
+  const effect = new KeyframeEffect(createDiv(t), null);
+  const copiedEffect = new KeyframeEffect(effect);
   assert_equals(copiedEffect.target, effect.target, 'same target');
-}, 'Copied KeyframeEffectReadOnly has the same target');
+}, 'Copied KeyframeEffect has the same target');
 
 test(t => {
   const effect =
-    new KeyframeEffectReadOnly(null,
-                               [ { marginLeft: '0px' },
-                                 { marginLeft: '-20px', easing: 'ease-in',
-                                   offset: 0.1 },
-                                 { marginLeft: '100px', easing: 'ease-out' },
-                                 { marginLeft: '50px' } ]);
+    new KeyframeEffect(null,
+                       [ { marginLeft: '0px' },
+                         { marginLeft: '-20px', easing: 'ease-in',
+                           offset: 0.1 },
+                         { marginLeft: '100px', easing: 'ease-out' },
+                         { marginLeft: '50px' } ]);
 
-  const copiedEffect = new KeyframeEffectReadOnly(effect);
+  const copiedEffect = new KeyframeEffect(effect);
   const keyframesA = effect.getKeyframes();
   const keyframesB = copiedEffect.getKeyframes();
   assert_equals(keyframesA.length, keyframesB.length, 'same keyframes length');
@@ -50,34 +50,33 @@ test(t => {
     assert_equals(keyframesA[i].marginLeft, keyframesB[i].marginLeft,
                   `Keyframe ${i} has the same property value pair`);
   }
-}, 'Copied KeyframeEffectReadOnly has the same keyframes');
+}, 'Copied KeyframeEffect has the same keyframes');
 
 test(t => {
   const effect =
-    new KeyframeEffectReadOnly(null, null,
-                               { iterationComposite: 'accumulate' });
+    new KeyframeEffect(null, null, { iterationComposite: 'accumulate' });
 
-  const copiedEffect = new KeyframeEffectReadOnly(effect);
+  const copiedEffect = new KeyframeEffect(effect);
   assert_equals(copiedEffect.iterationComposite, effect.iterationComposite,
                 'same iterationCompositeOperation');
   assert_equals(copiedEffect.composite, effect.composite,
                 'same compositeOperation');
-}, 'Copied KeyframeEffectReadOnly has the same KeyframeEffectOptions');
+}, 'Copied KeyframeEffect has the same KeyframeEffectOptions');
 
 test(t => {
-  const effect = new KeyframeEffectReadOnly(null, null,
-                                            { duration: 100 * MS_PER_SEC,
-                                              delay: -1 * MS_PER_SEC,
-                                              endDelay: 2 * MS_PER_SEC,
-                                              fill: 'forwards',
-                                              iterationStart: 2,
-                                              iterations: 20,
-                                              easing: 'ease-out',
-                                              direction: 'alternate' } );
+  const effect = new KeyframeEffect(null, null,
+                                    { duration: 100 * MS_PER_SEC,
+                                      delay: -1 * MS_PER_SEC,
+                                      endDelay: 2 * MS_PER_SEC,
+                                      fill: 'forwards',
+                                      iterationStart: 2,
+                                      iterations: 20,
+                                      easing: 'ease-out',
+                                      direction: 'alternate' } );
 
-  const copiedEffect = new KeyframeEffectReadOnly(effect);
-  const timingA = effect.timing;
-  const timingB = copiedEffect.timing;
+  const copiedEffect = new KeyframeEffect(effect);
+  const timingA = effect.getTiming();
+  const timingB = copiedEffect.getTiming();
   assert_not_equals(timingA, timingB, 'different timing objects');
   assert_equals(timingA.delay, timingB.delay, 'same delay');
   assert_equals(timingA.endDelay, timingB.endDelay, 'same endDelay');
@@ -88,19 +87,7 @@ test(t => {
   assert_equals(timingA.duration, timingB.duration, 'same duration');
   assert_equals(timingA.direction, timingB.direction, 'same direction');
   assert_equals(timingA.easing, timingB.easing, 'same easing');
-}, 'Copied KeyframeEffectReadOnly has the same timing content');
-
-test(t => {
-  const effect = new KeyframeEffectReadOnly(createDiv(t), null);
-  assert_equals(effect.constructor.name, 'KeyframeEffectReadOnly');
-  assert_equals(effect.timing.constructor.name,
-                'AnimationEffectTimingReadOnly');
-
-  // Make a mutable copy
-  const copiedEffect = new KeyframeEffect(effect);
-  assert_equals(copiedEffect.constructor.name, 'KeyframeEffect');
-  assert_equals(copiedEffect.timing.constructor.name, 'AnimationEffectTiming');
-}, 'KeyframeEffect constructed from a KeyframeEffectReadOnly is mutable');
+}, 'Copied KeyframeEffect has the same timing content');
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/idlharness.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/idlharness.html
index 5056a875e43..0340a19d31c 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/idlharness.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/idlharness.html
@@ -9,7 +9,7 @@
 <script src="/resources/WebIDLParser.js"></script>
 <script src="/resources/idlharness.js"></script>
 <div id="log"></div>
-<script type="text/plain" id="AnimationEffectTimingReadOnly-IDL">
+<script type="text/plain" id="AnimationEffect-IDL">
 enum FillMode { "none", "forwards", "backwards", "both", "auto" };
 enum PlaybackDirection {
   "normal",
@@ -18,7 +18,7 @@ enum PlaybackDirection {
   "alternate-reverse"
 };
 
-dictionary AnimationEffectTimingProperties {
+dictionary EffectTiming {
   double                             delay = 0.0;
   double                             endDelay = 0.0;
   FillMode                           fill = "auto";
@@ -29,38 +29,37 @@ dictionary AnimationEffectTimingProperties {
   DOMString                          easing = "linear";
 };
 
-[Exposed=Window]
-interface AnimationEffectTimingReadOnly {
-  readonly attribute double                             delay;
-  readonly attribute double                             endDelay;
-  readonly attribute FillMode                           fill;
-  readonly attribute double                             iterationStart;
-  readonly attribute unrestricted double                iterations;
-  readonly attribute (unrestricted double or DOMString) duration;
-  readonly attribute PlaybackDirection                  direction;
-  readonly attribute DOMString                          easing;
+dictionary OptionalEffectTiming {
+  double                              delay;
+  double                              endDelay;
+  FillMode                            fill;
+  double                              iterationStart;
+  unrestricted double                 iterations;
+  (unrestricted double or DOMString)  duration;
+  PlaybackDirection                   direction;
+  DOMString                           easing;
 };
-</script>
-<script type="text/plain" id="AnimationEffectReadOnly-IDL">
-dictionary ComputedTimingProperties : AnimationEffectTimingProperties {
-  unrestricted double  endTime;
-  unrestricted double  activeDuration;
-  double?              localTime;
-  double?              progress;
-  unrestricted double? currentIteration;
+
+dictionary ComputedEffectTiming : EffectTiming {
+  unrestricted double   endTime = 0.0;
+  unrestricted double   activeDuration = 0.0;
+  double?               localTime = null;
+  double?               progress = null;
+  unrestricted double?  currentIteration = null;
 };
 
 [Exposed=Window]
-interface AnimationEffectReadOnly {
-  readonly attribute AnimationEffectTimingReadOnly timing;
-  ComputedTimingProperties getComputedTiming();
+interface AnimationEffect {
+  EffectTiming getTiming();
+  ComputedEffectTiming getComputedTiming();
+  void updateTiming(optional OptionalEffectTiming timing);
 };
 </script>
-<script type="text/plain" id="KeyframeEffectReadOnly-IDL">
+<script type="text/plain" id="KeyframeEffect-IDL">
 enum IterationCompositeOperation { "replace", "accumulate" };
 enum CompositeOperation { "replace", "add", "accumulate" };
 
-dictionary KeyframeEffectOptions : AnimationEffectTimingProperties {
+dictionary KeyframeEffectOptions : EffectTiming {
   IterationCompositeOperation iterationComposite = "replace";
   CompositeOperation          composite = "replace";
 };
@@ -69,24 +68,13 @@ dictionary KeyframeEffectOptions : AnimationEffectTimingProperties {
  Constructor ((Element or CSSPseudoElement)? target,
               object? keyframes,
               optional (unrestricted double or KeyframeEffectOptions) options),
- Constructor (KeyframeEffectReadOnly source)]
-interface KeyframeEffectReadOnly : AnimationEffectReadOnly {
-  readonly attribute (Element or CSSPseudoElement)? target;
-  readonly attribute IterationCompositeOperation    iterationComposite;
-  readonly attribute CompositeOperation             composite;
+ Constructor (KeyframeEffect source)]
+interface KeyframeEffect : AnimationEffect {
+  attribute (Element or CSSPseudoElement)? target;
+  attribute IterationCompositeOperation    iterationComposite;
+  attribute CompositeOperation             composite;
+
   sequence<object> getKeyframes ();
-};
-</script>
-<script type="text/plain" id="KeyframeEffect-IDL">
-[Exposed=Window,
- Constructor ((Element or CSSPseudoElement)? target,
-              object? keyframes,
-              optional (unrestricted double or KeyframeEffectOptions) options),
- Constructor (KeyframeEffectReadOnly source)]
-interface KeyframeEffect : KeyframeEffectReadOnly {
-  inherit attribute (Element or CSSPseudoElement)? target;
-  inherit attribute IterationCompositeOperation    iterationComposite;
-  inherit attribute CompositeOperation             composite;
   void setKeyframes (object? keyframes);
 };
 </script>
@@ -98,20 +86,13 @@ const idlArray = new IdlArray();
 idlArray.add_untested_idls('interface CSSPseudoElement {};');
 idlArray.add_untested_idls('interface Element {};');
 idlArray.add_untested_idls(
-  document.getElementById('AnimationEffectTimingReadOnly-IDL').textContent
-);
-idlArray.add_idls(
-  document.getElementById('AnimationEffectReadOnly-IDL').textContent
-);
-idlArray.add_idls(
-  document.getElementById('KeyframeEffectReadOnly-IDL').textContent
+  document.getElementById('AnimationEffect-IDL').textContent
 );
 idlArray.add_idls(
   document.getElementById('KeyframeEffect-IDL').textContent
 );
 idlArray.add_objects({
   KeyframeEffect: ['new KeyframeEffect(null, null)'],
-  KeyframeEffectReadOnly: ['new KeyframeEffectReadOnly(null, null)'],
 });
 
 idlArray.test();
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html
index de2afa7c2b8..bbb8ee2a326 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html
@@ -19,7 +19,8 @@ test(t => {
   anim.pause();
 
   anim.currentTime =
-    anim.effect.timing.duration * 2 + anim.effect.timing.duration / 2;
+    anim.effect.getComputedTiming().duration * 2 +
+    anim.effect.getComputedTiming().duration / 2;
   assert_equals(getComputedStyle(div).marginLeft, '25px',
     'Animated style at 50s of the third iteration');
 
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
index 523019d2913..133fd579041 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html
@@ -13,7 +13,7 @@
 'use strict';
 
 // This file only tests the KeyframeEffect constructor since it is
-// assumed that the implementation of the KeyframeEffectReadOnly constructor,
+// assumed that the implementation of the KeyframeEffect constructor,
 // Animatable.animate() method, and KeyframeEffect.setKeyframes() method will
 // all share common machinery and it is not necessary to test each method.
 
diff --git a/tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js b/tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js
new file mode 100644
index 00000000000..4b0f021f74e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js
@@ -0,0 +1,46 @@
+'use strict';
+
+// =================================
+//
+// Common timing parameter test data
+//
+// =================================
+
+
+// ------------------------------
+//  Delay values
+// ------------------------------
+
+const gBadDelayValues = [
+  NaN, Infinity, -Infinity
+];
+
+// ------------------------------
+//  Duration values
+// ------------------------------
+
+const gGoodDurationValues = [
+  { specified: 123.45, computed: 123.45 },
+  { specified: 'auto', computed: 0 },
+  { specified: Infinity, computed: Infinity },
+];
+
+const gBadDurationValues = [
+  -1, NaN, -Infinity, 'abc', '100'
+];
+
+// ------------------------------
+//  iterationStart values
+// ------------------------------
+
+const gBadIterationStartValues = [
+  -1, NaN, Infinity, -Infinity
+];
+
+// ------------------------------
+//  iterations values
+// ------------------------------
+
+const gBadIterationsValues = [
+  -1, -Infinity, NaN
+];
diff --git a/tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js b/tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js
new file mode 100644
index 00000000000..d7267f94f2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js
@@ -0,0 +1,39 @@
+'use strict';
+
+// =======================================
+//
+// Utility functions for testing timing
+//
+// =======================================
+
+
+// ------------------------------
+//  Helper functions
+// ------------------------------
+
+// Utility function to check that a subset of timing properties have their
+// default values.
+function assert_default_timing_except(effect, propertiesToSkip) {
+  const defaults = {
+    delay: 0,
+    endDelay: 0,
+    fill: 'auto',
+    iterationStart: 0,
+    iterations: 1,
+    duration: 'auto',
+    direction: 'normal',
+    easing: 'linear',
+  };
+
+  for (const prop of Object.keys(defaults)) {
+    if (propertiesToSkip.includes(prop)) {
+      continue;
+    }
+
+    assert_equals(
+      effect.getTiming()[prop],
+      defaults[prop],
+      `${prop} parameter has default value:`
+    );
+  }
+}
diff --git a/tests/wpt/web-platform-tests/web-animations/testcommon.js b/tests/wpt/web-platform-tests/web-animations/testcommon.js
index bb5acc2869f..46f2356e8ef 100644
--- a/tests/wpt/web-platform-tests/web-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/web-animations/testcommon.js
@@ -29,7 +29,11 @@ if (!window.assert_times_equal) {
 // a time value based on its precision requirements with a fixed value.
 if (!window.assert_time_equals_literal) {
   window.assert_time_equals_literal = (actual, expected, description) => {
-    assert_approx_equals(actual, expected, TIME_PRECISION, description);
+    if (Math.abs(expected) === Infinity) {
+      assert_equals(actual, expected, description);
+    } else {
+      assert_approx_equals(actual, expected, TIME_PRECISION, description);
+    }
   }
 }
 
@@ -283,4 +287,4 @@ function assert_rotate3d_equals(actual, expected, description) {
     assert_approx_equals(actualRotationVector[i], expectedRotationVector[i], 0.0001,
       `expected ${expected} but got ${actual}: ${description}`);
   }
-}
\ No newline at end of file
+}
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html
index ac3732fe673..b62726c7e64 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html
@@ -22,7 +22,7 @@ function assert_phase_at_time(animation, phase, currentTime) {
   if (phase === 'active') {
     // If the fill mode is 'none', then progress will only be non-null if we
     // are in the active phase.
-    animation.effect.timing.fill = 'none';
+    animation.effect.updateTiming({ fill: 'none' });
     assert_not_equals(animation.effect.getComputedTiming().progress, null,
                       'Animation effect is in active phase when current time'
                       + ` is ${currentTime}ms`);
@@ -31,15 +31,15 @@ function assert_phase_at_time(animation, phase, currentTime) {
     // phase is to toggle the fill mode. For example, if the progress is null
     // will the fill node is 'none' but non-null when the fill mode is
     // 'backwards' then we are in the before phase.
-    animation.effect.timing.fill = 'none';
+    animation.effect.updateTiming({ fill: 'none' });
     assert_equals(animation.effect.getComputedTiming().progress, null,
                   `Animation effect is in ${phase} phase when current time`
                   + ` is ${currentTime}ms`
                   + ' (progress is null with \'none\' fill mode)');
 
-    animation.effect.timing.fill = phase === 'before'
-                                   ? 'backwards'
-                                   : 'forwards';
+    animation.effect.updateTiming({
+      fill: phase === 'before' ? 'backwards' : 'forwards',
+    });
     assert_not_equals(animation.effect.getComputedTiming().progress, null,
                       `Animation effect is in ${phase} phase when current time`
                       + ` is ${currentTime}ms`
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html
index b479db9b93e..833f074d40e 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html
@@ -196,7 +196,7 @@ promise_test(async t => {
 }, 'Finishing an animation resolves the finished promise synchronously');
 
 promise_test(async t => {
-  const effect = new KeyframeEffectReadOnly(null, null, 100 * MS_PER_SEC);
+  const effect = new KeyframeEffect(null, null, 100 * MS_PER_SEC);
   const animation = new Animation(effect, document.timeline);
   let resolvedFinished = false;
   animation.finished.then(() => {
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html
index 184804d6702..daa73f59c2f 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html
@@ -36,9 +36,9 @@ promise_test(async t => {
   anim.pause();
   assert_true(anim.pending);
 
-  anim.effect = new KeyframeEffectReadOnly(createDiv(t),
-                                           { marginLeft: [ '0px', '100px' ] },
-                                           100 * MS_PER_SEC);
+  anim.effect = new KeyframeEffect(createDiv(t),
+                                   { marginLeft: [ '0px', '100px' ] },
+                                   100 * MS_PER_SEC);
   assert_true(anim.pending);
   await anim.ready;
 
@@ -52,9 +52,9 @@ promise_test(async t => {
   anim.play();
   assert_true(anim.pending);
 
-  anim.effect = new KeyframeEffectReadOnly(createDiv(t),
-                                           { marginLeft: [ '0px', '100px' ] },
-                                           100 * MS_PER_SEC);
+  anim.effect = new KeyframeEffect(createDiv(t),
+                                   { marginLeft: [ '0px', '100px' ] },
+                                   100 * MS_PER_SEC);
   assert_true(anim.pending);
   await anim.ready;
 
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html
index 7059423b363..8e02fed1528 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html
@@ -141,7 +141,9 @@ promise_test(async t => {
                 'Hold time is initially set');
   // Then extend the duration so that the hold time is cleared and on
   // the next tick the current time will increase.
-  anim.effect.timing.duration *= 2;
+  anim.effect.updateTiming({
+    duration: anim.effect.getComputedTiming().duration * 2,
+  });
   await waitForNextFrame();
 
   assert_greater_than(anim.currentTime, 100 * MS_PER_SEC,
@@ -247,7 +249,7 @@ promise_test(async t => {
   anim.cancel();
   // Trigger a change that will cause the "update the finished state"
   // procedure to run.
-  anim.effect.timing.duration = 200 * MS_PER_SEC;
+  anim.effect.updateTiming({ duration: 200 * MS_PER_SEC });
   assert_equals(anim.currentTime, null,
                 'The animation hold time / start time should not be updated');
   // The "update the finished state" procedure is supposed to run after any
@@ -273,7 +275,7 @@ test(t => {
   // is greater than the target end. At this point the "update the finished
   // state" procedure should run and if we fail to check for a pending task
   // we will set the hold time to the target end, i.e. 50ms.
-  anim.effect.timing.duration = 50 * MS_PER_SEC;
+  anim.effect.updateTiming({ duration: 50 * MS_PER_SEC });
   assert_equals(anim.currentTime, 75 * MS_PER_SEC,
                 'Hold time should not be updated');
 }, 'Updating the finished state when there is a pending task');
@@ -289,7 +291,7 @@ promise_test(async t => {
   anim.currentTime = 150 * MS_PER_SEC;
   // Trigger a change that will cause the "update the finished state"
   // procedure to run (did seek = false).
-  anim.effect.timing.duration = 200 * MS_PER_SEC;
+  anim.effect.updateTiming({ duration: 200 * MS_PER_SEC });
   await waitForAnimationFrames(1);
 
   assert_equals(anim.currentTime, 150 * MS_PER_SEC,
@@ -348,7 +350,7 @@ promise_test(async t => {
 }, 'Finish notification steps run when the animation completes normally');
 
 promise_test(async t => {
-  const effect = new KeyframeEffectReadOnly(null, null, 1);
+  const effect = new KeyframeEffect(null, null, 1);
   const animation = new Animation(effect, document.timeline);
   animation.play();
   await animation.ready;
@@ -417,5 +419,38 @@ async_test(t => {
   };
 }, 'Animation finish event is fired again after replaying from start');
 
+async_test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { duration: 100000, endDelay: 50000 });
+  anim.onfinish = t.step_func(event => {
+    assert_unreached('finish event should not be fired');
+  });
+
+  anim.ready.then(() => {
+    anim.currentTime = 100000;
+    return waitForAnimationFrames(2);
+  }).then(t.step_func(() => {
+    t.done();
+  }));
+}, 'finish event is not fired at the end of the active interval when the'
+   + ' endDelay has not expired');
+
+async_test(t => {
+  const anim = createDiv(t).animate(null,
+                                    { duration: 100000, endDelay: 30000 });
+  anim.ready.then(() => {
+    anim.currentTime = 110000; // during endDelay
+    anim.onfinish = t.step_func(event => {
+      assert_unreached('onfinish event should not be fired during endDelay');
+    });
+    return waitForAnimationFrames(2);
+  }).then(t.step_func(() => {
+    anim.onfinish = t.step_func(event => {
+      t.done();
+    });
+    anim.currentTime = 130000; // after endTime
+  }));
+}, 'finish event is fired after the endDelay has expired');
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html
new file mode 100644
index 00000000000..c58502af011
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioWorkletNode's Disconnected Input Array Length
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Arbitrary numbers used to align the test with render quantum boundary.
+      // The sample rate is a power of two to eliminate roundoff in computing
+      // the suspend time needed for the test.
+      let sampleRate = 16384;
+      let renderLength = 8 * RENDER_QUANTUM_FRAMES;
+      let context;
+
+      let filePath = 'processors/input-length-processor.js';
+
+      let testChannelValues = [1, 2, 3];
+
+      // Creates a 3-channel buffer and play with BufferSourceNode. The source
+      // goes through a bypass AudioWorkletNode (gain value of 1).
+      audit.define(
+          {
+            label: 'test',
+            description:
+                'Input array length should be zero for disconnected input'
+          },
+          (task, should) => {
+            context = new OfflineAudioContext({
+              numberOfChannels: 1,
+              length: renderLength,
+              sampleRate: sampleRate
+            });
+
+            context.audioWorklet.addModule(filePath).then(() => {
+              let sourceNode = new ConstantSourceNode(context);
+              let workletNode =
+                  new AudioWorkletNode(context, 'input-length-processor');
+
+              workletNode.connect(context.destination);
+
+              // Connect the source now.
+              let connectFrame = RENDER_QUANTUM_FRAMES;
+
+              context.suspend(connectFrame / sampleRate)
+                  .then(() => {
+                    sourceNode.connect(workletNode);
+                  })
+                  .then(() => context.resume());
+              ;
+
+              // Then disconnect the source after a few renders
+              let disconnectFrame = 3 * RENDER_QUANTUM_FRAMES;
+              context.suspend(disconnectFrame / sampleRate)
+                  .then(() => {
+                    sourceNode.disconnect(workletNode);
+                  })
+                  .then(() => context.resume());
+
+              sourceNode.start();
+              context.startRendering()
+                  .then(resultBuffer => {
+                    let data = resultBuffer.getChannelData(0);
+
+                    should(
+                        data.slice(0, connectFrame),
+                        'Before connecting the source: Input array length')
+                        .beConstantValueOf(0);
+
+                    // Find where the output is no longer 0.
+                    let nonZeroIndex = data.findIndex(x => x > 0);
+                    should(nonZeroIndex, 'First non-zero output')
+                        .beEqualTo(connectFrame);
+
+                    should(
+                        data.slice(
+                            nonZeroIndex,
+                            nonZeroIndex + (disconnectFrame - connectFrame)),
+                        'While source is connected: Input array length')
+                        .beConstantValueOf(RENDER_QUANTUM_FRAMES);
+                    should(
+                        data.slice(disconnectFrame),
+                        'After disconnecting the source: Input array length')
+                        .beConstantValueOf(0);
+                  })
+                  .then(() => task.done());
+            });
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js
new file mode 100644
index 00000000000..cc0968d738c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js
@@ -0,0 +1,25 @@
+/**
+ * @class InputLengthProcessor
+ * @extends AudioWorkletProcessor
+ *
+ * This processor class just sets the output to the length of the
+ * input array for verifying that the input length changes when the
+ * input is disconnected.
+ */
+class InputLengthProcessor extends AudioWorkletProcessor {
+  constructor() {
+    super();
+  }
+
+  process(inputs, outputs, parameters) {
+    let input = inputs[0];
+    let output = outputs[0];
+
+    // Set output channel to the length of the input channel array.
+    output[0].fill(input[0].length);
+
+    return true;
+  }
+}
+
+registerProcessor('input-length-processor', InputLengthProcessor);
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py b/tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py
index 1aa9db2fdf3..88b79fba8f6 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py
@@ -36,7 +36,7 @@ def test_add_domain_cookie(session, url, server_config):
 
     assert cookie["name"] == "hello"
     assert cookie["value"] == "world"
-    assert cookie["domain"] == ".%s" % server_config["domains"][""]
+    assert cookie["domain"] == ".%s" % server_config["domains"][""] or cookie["domain"] == "%s" % server_config["domains"][""]
 
 def test_add_cookie_for_ip(session, url, server_config, configuration):
     session.url = "http://127.0.0.1:%s/common/blank.html" % (server_config["ports"]["http"][0])
@@ -175,4 +175,4 @@ def test_add_session_cookie_with_leading_dot_character_in_domain(session, url, s
 
     assert cookie["name"] == "hello"
     assert cookie["value"] == "world"
-    assert cookie["domain"] == ".%s" % server_config["domains"][""]
+    assert cookie["domain"] == ".%s" % server_config["domains"][""] or cookie["domain"] == "%s" % server_config["domains"][""]
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py
index d79d512a13c..2de03835186 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py
@@ -75,8 +75,18 @@ def test_xhtml_namespace(session, using, value):
 
 
 def test_parent_htmldocument(session):
+    session.url = inline("")
+    from_element = session.execute_script("""return document.querySelector("body")""")
+    expected = session.execute_script("return document.documentElement")
+
+    response = find_element(session, from_element.id, "xpath", "..")
+    value = assert_success(response)
+    assert_same_element(session, value, expected)
+
+
+def test_parent_of_document_node_errors(session):
     session.url = inline("")
     from_element = session.execute_script("return document.documentElement")
 
     response = find_element(session, from_element.id, "xpath", "..")
-    assert_success(response)
+    assert_error(response, "invalid selector")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py
index 486d7cb7aee..2edc0406c66 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py
@@ -79,9 +79,21 @@ def test_xhtml_namespace(session, using, value):
 
 def test_parent_htmldocument(session):
     session.url = inline("")
-    from_element = session.execute_script("return document.documentElement")
+    from_element = session.execute_script("""return document.querySelector("body")""")
+    expected = session.execute_script("return document.documentElement")
 
     response = find_elements(session, from_element.id, "xpath", "..")
     value = assert_success(response)
     assert isinstance(value, list)
     assert len(value) == 1
+
+    found_element = value[0]
+    assert_same_element(session, found_element, expected)
+
+
+def test_parent_of_document_node_errors(session):
+    session.url = inline("")
+    from_element = session.execute_script("return document.documentElement")
+
+    response = find_elements(session, from_element.id, "xpath", "..")
+    assert_error(response, "invalid selector")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index 76ae6a39f45..c20219ae7b3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -4,6 +4,7 @@ import json
 import os
 import urlparse
 import re
+import sys
 
 import webdriver
 
diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html
index 7ccbd395778..76d2f10d71f 100644
--- a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html
+++ b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html
@@ -105,4 +105,20 @@ async_test(t => {
 
   }, 'Closing and re-opening a channel works.');
 
+async_test(t => {
+  function workerCode() {
+    close();
+    var bc = new BroadcastChannel('worker-test');
+    postMessage(true);
+  }
+
+  var workerBlob = new Blob([workerCode.toSource() + ";workerCode();"], {type:"application/javascript"});
+
+  var w = new Worker(URL.createObjectURL(workerBlob));
+  w.onmessage = function(e) {
+    assert_true(e.data, "BroadcastChannel created on worker shutdown.");
+    t.done();
+  }
+}, 'BroadcastChannel created after a worker self.close()');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/worker.html b/tests/wpt/web-platform-tests/webmessaging/message-channels/worker.html
new file mode 100644
index 00000000000..be2155ee4b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webmessaging/message-channels/worker.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/comms.html#messageevent">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+async_test(t => {
+  function workerCode() {
+    close();
+    var mc = new MessageChannel();
+    mc.port1.postMessage(42);
+    mc.port2.postMessage(42);
+    postMessage(true);
+  }
+
+  var workerBlob = new Blob([workerCode.toSource() + ";workerCode();"], {type:"application/javascript"});
+
+  var w = new Worker(URL.createObjectURL(workerBlob));
+  w.onmessage = function(e) {
+    assert_true(e.data, "MessageChannel created on worker shutdown.");
+    t.done();
+  }
+}, 'MessageChannel/MessagePort created and used after a worker self.close()');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.html b/tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.html
new file mode 100644
index 00000000000..14128ef6f2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>W3C WebSocket API - Create WebSocket - on a worker after self.close()</title>
+    <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
+    <script type="text/javascript" src="websocket.sub.js"></script>
+</head>
+<body>
+    <div id="log"></div>
+    <script type="text/javascript">
+
+async_test(t => {
+  function workerCode() {
+    close();
+    var ws = new WebSocket(self.location)
+    postMessage(ws.readyState == WebSocket.CONNECTING);
+  }
+
+  var workerBlob = new Blob([workerCode.toSource() + ";workerCode();"], {type:"application/javascript"});
+
+  var w = new Worker(URL.createObjectURL(workerBlob));
+  w.onmessage = function(e) {
+    assert_true(e.data, "WebSocket created on worker shutdown.");
+    t.done();
+  }
+}, 'WebSocket created after a worker self.close()');
+
+    </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm b/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
index f67ea10e24b..b008348e58f 100644
--- a/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
+++ b/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
@@ -25,11 +25,8 @@
         location:null,
         defaultView:null,
         body:null,
-        images: undefined,
         doctype:null,
-        forms:undefined,
         all:undefined,
-        links: undefined,
         cookie:''
       }
 
@@ -94,13 +91,19 @@
         assert_equals(client.responseXML.cookie, "")
       }, 'cookie (after setting it)')
 
-      test(function() {
-        assert_equals(typeof(client.responseXML.styleSheets), "object")
-      }, 'styleSheets')
+      var objectProps = [
+        "styleSheets",
+        "implementation",
+        "images",
+        "forms",
+        "links",
+      ];
 
-      test(function() {
-        assert_equals(typeof(client.responseXML.implementation), "object")
-      }, 'implementation')
+      for (let prop of objectProps) {
+        test(function() {
+          assert_equals(typeof(client.responseXML[prop]), "object")
+        }, prop + " should be an object")
+      }
     </script>
   </body>
 </html>