From c67c5d4fb8380e7ce2b52cb7b0b11871d34190b2 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Fri, 11 Dec 2020 08:19:25 +0000
Subject: [PATCH] Update web-platform-tests to revision
 6ea3164d34a632b16b857d7474985b93acd8de11

---
 .../url/url-in-tags-revoke.window.js.ini      |   2 +-
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 .../css/css-paint-api/dynamic-import.html.ini |   2 +
 .../top-level-await.https.html.ini            |   2 +
 .../vh-support-transform-translate.html.ini   |   2 +
 .../offsetTopLeft-border-box.html.ini         |   7 -
 .../fetch/content-type/response.window.js.ini |  11 +-
 .../nosniff/parsing-nosniff.window.js.ini     |   2 +-
 .../traverse_the_history_1.html.ini           |   4 -
 .../traverse_the_history_4.html.ini           |   4 +
 ...ross-origin-objects-on-new-window.html.ini |   2 +
 .../sandboxing/sandbox-document-open.html.ini |   7 +
 .../form-double-submit-2.html.ini             |   4 +
 .../document-write/module-delayed.html.ini    |   4 +
 .../module-static-import-delayed.html.ini     |   4 +
 ...le-event-handler-settings-objects.html.ini |   3 -
 .../realtimeanalyser-fft-scaling.html.ini     |   1 +
 .../sub-sample-buffer-stitching.html.ini      |   6 +
 .../webmessaging/with-ports/018.html.ini      |   5 +
 .../url/url-in-tags-revoke.window.js.ini      |   2 +-
 tests/wpt/metadata/MANIFEST.json              | 831 +++++++++++++-----
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 .../css/css-paint-api/dynamic-import.html.ini |   2 +
 .../top-level-await.https.html.ini            |   2 +
 .../vh-support-transform-translate.html.ini   |   2 +
 .../offsetTopLeft-border-box.html.ini         |   7 -
 .../fetch/content-type/response.window.js.ini |  11 +-
 .../nosniff/parsing-nosniff.window.js.ini     |   2 +-
 .../traverse_the_history_1.html.ini           |   4 -
 .../traverse_the_history_4.html.ini           |   4 +
 ...ross-origin-objects-on-new-window.html.ini |   2 +
 .../sandboxing/sandbox-document-open.html.ini |   7 +
 .../form-double-submit-2.html.ini             |   4 +
 .../document-write/module-delayed.html.ini    |   4 +
 .../module-static-import-delayed.html.ini     |   4 +
 ...le-event-handler-settings-objects.html.ini |   3 -
 .../realtimeanalyser-fft-scaling.html.ini     |   1 +
 .../sub-sample-buffer-stitching.html.ini      |   6 +
 .../webmessaging/with-ports/018.html.ini      |   5 +
 .../.well-known/origin-policy                 |   2 +-
 ...yle-allowed-while-cloning-objects.sub.html |   2 +-
 .../style-src/style-blocked.sub.html          |   2 +-
 .../cookies/resources/cookie.py               |   2 +-
 .../content-visibility-079-ref.html           |   8 +
 .../content-visibility-079.html               |  16 +
 .../flex-minimum-height-flex-items-013.html   |   1 -
 .../grid-items/replaced-element-001.html      |  22 +
 .../grid-items/replaced-element-002.html      |  22 +
 .../grid-items/replaced-element-007.html      |  22 +
 .../grid-items/replaced-element-010.html      |  22 +
 .../mask-and-nested-clip-path.svg             |  16 +
 .../mask-and-nested-clip-path-ref.svg         |   3 +
 ...-containing-block-outside-spanner-ref.html |   1 +
 ...spos-containing-block-outside-spanner.html |   1 +
 .../overflow-negative-margin-dynamic.html     |  14 +
 .../overflow-negative-margin.html             |   7 +
 .../column-count-crash.https.html             |  39 +
 .../css/css-paint-api/dynamic-import-ref.html |  10 +
 .../css/css-paint-api/dynamic-import.html     |  37 +
 .../resources/imported-module.mjs             |   2 +
 .../css-paint-api/top-level-await-ref.html    |  10 +
 .../css-paint-api/top-level-await.https.html  |  34 +
 .../aspect-ratio/grid-aspect-ratio-001.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-002.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-003.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-004.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-005.html   |  23 +
 .../aspect-ratio/grid-aspect-ratio-006.html   |  23 +
 .../aspect-ratio/grid-aspect-ratio-007.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-008.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-009.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-010.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-011.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-012.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-013.html   |  22 +
 .../aspect-ratio/grid-aspect-ratio-014.html   |  22 +
 .../docs/writing-tests/server-features.md     |  12 +
 .../docs/writing-tests/wdspec.md              |   3 +-
 .../fetch/metadata/resources/post-to-owner.py |   4 +
 tests/wpt/web-platform-tests/html/README.md   |   3 +-
 .../sandboxing/resources/document-open.html   |  16 +
 .../sandboxing/sandbox-document-open.html     |  52 ++
 ...bout-blank-while-initial-load-pending.html |  26 +
 ...-colorManaged-convertToBlob-roundtrip.html |  10 +-
 .../canvas-createImageBitmap-e_srgb.html      |  28 +-
 ...as-createPutGetImageData-colorManaged.html |  30 +-
 .../canvas-draw-high-bit-depth-images.html    |  12 +-
 .../canvas-drawImage-e_srgb.html              |   6 +-
 .../canvas-drawImage-offscreenCanvas.html     |  17 +-
 .../canvas-getImageData-e_srgb.html           |   8 +-
 .../imageData-colorManagedBehavior.html       |  39 +-
 .../transferFromImageBitmap.html              |   9 +-
 .../summary-in-ol-ref.html                    |  20 +
 .../the-details-element/summary-in-ol.html    |  22 +
 .../packages-via-trailing-slashes.json        |  18 +-
 .../resources/tricky-specifiers.json          |  30 +-
 .../server/http2-websocket.sub.h2.any.js.ini  |  10 +
 .../server/http2-websocket.sub.h2.any.js      |  20 +
 .../server/wpt-server-wpt-flags.sub.html      |  32 +
 .../webdriver/tests/test_load_file.py         |   4 +-
 .../cross-document-root.html                  |  49 ++
 tests/wpt/web-platform-tests/lint.ignore      |  18 +-
 ...mediasource-webcodecs-addsourcebuffer.html |  16 +-
 .../showOpenFilePicker-manual.https.html      |  21 +
 .../showPicker-errors.https.window.js         |   6 +
 .../network-error-logging/support/nel.sub.js  |  50 ++
 ...cert_fetch_error-downgraded.tentative.html |   4 +-
 ...navigation-cert_fetch_error.tentative.html |   4 +-
 ...cert_parse_error-downgraded.tentative.html |   4 +-
 ...navigation-cert_parse_error.tentative.html |   4 +-
 ...rification_error-downgraded.tentative.html |   4 +-
 ...ion-cert_verification_error.tentative.html |   4 +-
 ...ailed-zero-success-fraction.tentative.html |   4 +-
 ...on-invalid_integrity_header.tentative.html |   4 +-
 ...porting-navigation-mi_error.tentative.html |   4 +-
 ...g-navigation-ok-no-referrer.tentative.html |   4 +-
 ...vigation-ok-origin-referrer.tentative.html |   4 +-
 ...sxg-reporting-navigation-ok.tentative.html |   4 +-
 ...ting-navigation-parse_error.tentative.html |   4 +-
 ...rification_error-downgraded.tentative.html |   4 +-
 ...ignature_verification_error.tentative.html |   4 +-
 ...e-header-integrity-mismatch.tentative.html |   4 +-
 .../web-platform-tests/tools/manifest/item.py |  16 +-
 .../tools/manifest/tests/test_item.py         |  22 +
 .../web-platform-tests/tools/serve/serve.py   |   1 +
 .../tools/third_party/h2/.gitignore           |  11 -
 .../tools/third_party/h2/.travis.yml          |  41 -
 .../tools/third_party/h2/CONTRIBUTORS.rst     |   3 +-
 .../tools/third_party/h2/HISTORY.rst          |  59 ++
 .../tools/third_party/h2/MANIFEST.in          |   3 +-
 .../tools/third_party/h2/docs/source/api.rst  |   5 +-
 .../h2/docs/source/basic-usage.rst            |  35 +-
 .../tools/third_party/h2/docs/source/conf.py  |   4 +-
 .../h2/docs/source/negotiating-http2.rst      |  11 +-
 .../h2/docs/source/twisted-head-example.rst   |   4 +-
 .../h2/docs/source/twisted-post-example.rst   |   2 +-
 .../h2/examples/asyncio/asyncio-server.py     | 103 ++-
 .../h2/examples/asyncio/wsgi-server.py        |   2 +-
 .../h2/examples/curio/curio-server.py         |  18 +-
 .../h2/examples/eventlet/eventlet-server.py   |   2 +-
 .../fragments/client_https_setup_fragment.py  |   2 +-
 .../fragments/client_upgrade_fragment.py      |   2 +-
 .../fragments/server_https_setup_fragment.py  |   2 +-
 .../fragments/server_upgrade_fragment.py      |   4 +-
 .../h2/examples/twisted/head_request.py       |   4 +-
 .../h2/examples/twisted/post_request.py       |   4 +-
 .../h2/examples/twisted/twisted-server.py     |  34 +-
 .../tools/third_party/h2/h2/__init__.py       |   2 +-
 .../tools/third_party/h2/h2/config.py         |   8 +-
 .../tools/third_party/h2/h2/connection.py     | 106 ++-
 .../tools/third_party/h2/h2/events.py         |  39 +-
 .../tools/third_party/h2/h2/settings.py       |  30 +-
 .../tools/third_party/h2/h2/stream.py         |  44 +-
 .../tools/third_party/h2/h2/utilities.py      |  45 +-
 .../tools/third_party/h2/setup.cfg            |   8 +
 .../tools/third_party/h2/setup.py             |  15 +-
 .../third_party/h2/test/test_basic_logic.py   |  29 +-
 .../h2/test/test_closed_streams.py            | 181 +++-
 .../tools/third_party/h2/test/test_events.py  |  17 +-
 .../h2/test/test_flow_control_window.py       |  36 +
 .../third_party/h2/test/test_h2_upgrade.py    |  14 +-
 .../third_party/h2/test/test_head_request.py  |  73 +-
 .../h2/test/test_invalid_frame_sequences.py   |  32 +-
 .../h2/test/test_invalid_headers.py           |   3 +-
 .../third_party/h2/test/test_settings.py      | 191 ++--
 .../third_party/h2/test/test_stream_reset.py  |  20 +-
 .../h2/test/test_utility_functions.py         |  50 +-
 .../third_party/h2/test_requirements.txt      |  10 +-
 .../tools/third_party/h2/tox.ini              |  42 +-
 .../tools/third_party/h2/utils/backport.sh    |   1 +
 .../tools/third_party/hyperframe/HISTORY.rst  |  12 +
 .../tools/third_party/hyperframe/PKG-INFO     |  18 +-
 .../hyperframe/hyperframe.egg-info/PKG-INFO   |  18 +-
 .../hyperframe/hyperframe/__init__.py         |   2 +-
 .../hyperframe/hyperframe/flags.py            |   7 +-
 .../hyperframe/hyperframe/frame.py            |   2 +
 .../tools/third_party/hyperframe/setup.cfg    |   3 +
 .../tools/third_party/hyperframe/setup.py     |   4 +-
 .../hyperframe/test/test_frames.py            |  47 +-
 .../tools/wptserve/wptserve/server.py         | 175 +++-
 .../wptserve/wptserve/ws_h2_handshake.py      | 247 ++++++
 ...t-policy-callback-arguments.tentative.html |   3 +
 .../webdriver/tests/accept_alert/accept.py    |   9 +-
 .../webdriver/tests/back/back.py              |  11 +-
 .../webdriver/tests/back/user_prompts.py      |   3 +-
 .../webdriver/tests/close_window/close.py     |   5 +-
 .../webdriver/tests/delete_session/delete.py  |   3 +-
 .../webdriver/tests/dismiss_alert/dismiss.py  |   9 +-
 .../webdriver/tests/element_clear/clear.py    |  43 +-
 .../tests/element_clear/user_prompts.py       |   7 +-
 .../webdriver/tests/element_click/bubbling.py |   7 +-
 .../tests/element_click/center_point.py       |  11 +-
 .../webdriver/tests/element_click/click.py    |   3 +-
 .../tests/element_click/file_upload.py        |   4 +-
 .../tests/element_click/interactability.py    |  21 +-
 .../webdriver/tests/element_click/navigate.py |  15 +-
 .../tests/element_click/scroll_into_view.py   |   6 +-
 .../webdriver/tests/element_click/select.py   |  25 +-
 .../tests/element_click/shadow_dom.py         |  17 +-
 .../webdriver/tests/element_click/stale.py    |   3 +-
 .../tests/element_click/user_prompts.py       |   7 +-
 .../element_send_keys/content_editable.py     |   9 +-
 .../tests/element_send_keys/events.py         |   7 +-
 .../tests/element_send_keys/file_upload.py    |  33 +-
 .../tests/element_send_keys/form_controls.py  |   9 +-
 .../element_send_keys/interactability.py      |  23 +-
 .../element_send_keys/scroll_into_view.py     |  12 +-
 .../tests/element_send_keys/send_keys.py      |   9 +-
 .../tests/element_send_keys/user_prompts.py   |   7 +-
 .../tests/execute_async_script/collections.py |  13 +-
 .../tests/execute_async_script/properties.py  |   9 +-
 .../tests/execute_script/collections.py       |  13 +-
 .../webdriver/tests/execute_script/cyclic.py  |   5 +-
 .../webdriver/tests/execute_script/execute.py |   5 +-
 .../tests/execute_script/properties.py        |   9 +-
 .../webdriver/tests/find_element/find.py      |  11 +-
 .../tests/find_element/user_prompts.py        |   7 +-
 .../tests/find_element_from_element/find.py   |  17 +-
 .../find_element_from_element/user_prompts.py |   7 +-
 .../webdriver/tests/find_elements/find.py     |  11 +-
 .../tests/find_elements/user_prompts.py       |   7 +-
 .../tests/find_elements_from_element/find.py  |  17 +-
 .../user_prompts.py                           |   7 +-
 .../webdriver/tests/forward/forward.py        |  13 +-
 .../webdriver/tests/forward/user_prompts.py   |   3 +-
 .../webdriver/tests/get_active_element/get.py |  13 +-
 .../tests/get_active_element/user_prompts.py  |   7 +-
 .../webdriver/tests/get_alert_text/get.py     |   7 +-
 .../webdriver/tests/get_current_url/get.py    |  14 +-
 .../webdriver/tests/get_current_url/iframe.py |  24 +-
 .../tests/get_current_url/user_prompts.py     |   7 +-
 .../tests/get_element_attribute/get.py        |   9 +-
 .../get_element_attribute/user_prompts.py     |   7 +-
 .../tests/get_element_css_value/get.py        |   8 +-
 .../get_element_css_value/user_prompts.py     |   7 +-
 .../tests/get_element_property/get.py         |  15 +-
 .../get_element_property/user_prompts.py      |   7 +-
 .../webdriver/tests/get_element_rect/get.py   |   5 +-
 .../tests/get_element_rect/user_prompts.py    |   7 +-
 .../tests/get_element_tag_name/get.py         |   5 +-
 .../get_element_tag_name/user_prompts.py      |   7 +-
 .../webdriver/tests/get_element_text/get.py   |   5 +-
 .../tests/get_element_text/user_prompts.py    |   7 +-
 .../webdriver/tests/get_named_cookie/get.py   |   3 +-
 .../webdriver/tests/get_page_source/source.py |   3 +-
 .../tests/get_page_source/user_prompts.py     |   7 +-
 .../webdriver/tests/get_title/get.py          |  11 +-
 .../webdriver/tests/get_title/iframe.py       |  26 +-
 .../webdriver/tests/get_title/user_prompts.py |   9 +-
 .../webdriver/tests/get_window_rect/get.py    |   4 -
 .../tests/is_element_enabled/enabled.py       |  21 +-
 .../tests/is_element_enabled/user_prompts.py  |   7 +-
 .../tests/is_element_selected/selected.py     |  22 +-
 .../tests/is_element_selected/user_prompts.py |   7 +-
 .../webdriver/tests/navigate_to/navigate.py   |   5 +-
 .../tests/navigate_to/user_prompts.py         |   7 +-
 .../webdriver/tests/new_window/new_tab.py     |   3 +-
 .../webdriver/tests/new_window/new_window.py  |   3 +-
 .../tests/perform_actions/pointer.py          |  10 +-
 .../tests/perform_actions/pointer_origin.py   |  32 +-
 .../perform_actions/pointer_tripleclick.py    |   3 +-
 .../webdriver/tests/print/printcmd.py         |   3 +-
 .../webdriver/tests/print/user_prompts.py     |   7 +-
 .../webdriver/tests/refresh/refresh.py        |  13 +-
 .../webdriver/tests/refresh/user_prompts.py   |   7 +-
 .../webdriver/tests/send_alert_text/send.py   |   5 +-
 .../webdriver/tests/support/fixtures.py       |  46 +-
 .../webdriver/tests/support/inline.py         |  30 +-
 .../tests/switch_to_frame/cross_origin.py     |   5 +-
 .../webdriver/tests/switch_to_frame/switch.py |  10 +-
 .../tests/switch_to_frame/switch_number.py    |   7 +-
 .../switch_to_frame/switch_webelement.py      |  17 +-
 .../tests/switch_to_parent_frame/switch.py    |   7 +-
 .../tests/switch_to_window/switch.py          |   5 +-
 .../tests/take_element_screenshot/iframe.py   |   5 +-
 .../take_element_screenshot/screenshot.py     |   7 +-
 .../take_element_screenshot/user_prompts.py   |   7 +-
 .../webdriver/tests/take_screenshot/iframe.py |   7 +-
 .../tests/take_screenshot/screenshot.py       |   5 +-
 .../tests/take_screenshot/user_prompts.py     |   7 +-
 .../websockets/constants.js                   |   3 +
 .../wpt/web-platform-tests/worklets/META.yml  |   3 +-
 .../wpt/web-platform-tests/worklets/README.md |   2 +-
 .../xhr/resources/auth5/auth.py               |   4 +-
 284 files changed, 3792 insertions(+), 1407 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-paint-api/dynamic-import.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-paint-api/top-level-await.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-values/vh-support-transform-translate.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-document-open.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/dynamic-import.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/top-level-await.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-values/vh-support-transform-translate.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/sandboxing/sandbox-document-open.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-013.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html
 create mode 100644 tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/h2/.gitignore
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/h2/.travis.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-paint-api/dynamic-import.html.ini b/tests/wpt/metadata-layout-2020/css/css-paint-api/dynamic-import.html.ini
new file mode 100644
index 00000000000..3019c251714
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-paint-api/dynamic-import.html.ini
@@ -0,0 +1,2 @@
+[dynamic-import.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-paint-api/top-level-await.https.html.ini b/tests/wpt/metadata-layout-2020/css/css-paint-api/top-level-await.https.html.ini
new file mode 100644
index 00000000000..92d137159e7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-paint-api/top-level-await.https.html.ini
@@ -0,0 +1,2 @@
+[top-level-await.https.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-values/vh-support-transform-translate.html.ini b/tests/wpt/metadata-layout-2020/css/css-values/vh-support-transform-translate.html.ini
new file mode 100644
index 00000000000..3d0102bd597
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-values/vh-support-transform-translate.html.ini
@@ -0,0 +1,2 @@
+[vh-support-transform-translate.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 668cbe97319..b358b7b7bf5 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,27 +309,18 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index aa6eb8f6085..70efd28ddfc 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20'NosniFF']
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-document-open.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-document-open.html.ini
new file mode 100644
index 00000000000..b65074d1c0c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-document-open.html.ini
@@ -0,0 +1,7 @@
+[sandbox-document-open.html]
+  [other_document.open()]
+    expected: FAIL
+
+  [document.open()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index e4597c10612..19fb9228018 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -386,3 +386,9 @@
   [X SNR (-480.9982135660622 dB) is not greater than or equal to 65.737. Got -480.9982135660622.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t3.8483718720978944e+16\t9.3139332532882690e-1\t3.8483718720978944e+16\t4.1318439454558392e+16\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.8483718720978944e+16 at index of 28696.\n\tMax RelError of 4.1318439454558392e+16 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-288.2714546901987 dB) is not greater than or equal to 65.737. Got -288.2714546901987.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ab6c534af4d..b0e970adc46 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -351,6 +351,15 @@
       ]
      ]
     },
+    "css-paint-api": {
+     "column-count-crash.https.html": [
+      "8e774499b8037b65a1201563a7939ca435e375e6",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-position": {
      "nested-positions-crash.html": [
       "dbc272fa093b154be09ea2843d01da50003aa690",
@@ -17567,7 +17576,7 @@
      ]
     ],
     "showOpenFilePicker-manual.https.html": [
-     "370aa45c57807baca125219a65866cba9d029a59",
+     "e6405a9c8c6c0fdea68edf74bd41dfc6572dbd42",
      [
       null,
       {}
@@ -134596,6 +134605,19 @@
         ],
         {}
        ]
+      ],
+      "content-visibility-079.html": [
+       "9a8b46bf5c69507289150deb707b518234de8eab",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/content-visibility/content-visibility-079-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "counter-scoping-001.html": [
@@ -140350,7 +140372,7 @@
       ]
      ],
      "flex-minimum-height-flex-items-013.html": [
-      "9989b6463780fad120724ab52998353958650c81",
+      "a039c4ac5f4e21e3b54476b644ca9129f8e5f046",
       [
        null,
        [
@@ -151938,6 +151960,58 @@
         {}
        ]
       ],
+      "replaced-element-001.html": [
+       "b29b67a01aa47b32b13f7866fb8f03efe07bbd0c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-002.html": [
+       "b8101c439995b77005934bca209090639af6942f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-007.html": [
+       "61284df75858851aba1707dde375ad2e19556810",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-010.html": [
+       "83672297f99aae1c737372d1b1560ffd6a9ab2d3",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "table-with-infinite-max-intrinsic-width.html": [
        "877e982cd4c5987f131587da33a23f3b7a49d538",
        [
@@ -160557,6 +160631,19 @@
         {}
        ]
       ],
+      "mask-and-nested-clip-path.svg": [
+       "725f9557523d2c7c84bc6ba591044603ab3a56fb",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mask-nested-clip-path-001.svg": [
        "0dc0f7c0f2e38e8aea52a1a3e84a0ae4b35c6829",
        [
@@ -160970,7 +161057,7 @@
     },
     "css-multicol": {
      "abspos-containing-block-outside-spanner.html": [
-      "2a9ee38df5f3d7c3758c71764304f37974926b23",
+      "ed832d39f621322064c3b6c3da390809d9cab7d5",
       [
        null,
        [
@@ -165172,6 +165259,32 @@
        {}
       ]
      ],
+     "overflow-negative-margin-dynamic.html": [
+      "5eec139521adec4a2c6a9687e2e18cd0fbdea181",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "overflow-negative-margin.html": [
+      "070ab62f7f6717449bf9ca431684111296af347e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflow-recalc-001.html": [
       "9c5919a5044bdbac0e782fbb662f1ff3b81857fc",
       [
@@ -165941,6 +166054,19 @@
        {}
       ]
      ],
+     "dynamic-import.html": [
+      "62957fcd4b77c799ebb70f788e8c23b5ca0ef677",
+      [
+       null,
+       [
+        [
+         "/css/css-paint-api/dynamic-import-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "geometry-background-image-001.https.html": [
       "50d75a54703c32fdea3b74890b1f8f3a0e7a55f4",
       [
@@ -167113,6 +167239,19 @@
        {}
       ]
      ],
+     "top-level-await.https.html": [
+      "8a0855cc9781a428f7494dd73592a108381c5418",
+      [
+       null,
+       [
+        [
+         "/css/css-paint-api/top-level-await-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "two-custom-property-animation.https.html": [
       "6669076e909c273d2c63b34c91a29e443065a248",
       [
@@ -175979,6 +176118,188 @@
         {}
        ]
       ],
+      "grid-aspect-ratio-001.html": [
+       "ce91fe4e4e8b2bb7f610fb230a292f59188ff95b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-002.html": [
+       "6e79ddfc5b18848f684eb4f8444f41d2a5904117",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-003.html": [
+       "4c6631605c8b996a3a07217b129d4e73a59ed412",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-004.html": [
+       "fd17748099f6b1ef0ec1dff36ebed9d7fce4ff55",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-005.html": [
+       "76dbf9162a51eac362ce135a4053d254c3f97f33",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-006.html": [
+       "b61a3c094d19765e5579556ea1050fd14633966f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-007.html": [
+       "c788215a2e56e082d78e936505be104181664f7d",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-008.html": [
+       "e23aa367038dd71fd6a4539c12a69e0eb8ff4818",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-009.html": [
+       "ddd6aa2b9534d1b7a7a666cebc47e26ceb8b049a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-010.html": [
+       "9f24dfd8182b9da412383ef365d03d1a0954e9c1",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-011.html": [
+       "4fc923f755190955fa779b4a5b6e3657b08d3474",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-012.html": [
+       "c74f1162210e4537c0bee30be913460a1f79a964",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-013.html": [
+       "e52db16721a1a082bd86b24d87bfa4709838669c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-aspect-ratio-014.html": [
+       "1bec95ea5392588f99107361448686d11295c3f7",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "intrinsic-size-001.html": [
        "5b2c6049bd935c928f29c50bf4ad7afae41c4576",
        [
@@ -246563,6 +246884,19 @@
         {}
        ]
       ],
+      "summary-in-ol.html": [
+       "0f380bf058968f76fa19be40b95d52e5a81de094",
+       [
+        null,
+        [
+         [
+          "/html/rendering/the-details-element/summary-in-ol-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "summary-text-decoration.html": [
        "80bbd44c46c3b5e07c64eeb959c9642e156eab3f",
        [
@@ -257408,7 +257742,7 @@
      ]
     },
     "origin-policy": [
-     "d0de31e693cb7fa593c7b0147981646341ab7d34",
+     "2f0e9d0525ac8b1de6dcaa1d53597af309889374",
      []
     ]
    },
@@ -282283,7 +282617,7 @@
       []
      ],
      "cookie.py": [
-      "9710b518e21c317dc103722835b334c7843636d8",
+      "63eedf0b01ef6b23bef5668fbb8fbf6cfab060bb",
       []
      ],
      "drop.py": [
@@ -302897,6 +303231,10 @@
        "64629ca11977c77e4b1420881c5bc59a50816323",
        []
       ],
+      "content-visibility-079-ref.html": [
+       "416f23e8ca6aff4cd121a1c6b7a77945accd433e",
+       []
+      ],
       "inline-container-with-child-ref.html": [
        "af51cbd5db8f3eff56411345860548e95fe4d354",
        []
@@ -314450,6 +314788,10 @@
         "fa2cb815e101438d21ed9bec69f1b9d4e451c7e3",
         []
        ],
+       "mask-and-nested-clip-path-ref.svg": [
+        "8aed79967e1507ce183f3a5c3f002ea54ee87fd8",
+        []
+       ],
        "mask-content-clip-001-ref.svg": [
         "0aa523330490cc4d2c5daca24155cfb9394dc7ae",
         []
@@ -314559,7 +314901,7 @@
       []
      ],
      "abspos-containing-block-outside-spanner-ref.html": [
-      "a221907f0072087766caf4d4828f07166442e53f",
+      "c1322438b92872bc77a47ffc88242e61d39ca535",
       []
      ],
      "balance-grid-container-ref.html": [
@@ -315936,6 +316278,10 @@
       "d66536456ec321b5235b95a9c4239b082da399d0",
       []
      ],
+     "dynamic-import-ref.html": [
+      "6c598aee3937a1f19c4058fb0b84cfafa8e67880",
+      []
+     ],
      "geometry-background-image-001-ref.html": [
       "3e7db50548e0ddd1739ab91db24e29072d267061",
       []
@@ -316063,6 +316409,10 @@
        "e34419263f954e010b3eeb419820d40bdf7b71c5",
        []
       ],
+      "imported-module.mjs": [
+       "2a23b334143b92e1388fea23d9b5d793dfbd25f5",
+       []
+      ],
       "utils.js": [
        "e9686441361326b996c73bfd084bd2f5a0bb1648",
        []
@@ -316084,6 +316434,10 @@
       "8f337c5be8b1a0804d2d02e86fa70e9c9e94c9a9",
       []
      ],
+     "top-level-await-ref.html": [
+      "b135021a0a13bb8c8b0116ff33ca5dc49248e548",
+      []
+     ],
      "two-custom-property-animation-ref.html": [
       "fa364bde34988eaf021c762ffb9b5776f20df402",
       []
@@ -333225,7 +333579,7 @@
       []
      ],
      "server-features.md": [
-      "980a27d3d02f01b04ad9ff164b2da61eef8478d9",
+      "a1ba09132c5a40591321b0532dab1c3008987c2b",
       []
      ],
      "server-pipes.md": [
@@ -333269,7 +333623,7 @@
       []
      ],
      "wdspec.md": [
-      "16bdb9365f002c471d0c7c90147ed284624a9556",
+      "1943fb9e943612ded2d1b77217e2d73f14908676",
       []
      ]
     }
@@ -336700,7 +337054,7 @@
        []
       ],
       "post-to-owner.py": [
-       "4890c49acbdfb557b9ef679b0a3cc82952305c0f",
+       "256dd6e49dcca90d503b9b7c2a4d1cf04cb330d0",
        []
       ],
       "record-header.py": [
@@ -337966,7 +338320,7 @@
      []
     ],
     "README.md": [
-     "11e5bcf81c4069835a7f801dff75f287bfb2abea",
+     "2a444bd5a75e385d1a68618c16f302a4df682246",
      []
     ],
     "browsers": {
@@ -338940,6 +339294,10 @@
         "0dc95315f164d693bd7bd0622880781f30bad7a1",
         []
        ],
+       "document-open.html": [
+        "c53c9fbfe3d8b486bb88acd3761ced781edd3fa3",
+        []
+       ],
        "post-done-to-opener.html": [
         "b47f0f274ef43148d3be418e2c0628a567f1c3c1",
         []
@@ -346183,6 +346541,10 @@
        "31e98d3fdca8fff9fe88929c8075643fca3abb40",
        []
       ],
+      "summary-in-ol-ref.html": [
+       "bb6f79b62709f6be0c1d1cad94a99aeff24f81ec",
+       []
+      ],
       "summary-text-decoration-ref.html": [
        "8b6105fd2ec3eaa17ff9f18e50acfe989c4878af",
        []
@@ -350302,7 +350664,7 @@
        []
       ],
       "packages-via-trailing-slashes.json": [
-       "6ff330cc5a73c15cb9ccabe88376b811ccffff02",
+       "9f2ac99250e88fdf565eebdb98b47ab615962f62",
        []
       ],
       "parsing-addresses-absolute.json": [
@@ -350370,7 +350732,7 @@
        []
       ],
       "tricky-specifiers.json": [
-       "d9c80c9475000587643f52d500c0c4d588640f4a",
+       "998fe7fb67dba2ad132ef9f8499b929419f323a5",
        []
       ],
       "url-specifiers-schemes-internal.json": [
@@ -350644,6 +351006,10 @@
         "2bd49967c7cdd1bf0d6382a5bdd826365f7186e7",
         []
        ],
+       "http2-websocket.sub.h2.any.js.ini": [
+        "6b7394fd13b4ae5c673cdd370756b6af0ccc688a",
+        []
+       ],
        "order-of-metas.any.js.ini": [
         "23387657b41e99385f8fb9cbc0e46a7dd2626164",
         []
@@ -351831,7 +352197,7 @@
     ]
    },
    "lint.ignore": [
-    "20f90ed585c7063bda1b5504c35c17a0fffe3a23",
+    "e63b152d7ec9d9eb23ee7052346a7e2408b207d3",
     []
    ],
    "loading": {
@@ -353829,7 +354195,7 @@
       []
      ],
      "nel.sub.js": [
-      "8fa83505320c997b877b9b4883cf2d96993afe84",
+      "51a01a082e8ee3e0ee3fd0f23f140b5fac926d0a",
       []
      ],
      "no-policy-pass.png": [
@@ -362771,7 +363137,7 @@
       []
      ],
      "item.py": [
-      "9a43a68f1fbcc97715c5446b823f022596d6cb01",
+      "857c8485dd02552298e48fa9fae17646c4c02f42",
       []
      ],
      "jsonlib.py": [
@@ -362804,7 +363170,7 @@
        []
       ],
       "test_item.py": [
-       "4f2fc8f03f2d611f35e0a352c708060606fd1a77",
+       "dd1c4e2004dac9f2584ddf34e7e2408f987914f7",
        []
       ],
       "test_manifest.py": [
@@ -362995,7 +363361,7 @@
       []
      ],
      "serve.py": [
-      "3a1c782794a32b92869e67ab07903c209558fb7a",
+      "8fdbdc6bc671090107a5e6479cf16ebda076d084",
       []
      ],
      "test_functional.py": [
@@ -364101,20 +364467,12 @@
       }
      },
      "h2": {
-      ".gitignore": [
-       "9d19e106e3ce4ffa975e054f77e6d2b8a522c942",
-       []
-      ],
-      ".travis.yml": [
-       "7b5a4686c5834d79b76595975eae884a0a9f7526",
-       []
-      ],
       "CONTRIBUTORS.rst": [
-       "bdc4d06c31a0f689f7a82607c7b3c156a2f59ade",
+       "5c4849fef0f1074b2765e63fc575f6756456d2b9",
        []
       ],
       "HISTORY.rst": [
-       "e9fa745d516273f23a8087fdc215445d5d0696de",
+       "5244cd8a941cc9097bf2b035bb25bafeb7e48f8f",
        []
       ],
       "LICENSE": [
@@ -364122,7 +364480,7 @@
        []
       ],
       "MANIFEST.in": [
-       "3c8b988533e2e17ccafcd95e26a6570a63f47a61",
+       "04400de6b7d1f7d387d68c59bc31e897a79ac2fd",
        []
       ],
       "Makefile": [
@@ -364162,7 +364520,7 @@
          []
         ],
         "api.rst": [
-         "2c71d38d16dda59886ad8dc1f45709caa945b6d7",
+         "a46f8cce7d4b1e63855770e21db9d50c7d206249",
          []
         ],
         "asyncio-example.rst": [
@@ -364170,11 +364528,11 @@
          []
         ],
         "basic-usage.rst": [
-         "2d5743a288cdc7c63528a0fddd47ba300e882870",
+         "b9aab6c6cf88da8f09513df31dfae6903a9fbd72",
          []
         ],
         "conf.py": [
-         "a3b3e8a4b998801c18a20cd40c25c6b55f9d81eb",
+         "a15a214634c6a99dc3d6d894cfc1d9e34c16abc0",
          []
         ],
         "contributors.rst": [
@@ -364206,7 +364564,7 @@
          []
         ],
         "negotiating-http2.rst": [
-         "d4c72b2889e0675eb5b295ae5dda3dfb2a938595",
+         "20d58a71f1be8e9fd955017b4757eda5684761b5",
          []
         ],
         "release-notes.rst": [
@@ -364230,11 +364588,11 @@
          []
         ],
         "twisted-head-example.rst": [
-         "20753527ca3612523dd8771cc578412762d79a62",
+         "df93b144e71789ee5979b33a1a5600e902db0af4",
          []
         ],
         "twisted-post-example.rst": [
-         "21bc8ac09f34d5684f21e4475b9d8eb70469e6cd",
+         "7e3aba41a38e94d5d0192463528a6e93210d5ecf",
          []
         ],
         "wsgi-example.rst": [
@@ -364246,7 +364604,7 @@
       "examples": {
        "asyncio": {
         "asyncio-server.py": [
-         "0e5b912e2dfa3003c3b550a863181c0ebc77c152",
+         "278774644bc8e031d162facfbbbc29e11d909252",
          []
         ],
         "cert.crt": [
@@ -364258,13 +364616,13 @@
          []
         ],
         "wsgi-server.py": [
-         "09ab2ce054176b65dad8aafa25f48ec01206835d",
+         "9fdb2fa0fc3072f1f6a178032cfc47dd10d205ff",
          []
         ]
        },
        "curio": {
         "curio-server.py": [
-         "01604b44e6ffe83cca9c862a062a7bf58e75adad",
+         "f93d4db9d040e30519303f02383b12201352ff41",
          []
         ],
         "localhost.crt.pem": [
@@ -364278,7 +364636,7 @@
        },
        "eventlet": {
         "eventlet-server.py": [
-         "ff34e2f9ccda5ed3427b27c360e96b7ffe10aa41",
+         "a46cfb3d158278baa42c08934644001b450a7966",
          []
         ],
         "server.crt": [
@@ -364292,19 +364650,19 @@
        },
        "fragments": {
         "client_https_setup_fragment.py": [
-         "9958c1bd72670c8c1baa4121495f32f498dc996c",
+         "269194d6c770cd3ae00131164a2c1be882ba0075",
          []
         ],
         "client_upgrade_fragment.py": [
-         "34ff298cd97d718913d062b64f392a72c0bbaf4c",
+         "f45c002df7463b962173aea2d927dbdb8c75e037",
          []
         ],
         "server_https_setup_fragment.py": [
-         "14ec0ef237de033a9a87b033ada4dfab0927d1ef",
+         "9fc361f2c6229afa70b5642b7faac4f4cdbedfd7",
          []
         ],
         "server_upgrade_fragment.py": [
-         "5b77c05fe0d886f51c98f81ffbc0e93c0a6a5e6c",
+         "7e8b1f0eea80971c0f6bee5a043e3647ec58225d",
          []
         ]
        },
@@ -364324,11 +364682,11 @@
        },
        "twisted": {
         "head_request.py": [
-         "72fe5f88918b64bf94aa61442fcf3e9cfd34c131",
+         "4a7538024a958c80e681762467d8d91a3a7ec421",
          []
         ],
         "post_request.py": [
-         "746f13266a28e4be03dfce5bd01048dd064f3733",
+         "c817bac465fb4f12f52af0bbafce0b32b03575b2",
          []
         ],
         "server.crt": [
@@ -364344,22 +364702,22 @@
          []
         ],
         "twisted-server.py": [
-         "7cde609db0cb52be15a455e1cdba3569a77a4fd6",
+         "75a271d9b79da8e2cf71636f338254542abeafbe",
          []
         ]
        }
       },
       "h2": {
        "__init__.py": [
-        "38805dd770ddcc079bfdfaab0124a9af58d61e2c",
+        "6290710e634de789b96a427012ccbe60593bf73a",
         []
        ],
        "config.py": [
-        "08129a40668ef54ef141567b889c257933b1d270",
+        "1c437ee24f843523d90bf668b10ab64b5712089c",
         []
        ],
        "connection.py": [
-        "4405183e866925f47b7167c2b861b353dc5c2ff7",
+        "35e6fd6da88936a9d10c8e839b613fd631eb3be3",
         []
        ],
        "errors.py": [
@@ -364367,7 +364725,7 @@
         []
        ],
        "events.py": [
-        "ff3ec3df313ffc7d6bb563132f8c45eba9243d5a",
+        "a06c9903d5a8a2eeee37c228e4a811d572f3ce8b",
         []
        ],
        "exceptions.py": [
@@ -364379,15 +364737,15 @@
         []
        ],
        "settings.py": [
-        "3da720329cb98790f2e4e7de5e1c88cd18071835",
+        "bf87c94f4e8cfd5efc02b4ef6ec0802f319efaf1",
         []
        ],
        "stream.py": [
-        "489ea4d8d6f518604c7bc8bcffce5b4deded4b4e",
+        "1cb91786d4254c9fb1d274c38418347c2738427a",
         []
        ],
        "utilities.py": [
-        "0cff0fa67106eec10468f5726138da743ec7369d",
+        "06c916eea7b9798f718be511b30b44700dd833ae",
         []
        ],
        "windows.py": [
@@ -364396,11 +364754,11 @@
        ]
       },
       "setup.cfg": [
-       "5e4090017a9bec5de60a745d17007a9e95f31a43",
+       "3670507ff12e02b6d076cf984ebda0d0527945d0",
        []
       ],
       "setup.py": [
-       "d3b77f9d7900b0bc30ab3f37af4682a960bf1936",
+       "1ce95d5796dc9fc690b626387c416f8457f63eb0",
        []
       ],
       "test": {
@@ -364417,11 +364775,11 @@
         []
        ],
        "test_basic_logic.py": [
-        "3cfc7cc7e8ca7c4d9c344973265ca5f6b58a5508",
+        "7df99a6a571c46ce17b9ac4002be5f01e274357e",
         []
        ],
        "test_closed_streams.py": [
-        "2344f72d6a1a4ec87690f4de4783267af0c48133",
+        "631a66787af0d353750c7812845dbca950e77fe0",
         []
        ],
        "test_complex_logic.py": [
@@ -364433,7 +364791,7 @@
         []
        ],
        "test_events.py": [
-        "06f7da39c7bee3ec66357435e38bc90ba5c78071",
+        "a6e8d837906680d65ca6df59bca2c1e754603b36",
         []
        ],
        "test_exceptions.py": [
@@ -364441,15 +364799,15 @@
         []
        ],
        "test_flow_control_window.py": [
-        "380cd61e3b19abc47ef773521e89f464566b8a4f",
+        "24b345aac3a3fea7b7a5151af2d405b0d6cdb148",
         []
        ],
        "test_h2_upgrade.py": [
-        "1d4eac67f64720d0fa823af5e8a83b87ebec87ab",
+        "d63d44f3f78c20eefabe5a6c18d6b0227a9db1ca",
         []
        ],
        "test_head_request.py": [
-        "313bf12a7c312390bffcd66273474d4815282d2e",
+        "ef73007254e47a99bb73e9052cee1dd0f3b2016e",
         []
        ],
        "test_header_indexing.py": [
@@ -364469,11 +364827,11 @@
         []
        ],
        "test_invalid_frame_sequences.py": [
-        "1f2f6c77aae9803a6b6e55ebef5522c0d8d54732",
+        "12b70c4a6bcb6d1b7e4252407898933c3f9c9aaf",
         []
        ],
        "test_invalid_headers.py": [
-        "1a315ee26acf15e58a7094403a317435421fd56c",
+        "a379950733d8b783dd67d70fad4b442a4fc4bacd",
         []
        ],
        "test_priority.py": [
@@ -364489,7 +364847,7 @@
         []
        ],
        "test_settings.py": [
-        "2163bb9b8d4442f266421a2106f57d889e9681ce",
+        "d19f93a7c2ed28eed4e408eb28948e1e194b2fb4",
         []
        ],
        "test_state_machines.py": [
@@ -364497,25 +364855,25 @@
         []
        ],
        "test_stream_reset.py": [
-        "08886e8e3ed23c71033e2ef35d2cb52af0a610e1",
+        "778445515fa244631f0e5dfe3bdb9b9c6885e164",
         []
        ],
        "test_utility_functions.py": [
-        "61d527f688baa94229269d446d4365a17cef161e",
+        "4cb0b2ae6085afbf0bffc67a4edf7b4f7cb0285b",
         []
        ]
       },
       "test_requirements.txt": [
-       "35bcbc2f091a87119895d1114ff4cdc8c855f98b",
+       "e0eefa28acfb788c633219aa4beca324715b105b",
        []
       ],
       "tox.ini": [
-       "a3d6c4a785b1c51936205d970911f65116262cb5",
+       "971f9a07e93c8c34a1f8d9366aff83bac7133afc",
        []
       ],
       "utils": {
        "backport.sh": [
-        "3f5d0767994742326f20f5a6b58d8746d5bd2a81",
+        "273c1479b27bdc95e99b3d59c9be449483aa2b02",
         []
        ]
       },
@@ -365474,7 +365832,7 @@
        []
       ],
       "HISTORY.rst": [
-       "22cd87eb3458ddb27042dd488cf365ecdbe90033",
+       "172b2b91baf9e9df95500a3e69b48949fdd97546",
        []
       ],
       "LICENSE": [
@@ -365486,7 +365844,7 @@
        []
       ],
       "PKG-INFO": [
-       "393c1e8d86d043489c2210132241d9fcce6ea55c",
+       "cfd53f7e93836f13d4475d3bc40fa5634952381a",
        []
       ],
       "README.rst": [
@@ -365495,7 +365853,7 @@
       ],
       "hyperframe": {
        "__init__.py": [
-        "8fd1cd3388b53c7c9706535b8312016521947df0",
+        "7620b4bdf7f145be9a8d69353498a3cceac7c91b",
         []
        ],
        "exceptions.py": [
@@ -365503,17 +365861,17 @@
         []
        ],
        "flags.py": [
-        "05b35017e702cf0e254973e143ad50ca9e6c1265",
+        "1660bd1800a244f5dff8f42c160584935ff6c71f",
         []
        ],
        "frame.py": [
-        "5294768a28803521955297d8e52fa28d9ffa1b4b",
+        "795057279b57e507c1db697d38422267db884a07",
         []
        ]
       },
       "hyperframe.egg-info": {
        "PKG-INFO": [
-        "393c1e8d86d043489c2210132241d9fcce6ea55c",
+        "cfd53f7e93836f13d4475d3bc40fa5634952381a",
         []
        ],
        "SOURCES.txt": [
@@ -365530,11 +365888,11 @@
        ]
       },
       "setup.cfg": [
-       "1e3eb367c1161c310faa3b46b3aeb700eae37cca",
+       "50220e135bc4cc0eb0f1dbd691441d280075204b",
        []
       ],
       "setup.py": [
-       "8f13c2639f51e467bd91376bfe4cb27574a0d2b9",
+       "1ab7212141630ed41396ebee43cb3c20529181f2",
        []
       ],
       "test": {
@@ -365543,7 +365901,7 @@
         []
        ],
        "test_frames.py": [
-        "948349a91e7eecf7eca1db4da3a0edca487201ed",
+        "abfecb692dc33a351b1eb63a8c03a8ef9463ce39",
         []
        ]
       }
@@ -369958,7 +370316,7 @@
        []
       ],
       "server.py": [
-       "d6c61965d96de90ed747f1afaea703219f9e5074",
+       "d4472811e593e0232d3ffe86536479e68b11808f",
        []
       ],
       "sslutils": {
@@ -369990,6 +370348,10 @@
       "wptserve.py": [
        "816c8a5a6aaec2ae985c3fb3ceebd1259a5a4f23",
        []
+      ],
+      "ws_h2_handshake.py": [
+       "98796c0baf9e1887bad5958340b9fb17d2c0175a",
+       []
       ]
      }
     }
@@ -372038,7 +372400,7 @@
        []
       ],
       "fixtures.py": [
-       "3eb5ffd26fa5f8e1f909b98214024dffefc704fe",
+       "78a8a981e353b970fccb58f085b67d3c03a54820",
        []
       ],
       "helpers.py": [
@@ -372076,7 +372438,7 @@
        []
       ],
       "inline.py": [
-       "d23ca75d1c807bb1d9f0683bae891c61d940d49d",
+       "39e926dd09a37ace65636d9fab6652ccbf1e94d4",
        []
       ],
       "merge_dictionaries.py": [
@@ -372416,7 +372778,7 @@
      []
     ],
     "constants.js": [
-     "cb17767f48c30863395f00d977080dd5e0501291",
+     "1f19b5307f3e7d1dbb3d2bbe4fb4d0ca172a512a",
      []
     ],
     "cookies": {
@@ -375854,11 +376216,11 @@
    },
    "worklets": {
     "META.yml": [
-     "5c92c43c538bba5cc8e9ac14bd5bff1716c5ae4d",
+     "b037fe099b1baabf7220d3e305cfd15c60d4e09c",
      []
     ],
     "README.md": [
-     "027b23216d52963201211f2cb020dd9f0b0aba27",
+     "b06ea33cd926fd99d890b0dd7544213170a15e8e",
      []
     ],
     "resources": {
@@ -376192,7 +376554,7 @@
      },
      "auth5": {
       "auth.py": [
-       "e18319e3de8e03121f7d6a612c2da9549f0489a7",
+       "43b376e6e87afaf928052a1f689e726d1347c749",
        []
       ]
      },
@@ -397882,7 +398244,7 @@
       ]
      ],
      "inline-style-allowed-while-cloning-objects.sub.html": [
-      "d222743049e3777cbece37b6bbc3b717b6eca262",
+      "e99699410e00b5756a08dc7148e75388b40a3410",
       [
        null,
        {}
@@ -397931,7 +398293,7 @@
       ]
      ],
      "style-blocked.sub.html": [
-      "4e590722d57a8708ecca4bc6b564fdaee1675748",
+      "3356ef8d5fb3d52684a43b713db584bd9433244f",
       [
        null,
        {}
@@ -458266,6 +458628,13 @@
         {}
        ]
       ],
+      "sandbox-document-open.html": [
+       "8c6c220291c19b19c058c5fa041c36ae05f3b769",
+       [
+        null,
+        {}
+       ]
+      ],
       "sandbox-initial-empty-document-toward-same-origin.html": [
        "d1306c970322682f3979c497a5decd78218ba845",
        [
@@ -458692,6 +459061,13 @@
         ]
        ]
       },
+      "navigate-to-about-blank-while-initial-load-pending.html": [
+       "3a0def8ae6671a4f6a824a6c2ae4b346e5ed2863",
+       [
+        null,
+        {}
+       ]
+      ],
       "noopener-noreferrer-BarProp.window.js": [
        "a75a0346501a80ceef91d25ed250a2957f42cfb9",
        [
@@ -462807,7 +463183,7 @@
          ]
         ],
         "canvas-colorManaged-convertToBlob-roundtrip.html": [
-         "efb2665a8a5a5b8f1997cd1a1a0128c2785c6b6a",
+         "75bd34da3d13c1d1433f5ac21af38173949239fd",
          [
           null,
           {}
@@ -462828,56 +463204,56 @@
          ]
         ],
         "canvas-createImageBitmap-e_srgb.html": [
-         "72b8e278c600d38e431f7a73ff529386a4c0bbbc",
+         "9046a758c01b165271f429d5633cecbee992ad94",
          [
           null,
           {}
          ]
         ],
         "canvas-createPutGetImageData-colorManaged.html": [
-         "c72dc97cd0cfd1fa9dccbe7316ef20ff11441599",
+         "b58d78ffafc36a4afcd57ceba0cc1d1e0d312513",
          [
           null,
           {}
          ]
         ],
         "canvas-draw-high-bit-depth-images.html": [
-         "9907c4e2cf57a0229c7c871f5d7fecc697a3e5a3",
+         "d830d6ea335a4aa414f6b3923dcf17a8ce4da70f",
          [
           null,
           {}
          ]
         ],
         "canvas-drawImage-e_srgb.html": [
-         "b6ff5f4657a19d316dbdcde819e77179b94563d8",
+         "793cd920338bb4992ea77cf9e748c6a34ccc2056",
          [
           null,
           {}
          ]
         ],
         "canvas-drawImage-offscreenCanvas.html": [
-         "7edbc5ee3c9f819d1f925942bebb50eec1681022",
+         "aebcea3c1d14b1d78595df79a4d11a3171676b79",
          [
           null,
           {}
          ]
         ],
         "canvas-getImageData-e_srgb.html": [
-         "cfc6428d0d0c89ffc9e1aac62dece459d739ed04",
+         "03e0d29720d67f628650eb62b04bf0ab1614fc39",
          [
           null,
           {}
          ]
         ],
         "imageData-colorManagedBehavior.html": [
-         "737d2b6ec730dbe5a11eb5f92326b75074548536",
+         "c82bf4cc74b9b8c3c33084b9e631f925f7f17f9b",
          [
           null,
           {}
          ]
         ],
         "transferFromImageBitmap.html": [
-         "ff8abeb897f287568169e4555f7317d2b6f334e0",
+         "1b90396154969711550ba9090374f6307ff1f77a",
          [
           null,
           {}
@@ -495763,6 +496139,17 @@
        }
       ]
      ],
+     "http2-websocket.sub.h2.any.js": [
+      "617f9ca4e0ad1effa51db62cb5149375cce208c6",
+      [
+       "infrastructure/server/http2-websocket.sub.h2.any.html",
+       {}
+      ],
+      [
+       "infrastructure/server/http2-websocket.sub.h2.any.worker.html",
+       {}
+      ]
+     ],
      "order-of-metas.any.js": [
       "20f678475c348498d5d5faad9740fddb32c424c1",
       [
@@ -496004,6 +496391,21 @@
        null,
        {}
       ]
+     ],
+     "wpt-server-wpt-flags.sub.html": [
+      "9af9cda4631de949791005698bcc1ff64f1083ba",
+      [
+       null,
+       {}
+      ],
+      [
+       "infrastructure/server/wpt-server-wpt-flags.sub.html?wpt_flags=h2",
+       {}
+      ],
+      [
+       "infrastructure/server/wpt-server-wpt-flags.sub.html?wpt_flags=https",
+       {}
+      ]
      ]
     },
     "testdriver": {
@@ -496589,6 +496991,13 @@
       {}
      ]
     ],
+    "cross-document-root.html": [
+     "9288bf5806920e1eebd556448e3a0440a58e0c6c",
+     [
+      null,
+      {}
+     ]
+    ],
     "cross-origin-iframe.sub.html": [
      "d444237f6b954b08952c502a510e7ead785c2eec",
      [
@@ -500523,7 +500932,7 @@
     "mse-for-webcodecs": {
      "tentative": {
       "mediasource-webcodecs-addsourcebuffer.html": [
-       "a9dd7072b0758d58bac67c13dcb78c76dc6aa669",
+       "cc9cdc2b50185c7a5acae91a9a221b8ea164b8b0",
        [
         null,
         {}
@@ -503799,7 +504208,7 @@
      ]
     ],
     "showPicker-errors.https.window.js": [
-     "d1dabf37da8305094bf7e0bd0fea4e0200d8dd2e",
+     "ecc64dfe66d6dd9611b33c75cd2504d11814eaf7",
      [
       "native-file-system/showPicker-errors.https.window.html",
       {
@@ -529528,63 +529937,63 @@
     ],
     "reporting": {
      "sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html": [
-      "420eaaaf260877a33a22c039543690e40e970b62",
+      "ce20c4726e9197c12064ed159ca36f83207bd9e9",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-cert_fetch_error.tentative.html": [
-      "bab50b7f885f083a63bbf92fc31791617b3c7c48",
+      "15a7176e749b85a8d7f84b73e86075dc22754a61",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html": [
-      "99c5c7b910bd517ef9f41aafa3ff69f0a6d0ee61",
+      "e6cdad035e1956a30d24033dafa4ae355f628017",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-cert_parse_error.tentative.html": [
-      "0fd0c8c35d76e1c197278666100830a8b8854413",
+      "a0cc607bf5f5e6962ab8f52f76ef239c632d1a4c",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html": [
-      "042f7d7094dec77bf4a372088101dccbac3a014a",
+      "d3ad4204f2e56d69df49795d36de22ae2ca4bdaa",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-cert_verification_error.tentative.html": [
-      "feb705d01012f6c21d5359492340520aead11eaa",
+      "04fd0e785c07bae64458d178a2b7e491f3451542",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-failed-zero-success-fraction.tentative.html": [
-      "477eb55d6c7aae1d4b47e3b0b775e438bcbef519",
+      "a92735f714a5f6dcb4756e0c26b2582c2d47c70f",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-invalid_integrity_header.tentative.html": [
-      "9d8852cb10d93909c502cc486cbbfc3d1d023858",
+      "3e00d9dbe369e1cf1a9648b049cf301228f8efea",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-mi_error.tentative.html": [
-      "b31f3d0a34c9fc999fc0b13fad9956b28f730cb6",
+      "b6d7ba3b1add960de95409cd71235d47582ecd4b",
       [
        null,
        {
@@ -529593,28 +530002,28 @@
       ]
      ],
      "sxg-reporting-navigation-ok-no-referrer.tentative.html": [
-      "b9e7286ab6d98941171b46ad4b3e51822cefab38",
+      "b6cadbca505e50a3faf165f424decce15dc59e00",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-ok-origin-referrer.tentative.html": [
-      "737c4833d1358cb75fe7d446238c2e59ab88d6b0",
+      "351ad927820eee342a3a993d326e2ec277c8738b",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-ok.tentative.html": [
-      "61c9bbdce6d7b2772fb67050aacc6b97397f77b2",
+      "0afa626d09dc02c55b42673ddd30a36fa887df33",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-parse_error.tentative.html": [
-      "444d281378dda3017991c713f4b3e4fc126735ef",
+      "95cd140cea9e627879b87507f3731024eb99d1d9",
       [
        null,
        {
@@ -529623,14 +530032,14 @@
       ]
      ],
      "sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html": [
-      "c92fc6c245d056543b26cc28ab391753907c7d7e",
+      "2679ae5a6c7416ee6fc9382a7debf7732babe748",
       [
        null,
        {}
       ]
      ],
      "sxg-reporting-navigation-signature_verification_error.tentative.html": [
-      "8c77317bd5960edf1733c7db5710806fc5a950ca",
+      "f3e0b8f0e6e1d8f351febc8ca109e1e07bdb293b",
       [
        null,
        {}
@@ -529746,7 +530155,7 @@
     },
     "subresource": {
      "sxg-subresource-header-integrity-mismatch.tentative.html": [
-      "26e63b9a4a51950ff407bf6f17bd5806b1acf620",
+      "a7f42d94616aefab92903fc08d75dd479bfc3e6f",
       [
        null,
        {}
@@ -538682,7 +539091,7 @@
      ]
     ],
     "default-policy-callback-arguments.tentative.html": [
-     "5944b0e92d67117a8140430dc96028cc3d8ab8ce",
+     "a4a9c9e351289142b963ec8c56b4e4dbcbe0a639",
      [
       null,
       {}
@@ -585684,7 +586093,7 @@
     "webdriver": {
      "tests": {
       "test_load_file.py": [
-       "370e63c22374c6d3cfee18479e60bc55ca992a3f",
+       "084df8f09a864b54c08a5360636bde4165999e6c",
        [
         null,
         {}
@@ -585697,7 +586106,7 @@
     "tests": {
      "accept_alert": {
       "accept.py": [
-       "711ad5af79f2d07ec0119d673f391f31b0b77324",
+       "940733659ebe52c7ed49e5005e84fa57d28abf8c",
        [
         null,
         {}
@@ -585724,14 +586133,14 @@
      },
      "back": {
       "back.py": [
-       "5b50bc1bbb566e47b88e00b5a4f23d19caa70b64",
+       "ee82adf81ca707704743da4c677e74d9450c8bae",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "7121f7c6b2a63da99c8e4ca1956c181d8d675684",
+       "9d04f0f4ab12d98f0313639013fce4f26869a753",
        [
         null,
         {
@@ -585742,7 +586151,7 @@
      },
      "close_window": {
       "close.py": [
-       "2d665d5a8836df3f5bca6928d6fb6fe58d9b87db",
+       "7b382fa9bbcb297081027391e9ac052840be48f7",
        [
         null,
         {}
@@ -585796,7 +586205,7 @@
      },
      "delete_session": {
       "delete.py": [
-       "d0b4d796308e20d057df0a02edc3a9ed428d21eb",
+       "a3032cc13475bf2980b360d9d140e2d2f58a9034",
        [
         null,
         {}
@@ -585805,7 +586214,7 @@
      },
      "dismiss_alert": {
       "dismiss.py": [
-       "da65bac388dfc6c854c681a363631965553357fc",
+       "63874ade63210a3418067d3a6182c6ecd2e67af0",
        [
         null,
         {}
@@ -585814,7 +586223,7 @@
      },
      "element_clear": {
       "clear.py": [
-       "8b7bb501043f79f41611fb9724ab64ba76d53e19",
+       "b65f443aa75806e694efbbf8103669e1cd39c681",
        [
         null,
         {
@@ -585823,7 +586232,7 @@
        ]
       ],
       "user_prompts.py": [
-       "cfb850e08d5afe1e06266694c27b4bbfdbc66b17",
+       "7a8564a684a7edc5d1af0812b3353f2f5ccba629",
        [
         null,
         {
@@ -585834,77 +586243,77 @@
      },
      "element_click": {
       "bubbling.py": [
-       "a069a5a5df3d7f2bd2851eb4f1a2f9aecdeed86c",
+       "7620ec3224fc228e57fe42614d978bbb48b0a97a",
        [
         null,
         {}
        ]
       ],
       "center_point.py": [
-       "da60a087277dc96ec456d250072a441fa78aec75",
+       "ef0c9a7fe27d2532f1ba04d416e6fa3397579fe1",
        [
         null,
         {}
        ]
       ],
       "click.py": [
-       "50982fe4bdd8add9e1f10a9df60e1104238c71c9",
+       "b1b10162e4d62b3bf22867c6543d84a16d5c4ac1",
        [
         null,
         {}
        ]
       ],
       "file_upload.py": [
-       "cd5bb434204d7259e3e4e964164e06c9418c59bb",
+       "73832d0f85ae683ee2d1f54e9c0b7e3e432e9afd",
        [
         null,
         {}
        ]
       ],
       "interactability.py": [
-       "7463d493e3d8bd2b56c4b01ff5c9fd758c6fff03",
+       "d55860c8746f33ba86468fbfc9952363f01e7110",
        [
         null,
         {}
        ]
       ],
       "navigate.py": [
-       "548587cd2b60c24469d0f21fff400e9a39b820e9",
+       "c537fabe2e288d5b2839a4bf6cd2635935801d6a",
        [
         null,
         {}
        ]
       ],
       "scroll_into_view.py": [
-       "4b026e986a210159920b14f85342f02f860a8e05",
+       "c2dc6485286efc1f65679772d515c31c0d584686",
        [
         null,
         {}
        ]
       ],
       "select.py": [
-       "dcf92e645894187bafcc0acf735cdeeeecd2d088",
+       "62d40755b59bc39c8dc4650a03c7ad7127c31013",
        [
         null,
         {}
        ]
       ],
       "shadow_dom.py": [
-       "b52f27429c1965804cbcbb691a74a53a9c10bfdb",
+       "45493b730d6957027af46f1314290d13aaab40af",
        [
         null,
         {}
        ]
       ],
       "stale.py": [
-       "cd24dd70603dc913d198fcb9a0535acb5e95c1c5",
+       "8d2ae348ef4f774d972ab5f36f3ed312357179bc",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "b3706fe4af164c643d3857fa5a056445ab597b51",
+       "140aceb3cedfe84ec8f9a3ac0285497b6e670285",
        [
         null,
         {
@@ -585915,56 +586324,56 @@
      },
      "element_send_keys": {
       "content_editable.py": [
-       "16ebc2d018fb7ef18669c089375881ba68236d10",
+       "7f628f96a53a00ab86fe7d77af390a4397482067",
        [
         null,
         {}
        ]
       ],
       "events.py": [
-       "41b00ef37fa24154231a485bbc45da036f40e717",
+       "4be1432bf3c2e02c8ea8a9f7bb034f9739ed0de6",
        [
         null,
         {}
        ]
       ],
       "file_upload.py": [
-       "7fbab8a66aa4e53f0fd207bc3b0d4bfea0147efa",
+       "ef792f4dd855555147139f9329a13f5a30188381",
        [
         null,
         {}
        ]
       ],
       "form_controls.py": [
-       "e53d0610f1ed99cdd8c9b257759ba99effa93d36",
+       "0403dc92372eeadaae2a0237d8014349ec65fe8c",
        [
         null,
         {}
        ]
       ],
       "interactability.py": [
-       "0717537ae5d802e3fd71a47cb45aac452c513e77",
+       "273843fb7b46a31aadf6387ad4815b58a251b4ea",
        [
         null,
         {}
        ]
       ],
       "scroll_into_view.py": [
-       "18f87ffaaec6dfcecacff42b8af0ad187f29f953",
+       "205c4e30e1edfa261017028e9093b6da490aa9c1",
        [
         null,
         {}
        ]
       ],
       "send_keys.py": [
-       "acdc1164a406ee6364492c6d12bd70f4fa025db5",
+       "aa393e16d814dbdc2f6db16fe1d22d963073e2a7",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "621bdffa6642817684f2a919d3c07103793522dd",
+       "c1046840fa4ef24a5e063d09aee8c58803e835f7",
        [
         null,
         {
@@ -585975,7 +586384,7 @@
      },
      "execute_async_script": {
       "collections.py": [
-       "484a247cffd9a12acd8024f48fa3db7de59db8d3",
+       "d3f197e41b58f4f38ddd1abca261c442ef6a7b9f",
        [
         null,
         {}
@@ -585996,7 +586405,7 @@
        ]
       ],
       "properties.py": [
-       "394ae3294cd31707dc523310a403996cd8021276",
+       "e51b3e3ea579019e8b9e29ff3ccd4a375a0a39d9",
        [
         null,
         {}
@@ -586014,21 +586423,21 @@
      },
      "execute_script": {
       "collections.py": [
-       "be0b3a018c505dc26bb2b44969617a9b9daa0793",
+       "cce32b641551e6f1d36a55937fcab42ea84111ab",
        [
         null,
         {}
        ]
       ],
       "cyclic.py": [
-       "16bdcdd1dea5f27753cc525a754dffae3b589005",
+       "e3094f89f3b7e0d5305a9a1726a2f424f38717f3",
        [
         null,
         {}
        ]
       ],
       "execute.py": [
-       "bd719b27859eeaf3018d2f7b1a9f6225cf7a30e7",
+       "1d1511be376de511958e1028f23da11683bfa3a7",
        [
         null,
         {}
@@ -586049,7 +586458,7 @@
        ]
       ],
       "properties.py": [
-       "2be4f1f3ccc9720b223dba4ffcb710cc590100d9",
+       "51999936e71aae5584f73ba661d5e355cf0a732e",
        [
         null,
         {}
@@ -586067,14 +586476,14 @@
      },
      "find_element": {
       "find.py": [
-       "9f0911d56dc09546c3d831785ce7da9f5876f44f",
+       "4510617da5a619711fb0a4f521364317c6ae4a88",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "613466b62b51c3ff32d59b3b37879e4f76e4091d",
+       "ada8e8ebee33a6ce9fcfb4871093ce1eef1d1dae",
        [
         null,
         {
@@ -586085,14 +586494,14 @@
      },
      "find_element_from_element": {
       "find.py": [
-       "aa648117976b6d783e89a25750a62c53607a69c4",
+       "879de3713f99a49541aff37a4685ae29df18eec0",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "3fdaf4e47ed73a009881e074d81096d4a4b6e267",
+       "0537a786189c41420f50e6c3b747482c331fdaa3",
        [
         null,
         {
@@ -586103,14 +586512,14 @@
      },
      "find_elements": {
       "find.py": [
-       "c1381a0e82ac63ede924700407af1c75d93a24fe",
+       "47f009739385619235d46f09f541fcc6799a1756",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "01eb8ff3c863899f8ccd3f0f3bb7b6fd9433157e",
+       "f9a45e527515fc7448162a86dca69d3f95e76491",
        [
         null,
         {
@@ -586121,14 +586530,14 @@
      },
      "find_elements_from_element": {
       "find.py": [
-       "5c267ba6479e0e7847ffe3356dbfc7afb0baac60",
+       "ae6f976e9f9785b5d882257b6aefa2bc6c818030",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "ca7bc7735d087689e3c057e2a46251bce1378e42",
+       "467bec09a1bd61346b3df2fa5b0b8c16e02fe975",
        [
         null,
         {
@@ -586139,14 +586548,14 @@
      },
      "forward": {
       "forward.py": [
-       "d71bbd1102147b48d7efeab3d0dffa28ee3f9f6b",
+       "d77ad2c61b5a7df0fb4cb2e9644f5b02a62e3861",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "e5eea8f4457145eb5619fc28b625c7042b07e0b3",
+       "3eeaf6e71cdb7311614b271257f4cd6d19a2e619",
        [
         null,
         {
@@ -586184,14 +586593,14 @@
      },
      "get_active_element": {
       "get.py": [
-       "7f821f3a40d5923069c67a3781ed3686507e18bd",
+       "1085ad82f18f3f705ead6b9bac421b7ed07b0a2f",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "7fa7be1dde994bfb41a0212b5c997c220b273d37",
+       "1ff77697b707886bbfeaee8acf08bdb8aba2de38",
        [
         null,
         {
@@ -586202,7 +586611,7 @@
      },
      "get_alert_text": {
       "get.py": [
-       "b64678653e085f849bca6e56d83b58fb54c1964d",
+       "abf23c570b8cf2556b8807bf813f85f3afe21b3d",
        [
         null,
         {}
@@ -586211,21 +586620,21 @@
      },
      "get_current_url": {
       "get.py": [
-       "0383a8aba9e906309091227017aa231f3ecc7a15",
+       "fa2ff6a6595f165987f13ad7a7ad60fd6e3cbb44",
        [
         null,
         {}
        ]
       ],
       "iframe.py": [
-       "944e61b583fd305eb9069082a39c586761cdd39c",
+       "80a960ce8a15e831941b4bf97ab6375b64b70ea7",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "f0e95d12f14e2fb4337476a8ccf883a06c0e5c5d",
+       "d657c188241d8e0b53153d6b0e64fd386642847a",
        [
         null,
         {
@@ -586236,14 +586645,14 @@
      },
      "get_element_attribute": {
       "get.py": [
-       "f67a6c3d7c0ac63b8eac1cf800e6ca855a526366",
+       "661dccd39b1e02f8bc0c0205d5ee44637a252c08",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "5ee7929afdf8447772ca78ce4cdc532144945f0c",
+       "009cb1e5fa1e1bdf4a9b433fe943f6ee4a97506d",
        [
         null,
         {
@@ -586254,14 +586663,14 @@
      },
      "get_element_css_value": {
       "get.py": [
-       "25fae26a69c549173f8504ffdc340c6a9f100280",
+       "369ca9c699f883ba59dab171c4f6d7b80e35164d",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "529b6ae9183d3c7a343521e739cfe0b788c4b290",
+       "b1f9a3fb0a00f17c9c5bd5b590c8628d7888ea2e",
        [
         null,
         {
@@ -586272,14 +586681,14 @@
      },
      "get_element_property": {
       "get.py": [
-       "27b4bea5f173d83f4ef3517acc650ede136cf281",
+       "ea3db1e406b77547951e61a05325465cfe84692f",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "16a098536fde814b5ac8bcb35dac01ac38649d2e",
+       "e5e76947863e61ca082a66367e3ea876b8ebec73",
        [
         null,
         {
@@ -586290,14 +586699,14 @@
      },
      "get_element_rect": {
       "get.py": [
-       "d461c01c3120dc5aa95bb893b1f84544a9429bce",
+       "9ab4db4c604ff93a22a88ae3917db7cd8a47d396",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "c51866cb8758ad03554413aecafd42c13c1bc194",
+       "20131603381bc574e44251a6909e389457dd0059",
        [
         null,
         {
@@ -586308,14 +586717,14 @@
      },
      "get_element_tag_name": {
       "get.py": [
-       "4ca818f76a5704b5875be5e22206840c3a248d4d",
+       "cfc63bd788de2e38d7c092aeaea61a78411f1b65",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "12a7d448421efde32b276d531b91089c4584a7e5",
+       "89697d0ad6a20503d6ec906862d58e674ed90839",
        [
         null,
         {
@@ -586326,14 +586735,14 @@
      },
      "get_element_text": {
       "get.py": [
-       "642bc1d2c62298a6dc9e9f4d38b2a63345027c6d",
+       "72dc0cf735e51aeeb0a098497c5793cbc59493e1",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "1ee5cde4da52eefcf16417c48b9eb0109cef50b4",
+       "9f0bb386cdf549ae1edbb7843fe893bd74700212",
        [
         null,
         {
@@ -586344,7 +586753,7 @@
      },
      "get_named_cookie": {
       "get.py": [
-       "102c18f0275cf94fcd1c18291010758c5c171f38",
+       "ccc355a195341ac10dfba7456e52cf4d957599b6",
        [
         null,
         {}
@@ -586362,14 +586771,14 @@
      },
      "get_page_source": {
       "source.py": [
-       "5484ccbf2eefb5f022cde55e13efe0575cce99e3",
+       "cc4e208835c8620ac5d665db69babb5b2adef1dc",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "3b0cdff97dd963fcb22aa88f1ece437a11a29117",
+       "13cb31595e6165ffb6e3491661d630921ade5699",
        [
         null,
         {
@@ -586389,21 +586798,21 @@
      },
      "get_title": {
       "get.py": [
-       "34405774ba06e5fbe74bb9ffffbe2b7e7f62a38e",
+       "a173094839aac80acd280562d3eb1a35bf1e8c3a",
        [
         null,
         {}
        ]
       ],
       "iframe.py": [
-       "5991bf3590691f69cacba4e45fd23a3595d1fb99",
+       "9c5ab0b595d33ce38b419da1565445c9d7e221e0",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "76d65c088a0b94e8cefb976e91edf5492a5aae20",
+       "0fd51e46f32ab5c5a6a14392afe08a0cf725115a",
        [
         null,
         {
@@ -586450,7 +586859,7 @@
      },
      "get_window_rect": {
       "get.py": [
-       "793650feef4613dd83764f361ef38313801c0513",
+       "f7592a30e067030f3c6433bc2419db06c0db8da8",
        [
         null,
         {}
@@ -586477,14 +586886,14 @@
      },
      "is_element_enabled": {
       "enabled.py": [
-       "64058ebd577e23c55a81a745fa63a9228f98d28c",
+       "4a5a92ba5e912d1120a0a2fc1732eeaba7b901ac",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "bd8bc81bdfcce13e5cdbfec336749cd668bd68ef",
+       "5dd7d582bd3d80a3d3affc4052bc933d75bcbca6",
        [
         null,
         {
@@ -586495,14 +586904,14 @@
      },
      "is_element_selected": {
       "selected.py": [
-       "b09927c7a12e0c7cbc235a204bec990f8530ebff",
+       "6c8e8155cab17be937b1e259ed6ec67ac38d4235",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "674f80c5c75b8aa66172af89c151a3e0dfccfc61",
+       "96da2c08bd7e5465ed12eb49cede25d70a6fbef5",
        [
         null,
         {
@@ -586571,14 +586980,14 @@
      },
      "navigate_to": {
       "navigate.py": [
-       "b577ecdf96da77174bd4b360fb9a5e385584ff75",
+       "c0ba49d475d63b8e228144c9b30feaeceb3cc132",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "6a94c11bf1d3391ec969a23b94536ac7f86c2a3b",
+       "682bc40f4fe9d4b530b406a74b1451bbf88a5d75",
        [
         null,
         {
@@ -586669,14 +587078,14 @@
        ]
       ],
       "new_tab.py": [
-       "9300b04c45fa4d4149afebea3a6d4ea30fd18478",
+       "270e4b51b88fba539616859efb8a922cc0cecb36",
        [
         null,
         {}
        ]
       ],
       "new_window.py": [
-       "b34854cc2f3f0e6643956827c48b7548cb3b3212",
+       "d3c224502704eff04975f0dbe800a929d819de46",
        [
         null,
         {}
@@ -586738,7 +587147,7 @@
        ]
       ],
       "pointer.py": [
-       "1cb824fc8ecf130d64fe65fe60a7745654dc2480",
+       "9579a57aa7222d8a1f9517ad71735e86ec8a0e47",
        [
         null,
         {
@@ -586768,7 +587177,7 @@
        ]
       ],
       "pointer_origin.py": [
-       "4c9dc879e999fde1803e9ac000f3757b94b854b8",
+       "c4e5db7a00176ed647561b5db9c7f896e67e42c1",
        [
         null,
         {}
@@ -586782,7 +587191,7 @@
        ]
       ],
       "pointer_tripleclick.py": [
-       "81d51be1a7e6cfeba63528f4bea58343c9f7cc48",
+       "3bf41bab849d5de742f8707eb98337e24ebbfb6d",
        [
         null,
         {}
@@ -586832,14 +587241,14 @@
      },
      "print": {
       "printcmd.py": [
-       "341e069f7bb6491d6c9fcefea0728ff34b39d1bd",
+       "e043056dd12aa5a6863041e0c4c9b8f5ae0cac1c",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "a3f7a10ac372d192bc4af3cde260133fcf26f733",
+       "2022796774bf76b93b5f0f844991c557c79df383",
        [
         null,
         {
@@ -586850,14 +587259,14 @@
      },
      "refresh": {
       "refresh.py": [
-       "eef413017e5e0d1162c60a080b7a5f3819a8ea74",
+       "33595d0ff71ad6b493e83dd0a998f38e114007bf",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "b8ef418e115fcdafa861dcb8f61b01116e9e81f6",
+       "7e944b53b0964e68b897e6315faa0cfa65802143",
        [
         null,
         {
@@ -586886,7 +587295,7 @@
      },
      "send_alert_text": {
       "send.py": [
-       "5da67590da34e4e91b8413e687633324e1b8f534",
+       "d5846ad56b3b4903d4cee24f919b7eb55dc4d226",
        [
         null,
         {}
@@ -586942,28 +587351,28 @@
      },
      "switch_to_frame": {
       "cross_origin.py": [
-       "905f1eb56dce07ea82e0de7c5755e2e1b50ed152",
+       "ec345c1cfc3fdc70c57b375634d2d87fa882524b",
        [
         null,
         {}
        ]
       ],
       "switch.py": [
-       "33ea967f801144d1958a2fdb4ba269d09351de5a",
+       "07994bed34931940c15aa4f722809c809fd6d20c",
        [
         null,
         {}
        ]
       ],
       "switch_number.py": [
-       "77529544679aacdc30bb2c36eb553808ed5edac6",
+       "c8858e77ff10478e982d911f030a615470987df6",
        [
         null,
         {}
        ]
       ],
       "switch_webelement.py": [
-       "89480b66b3a66e171d8e04eb6cff65c0f8d55b62",
+       "7677a5215b9d7932bde07c26e92d310f972a4242",
        [
         null,
         {}
@@ -586972,7 +587381,7 @@
      },
      "switch_to_parent_frame": {
       "switch.py": [
-       "d23dc522a1307d9ef9a2768522e9934d18407f96",
+       "e05e11953c971b0d45bf24b899d5f0342f5ea305",
        [
         null,
         {}
@@ -586988,7 +587397,7 @@
        ]
       ],
       "switch.py": [
-       "88a1a244b2d27bcf60f1be55752b3633863b4ad6",
+       "f480784fb5f13791486b5a1a7624b3b41da0f795",
        [
         null,
         {}
@@ -586997,21 +587406,21 @@
      },
      "take_element_screenshot": {
       "iframe.py": [
-       "83f55deff753a4525839d3c0675acfb459f64395",
+       "e7f1b0c8053db0fedbb37c0a1b528a259591813f",
        [
         null,
         {}
        ]
       ],
       "screenshot.py": [
-       "6ff6396edb2a6f312e56c4e6433ff35044078363",
+       "4d3bfb0e5c68b4a73253010e199606866f90ee03",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "5d1b497ff2c4dcda6b1d5d14d9fd99c4c282809c",
+       "39fefe9325a9bf2880d333d48a58337edb3508cd",
        [
         null,
         {
@@ -587022,21 +587431,21 @@
      },
      "take_screenshot": {
       "iframe.py": [
-       "601c039d56de0aa2937ac73675ba59792cbdcd17",
+       "81881c1dae7345b41f6301b880d06141b12624c9",
        [
         null,
         {}
        ]
       ],
       "screenshot.py": [
-       "d6130919167afce4476e0a31e3e34da31c09f0e9",
+       "9e71a633c708b628b40fe8e3be143d36c821a8f9",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "ad9e3695148d63153db8aacbe3b8444a814d5ba3",
+       "7d57f8f2716b393696fb3ce45ded196d83a0bf68",
        [
         null,
         {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-paint-api/dynamic-import.html.ini b/tests/wpt/metadata/css/css-paint-api/dynamic-import.html.ini
new file mode 100644
index 00000000000..3019c251714
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/dynamic-import.html.ini
@@ -0,0 +1,2 @@
+[dynamic-import.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/css/css-paint-api/top-level-await.https.html.ini b/tests/wpt/metadata/css/css-paint-api/top-level-await.https.html.ini
new file mode 100644
index 00000000000..92d137159e7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/top-level-await.https.html.ini
@@ -0,0 +1,2 @@
+[top-level-await.https.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-values/vh-support-transform-translate.html.ini b/tests/wpt/metadata/css/css-values/vh-support-transform-translate.html.ini
new file mode 100644
index 00000000000..3d0102bd597
--- /dev/null
+++ b/tests/wpt/metadata/css/css-values/vh-support-transform-translate.html.ini
@@ -0,0 +1,2 @@
+[vh-support-transform-translate.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 4cad0f9754f..085f21877a5 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,27 +309,18 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index aa6eb8f6085..70efd28ddfc 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20'NosniFF']
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/sandboxing/sandbox-document-open.html.ini b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-document-open.html.ini
new file mode 100644
index 00000000000..b65074d1c0c
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-document-open.html.ini
@@ -0,0 +1,7 @@
+[sandbox-document-open.html]
+  [other_document.open()]
+    expected: FAIL
+
+  [document.open()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 38a7df3af25..2f2f3588b86 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -614,3 +614,9 @@
   [X SNR (-480.9982135660622 dB) is not greater than or equal to 65.737. Got -480.9982135660622.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t3.8483718720978944e+16\t9.3139332532882690e-1\t3.8483718720978944e+16\t4.1318439454558392e+16\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.8483718720978944e+16 at index of 28696.\n\tMax RelError of 4.1318439454558392e+16 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-288.2714546901987 dB) is not greater than or equal to 65.737. Got -288.2714546901987.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/.well-known/origin-policy b/tests/wpt/web-platform-tests/.well-known/origin-policy
index d0de31e693c..2f0e9d0525a 100644
--- a/tests/wpt/web-platform-tests/.well-known/origin-policy
+++ b/tests/wpt/web-platform-tests/.well-known/origin-policy
@@ -35,6 +35,6 @@ def main(request, response):
     if len(matches) != 1:
         return 404, [], '{} origin policies found at a path matching "{}"'.format(len(matches), filepath_pattern)
 
-    with open(matches[0]) as f:
+    with open(matches[0], 'rb') as f:
         data = f.read()
         return return_code, [('Content-Type', content_type)], data
diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
index d222743049e..e99699410e0 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
@@ -12,7 +12,7 @@
 
         var t = async_test("Test that violation report event was fired");
         window.addEventListener("securitypolicyviolation", t.step_func_done(function(e) {
-            assert_equals(e.violatedDirective, "style-src");
+            assert_equals(e.violatedDirective, "style-src-attr");
         }));
         window.onload = function() {
             try {
diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
index 4e590722d57..3356ef8d5fb 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
@@ -7,7 +7,7 @@
     <title>style-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["violated-directive=style-src","PASS"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=style-src-elem","PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
     <script>
         window.addEventListener('securitypolicyviolation', function(e) {
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie.py b/tests/wpt/web-platform-tests/cookies/resources/cookie.py
index 9710b518e21..63eedf0b01e 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/cookie.py
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie.py
@@ -21,7 +21,7 @@ def main(request, response):
     try:
         if b'drop' in request.GET:
             cookie = request.GET[b'drop']
-            cookie += "; max-age=0"
+            cookie += b'; max-age=0'
 
         if b'set' in request.GET:
             cookie = request.GET[b'set']
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html
new file mode 100644
index 00000000000..416f23e8ca6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html
@@ -0,0 +1,8 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>CSS Content Visibility: auto in overflow hidden paints (reference)</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+
+<div>content</div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html
new file mode 100644
index 00000000000..9a8b46bf5c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html
@@ -0,0 +1,16 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Content Visibility: auto in overflow hidden paints</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<link rel="match" href="content-visibility-079-ref.html">
+<meta name="assert" content="content-visibility auto element paints in an overflow hidden element that is not sized">
+
+<style>
+.auto { content-visibility: auto; }
+.overflow { overflow: hidden; }
+</style>
+
+<div class=overflow>
+  <div class=auto>content</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html
index 9989b646378..a039c4ac5f4 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html
@@ -29,7 +29,6 @@
 .tall {
   width: 50px;
   height: 100px;
-  background: green;
 }
 </style>
 <body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html
new file mode 100644
index 00000000000..b29b67a01aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: inline)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <svg style="background: green; height: 100px;" viewBox="0 0 1 1"></svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html
new file mode 100644
index 00000000000..b8101c43999
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <svg style="background: green; width: 100px;" viewBox="0 0 1 1"></svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html
new file mode 100644
index 00000000000..61284df7585
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-rows: 200px;">
+  <svg style="background: green; height: 100px;" viewBox="0 0 1 1"></svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html
new file mode 100644
index 00000000000..83672297f99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 200px;">
+  <svg style="background: green; height: 100px;" viewBox="0 0 1 1"></svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg
new file mode 100644
index 00000000000..725f9557523
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/css-masking-1/"/>
+  <html:link rel="help" href="https://crbug.com/1155384"/>
+  <html:link rel="match" href="reference/mask-and-nested-clip-path-ref.svg"/>
+  <mask id="mask">
+    <rect x="0" y="0" width="200" height="200" fill="white" />
+  </mask>
+  <clipPath id="nested-clip-path">
+    <rect x="100" y="0" width="300" height="300" />
+  </clipPath>
+  <clipPath id="clip-path" clip-path="url(#nested-clip-path)">
+    <rect x="0" y="100" width="300" height="300" />
+  </clipPath>
+  <rect x="0" y="0" width="300" height="300" fill="red" mask="url(#mask)" clip-path="url(#clip-path)"/>
+  <rect x="100" y="100" width="100" height="100" fill="green"/>
+</svg>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg
new file mode 100644
index 00000000000..8aed79967e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <rect x="100" y="100" width="100" height="100" fill="green"/>
+</svg>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html
index a221907f007..c1322438b92 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<br><br><br><br><br>
 <p>There should be no red.</p>
 <div style="position:absolute; top:0; left:0; background-color:green; height:100px; width:100px;"></div>
 <div style="position:absolute; bottom:0; right:0; background-color:green; height:100px; width:100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html b/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html
index 2a9ee38df5f..ed832d39f62 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html
+++ b/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html
@@ -2,6 +2,7 @@
 <title>Abspos elements nested inside a column spanner</title>
 <link rel="help" href="href=https://drafts.csswg.org/css-multicol/">
 <link rel="match" href="abspos-containing-block-outside-spanner-ref.html">
+<br><br><br><br><br>
 <p>There should be no red.</p>
 <div style="position:absolute; top:0; left:0; background-color:red; height:100px; width:100px;"></div>
 <div style="position:absolute; bottom:0; right:0; background-color:red; height:100px; width:100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html
new file mode 100644
index 00000000000..5eec139521a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1157299">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="position: relative; width: 100px; height: 100px; box-sizing: border-box; overflow: auto; padding-bottom: 10px;">
+  <div style="background: green; margin-bottom: 10px;">
+    <div style="height: 100px; margin-bottom: -20px;"></div>
+  </div>
+  <div id="target" style="position: absolute; top: 0; left: 0;"></div>
+</div>
+<script>
+document.body.offsetTop;
+document.getElementById('target').style.top = '10px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html
new file mode 100644
index 00000000000..070ab62f7f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1157299">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="width: 100px; height: 100px; box-sizing: border-box; overflow: auto; padding-bottom: 10px;">
+  <div style="height: 100px; background: green; margin-bottom: -10px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html
new file mode 100644
index 00000000000..8e774499b80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<link rel="help" href="https://drafts.css-houdini.org/css-paint-api/">
+<style>
+#output {
+  width: 100px;
+  height: 100px;
+}
+body {
+  -webkit-mask-box-image-source: url(resources/dot.png);
+  column-count: 3;
+}
+.test-wait {
+  column-count: 600;
+}
+</style>
+<body>
+<div id="output"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('green', class {
+    paint(ctx, geom) {}
+});
+</script>
+
+<script>
+// Regression test for crbug.com/1095163, the test passes as long as it doesn't
+// crash.
+var el = document.getElementById('output');
+el.style.backgroundImage = 'paint(green)';
+
+var blob = new Blob([document.getElementById('code').textContent],
+                    {type: 'text/javascript'});
+CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
+  document.documentElement.classList.remove("test-wait");
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html b/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html
new file mode 100644
index 00000000000..6c598aee393
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<canvas id ="output" width="100" height="100" style="background: blue;"></canvas>
+<script>
+"use strict";
+const canvas = document.getElementById('output');
+const ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'green';
+ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.html b/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.html
new file mode 100644
index 00000000000..62957fcd4b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://html.spec.whatwg.org/#hostimportmoduledynamically(referencingscriptormodule,-specifier,-promisecapability)">
+<link rel="match" href="dynamic-import-ref.html">
+<style>
+#output {
+    width: 100px;
+    height: 100px;
+    background-image: paint(rects);
+    background-color: blue;
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="output"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('rects', class {
+    async paint(ctx, geom) {
+        ctx.fillStyle = 'red';
+        try {
+          await import('./resources/imported-module.mjs');
+        } catch (e) {
+          if (e.constructor === TypeError) {
+            ctx.fillStyle = 'green';
+          }
+        }
+        ctx.fillRect(0, 0, geom.width, geom.height);
+    }
+});
+</script>
+
+<script>
+"use strict";
+importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs b/tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs
new file mode 100644
index 00000000000..2a23b334143
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs
@@ -0,0 +1,2 @@
+// This doesn't need to contain anything. If it's dynamically import()ed
+// successfully, the test fails.
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html b/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html
new file mode 100644
index 00000000000..b135021a0a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<canvas id="output" width="100" height="100" style="background: blue;"></canvas>
+<script>
+"use strict";
+const canvas = document.getElementById('output');
+const ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'green';
+ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html
new file mode 100644
index 00000000000..8a0855cc978
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://html.spec.whatwg.org/#calling-scripts">
+<link rel="match" href="top-level-await-ref.html">
+<style>
+#output {
+    width: 100px;
+    height: 100px;
+    background-image: paint(rects);
+    background-color: blue;
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="output"></div>
+
+<script id="code" type="text/worklet">
+// This will cause a syntax error, and the paint processor will never get registered, in browsers
+// without top-level await support.
+await 1;
+
+registerPaint('rects', class {
+    async paint(ctx, geom) {
+        ctx.fillStyle = 'green';
+        ctx.fillRect(0, 0, geom.width, geom.height);
+    }
+});
+</script>
+
+<script>
+"use strict";
+importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html
new file mode 100644
index 00000000000..ce91fe4e4e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: inline)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <div style="background: green; height: 100px; aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html
new file mode 100644
index 00000000000..6e79ddfc5b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <div style="background: green; width: 100px; aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html
new file mode 100644
index 00000000000..4c6631605c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: inline, on replaced elements)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <img src="support/20x50-green.png" style="height: 100px; aspect-ratio: 1/1;">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html
new file mode 100644
index 00000000000..fd17748099f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block, on replaced elements)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid;">
+  <img src="support/20x50-green.png" style="width: 100px; aspect-ratio: 1/1;">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html
new file mode 100644
index 00000000000..76dbf9162a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: inline, on replaced elements) with auto && ratio</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: repeat(2, min-content);">
+  <img src="support/20x50-green.png" style="height: 100px; aspect-ratio: auto 1/1;">
+  <div style="background: green; width: 60px; height: 100px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html
new file mode 100644
index 00000000000..b61a3c094d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block, on replaced elements) with auto && ratio</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: repeat(2, min-content);">
+  <img src="support/20x50-green.png" style="width: 40px; aspect-ratio: auto 1/1;">
+  <div style="background: green; width: 60px; height: 100px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html
new file mode 100644
index 00000000000..c788215a2e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-rows: 200px;">
+  <div style="background: green; width: 100px; aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html
new file mode 100644
index 00000000000..e23aa367038
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid container (ratio-dependent: inline)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; height: 100px; aspect-ratio: 1/1;">
+  <div style="background: green;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html
new file mode 100644
index 00000000000..ddd6aa2b953
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid container (ratio-dependent: block)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; width: 100px; aspect-ratio: 1/1;">
+  <div style="background: green;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html
new file mode 100644
index 00000000000..9f24dfd8182
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 200px;">
+  <div style="background: green; height: 100px; aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html
new file mode 100644
index 00000000000..4fc923f7551
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 200px;">
+  <div style="background: green; height: 100px; aspect-ratio: 1/1; writing-mode: vertical-lr;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html
new file mode 100644
index 00000000000..c74f1162210
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: grid item (ratio-dependent: block) with larger row track size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 200px; grid-template-rows: 200px;">
+  <div style="background: green; height: 50%; aspect-ratio: 1/1; writing-mode: vertical-lr;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-013.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-013.html
new file mode 100644
index 00000000000..e52db16721a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-013.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: items stretched in both axes should ignore aspect ratio</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 100px; grid-template-rows: 100px;">
+  <div style="background: green; aspect-ratio: 1/1; justify-self: stretch; align-self: stretch;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html
new file mode 100644
index 00000000000..1bec95ea539
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: items stretched in one axis should respect aspect ratio with stretched size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div style="display: grid; grid-template-columns: 100px; grid-template-rows: 100px;">
+  <div style="background: green; aspect-ratio: 1/1; justify-self: stretch;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
index 980a27d3d02..a1ba09132c5 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
@@ -153,3 +153,15 @@ declare that they need access to the QUIC server:
 
 The QUIC server is not yet enabled by default, so QUIC tests will be skipped
 unless `--enable-quic` is specified to `./wpt run`.
+
+### Test Features specified as query params
+
+Alternatively to specifying [Test Features](file-names.md#test-features) in
+the test filename, they can be specified by setting the `wpt_flags` in the
+[test variant](testharness.html#variants). For example, the following variant
+will be loaded over HTTPS:
+```html
+<meta name="variant" content="?wpt_flags=https">
+```
+
+`https`, `h2` and `www` features are supported by `wpt_flags`.
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md b/tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md
index 16bdb9365f0..1943fb9e943 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md
@@ -37,9 +37,8 @@ command](https://w3c.github.io/webdriver/#element-click):
 
 ```python
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     # The high-level API is used to set up a document and locate a click target
     session.url = inline("<p>foo")
     element = session.find.css("p", all=False)
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py b/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
index 4890c49acbd..256dd6e49dc 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
@@ -9,6 +9,10 @@ def main(request, response):
     ]
     key = request.GET.first(b"key", None)
 
+    # We serialize the key into JSON, so have to decode it first.
+    if key is not None:
+      key = key.decode('utf-8')
+
     body = u"""
         <!DOCTYPE html>
         <script src="/portals/resources/stash-utils.sub.js"></script>
diff --git a/tests/wpt/web-platform-tests/html/README.md b/tests/wpt/web-platform-tests/html/README.md
index 11e5bcf81c4..2a444bd5a75 100644
--- a/tests/wpt/web-platform-tests/html/README.md
+++ b/tests/wpt/web-platform-tests/html/README.md
@@ -3,7 +3,7 @@
 This directory contains tests for [HTML](https://html.spec.whatwg.org/multipage/).
 
 Sub-directory names should be based on the URL of the corresponding part of the
-multipage-version specification. For example, The URL of
+multipage-version specification. For example, the URL of
 "8.3 Base64 utility methods" is [https://html.spec.whatwg.org/multipage/webappapis.html#atob](https://html.spec.whatwg.org/multipage/webappapis.html#atob). So the directory in WPT is [webappapis/atob/](/html/webappapis/atob).
 
 For historical reasons, parts of HTML have their own directories:
@@ -17,4 +17,5 @@ For historical reasons, parts of HTML have their own directories:
 * [/websockets](/websockets)
 * [/webstorage](/webstorage)
 * [/workers](/workers)
+* [/worklets](/worklets)
 * [/x-frame-options](/x-frame-options)
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
new file mode 100644
index 00000000000..c53c9fbfe3d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
@@ -0,0 +1,16 @@
+<script>
+  onload = () => {
+    document.open();
+    document.write(`
+      <script>
+        try {
+          document.domain = document.domain;
+          parent.postMessage('document-domain-is-allowed', '*');
+        } catch (error) {
+          parent.postMessage('document-domain-is-disallowed', '*');
+        }
+      </sc`+`ript>
+    `);
+    document.close();
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
new file mode 100644
index 00000000000..8c6c220291c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>
+  Check sandbox-flags aren't lost after using document.open().
+</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+promise_test(async test => {
+  let message = new Promise(resolve =>
+    window.addEventListener("message", event => resolve(event.data))
+  );
+
+  let iframe = document.createElement("iframe");
+  iframe.setAttribute("sandbox", "allow-scripts allow-same-origin");
+  iframe.setAttribute("src", "./resources/document-open.html")
+  document.body.appendChild(iframe);
+
+  assert_equals(await message, "document-domain-is-disallowed");
+}, "document.open()");
+
+promise_test(async test => {
+  let iframe = document.createElement("iframe");
+  iframe.setAttribute("sandbox", "allow-scripts allow-same-origin");
+  iframe.setAttribute("src", "/common/blank.html");
+  let loaded = new Promise(resolve => {iframe.onload = resolve; });
+  document.body.appendChild(iframe);
+  await loaded;
+
+  let message = new Promise(resolve =>
+    window.addEventListener("message", event => resolve(event.data))
+  );
+
+  iframe.contentDocument.open();
+  iframe.contentDocument.write(`
+    <script>
+      try {
+        document.domain = document.domain;
+        parent.postMessage('document-domain-is-allowed', '*');
+      } catch (error) {
+        parent.postMessage('document-domain-is-disallowed', '*');
+      }
+    </sc`+`ript>
+  `);
+  iframe.contentDocument.close();
+
+  assert_equals(await message, "document-domain-is-disallowed");
+}, "other_document.open()");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html b/tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html
new file mode 100644
index 00000000000..3a0def8ae66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test navigating to about:blank while window.open initial load pending.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+async_test(t => {
+  // Open a new window and initiate a navigation. The test does not actually
+  // expect this navigation to complete so it does not matter what URL is
+  // used other than it must not be about:blank. The intent is to start a
+  // navigation to some URL and then assign about:blank to the location
+  // attribute. This assignment should stop the inital navigation and start a
+  // new navigation to about:blank. When the about:blank page finishes loading
+  // the load event is expected to fire and the document URL should to be set to
+  // about:blank.
+  var window1 = window.open('resources/post-to-opener.html', '_blank');
+  t.add_cleanup(() => {
+    window1.close();
+  });
+  window1.location = 'about:blank';
+  window1.onload = t.step_func_done(e => {
+    assert_equals(window1.document.URL, "about:blank");
+  });
+}, 'Navigating to about:blank while window.open initial load pending.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-colorManaged-convertToBlob-roundtrip.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-colorManaged-convertToBlob-roundtrip.html
index efb2665a8a5..75bd34da3d1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-colorManaged-convertToBlob-roundtrip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-colorManaged-convertToBlob-roundtrip.html
@@ -78,7 +78,7 @@ function runConvertToBlobTest(testScenario) {
     var ctx = srcCanvas.getContext('2d', testScenario.canvasColorParam);
     var compositeOverBlack = (testScenario.encodeOptions.type == "image/jpeg");
     drawPatternOnCanvsa(ctx, testScenario.alpha, compositeOverBlack);
-    var refPixels = ctx.getImageData(0, 0, 2, 2).data;
+    var refPixels = ctx.getImageData(0, 0, 2, 2, testScenario.imageSetting).data;
 
     var t = async_test("Test canvas convertToBlob(): " +
         testScenarioToString(testScenario));
@@ -88,7 +88,7 @@ function runConvertToBlobTest(testScenario) {
         var dstCanvas = createCanvas(testScenario);
         var dstCtx = dstCanvas.getContext('2d', testScenario.canvasColorParam);
         dstCtx.drawImage(image, 0, 0);
-        var actualPixels = dstCtx.getImageData(0, 0, 2, 2).data;
+        var actualPixels = dstCtx.getImageData(0, 0, 2, 2, testScenario.imageSetting).data;
         testPixels(actualPixels, refPixels, testScenario);
     });
 
@@ -122,6 +122,11 @@ function runAllTests() {
         {colorSpace: 'srgb', pixelFormat: 'uint8'},
         {colorSpace: 'srgb', pixelFormat: 'float16'},
     ];
+
+    var imageSettings = [
+        {colorSpace: 'srgb', storageFormat: 'uint8'},
+        {colorSpace: 'srgb', storageFormat: 'float32'},
+    ];
     var alphaValues = [0.5, 1];
 
     // The *correct* way to test convertToBlob() is to directly examine the
@@ -137,6 +142,7 @@ function runAllTests() {
                 testScenario.encodeOptions = encodeOptionsSet[i];
                 testScenario.canvasColorParam = canvasColorParams[j];
                 testScenario.alpha = alphaValues[k];
+                testScenario.imageSetting = imageSettings[j]
                 testScenarioSet.push(testScenario);
             }
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
index 72b8e278c60..9046a758c01 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
@@ -37,13 +37,13 @@ var e_sRGB_TransparentBlueImage = [0.121521, 0.121521, 0.886230, 0.501953];
 // sRGB(226,31,31,128)
 var e_sRGB_TransparentBlackImage = [0.121521, 0.121521, 0.121521, 0.501953];
 
-function testPixels(ctx, tests, sourceType)
+function testPixels(ctx, tests, sourceType, imageSetting)
 {
     var actual, expected, tolerance = 0.025;
     if (sourceType === 'video')
         tolerance = 0.03;
     for (var i = 0; i < tests.length; i++) {
-        actual = ctx.getImageData(tests[i][0], tests[i][1], 1, 1).data;
+        actual = ctx.getImageData(tests[i][0], tests[i][1], 1, 1, imageSetting).data;
         assert_implements(actual, 'ImageData data not supported');
         expected = tests[i][2];
         assert_equals(actual.length, expected.length);
@@ -59,6 +59,7 @@ function checkNoCrop(imageBitmap, colorInfo, sourceType)
     canvas.height = 50;
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
+    var imageSetting = {colorSpace: 'srgb', storageFormat:'float32'}
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.drawImage(imageBitmap, 0, 0);
     var tests;
@@ -100,7 +101,7 @@ function checkNoCrop(imageBitmap, colorInfo, sourceType)
                      "This pixel should be e-sRGB transparent black."],
                  [41, 41, transparentBlack,
                      "This pixel should be transparent black."]];
-    testPixels(ctx, tests, sourceType);
+    testPixels(ctx, tests, sourceType, imageSetting);
 }
 
 function checkCrop(imageBitmap, colorInfo, sourceType)
@@ -110,6 +111,7 @@ function checkCrop(imageBitmap, colorInfo, sourceType)
     canvas.height = 50;
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
+    var imageSetting = {colorSpace: 'srgb', storageFormat:'float32'};
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.drawImage(imageBitmap, 0, 0);
     var tests;
@@ -151,7 +153,7 @@ function checkCrop(imageBitmap, colorInfo, sourceType)
                      "This pixel should be e-sRGB transparent black."],
                  [21, 21, transparentBlack,
                      "This pixel should be transparent black."]];
-    testPixels(ctx, tests, sourceType);
+    testPixels(ctx, tests, sourceType, imageSetting);
 }
 
 
@@ -171,9 +173,11 @@ function compareBitmaps(bitmap1, bitmap2)
     ctx2.clearRect(0, 0, canvas2.width, canvas2.height);
     ctx1.drawImage(bitmap1, 0, 0);
     ctx2.drawImage(bitmap2, 0, 0);
-    var data1 = ctx1.getImageData(0, 0, 50, 50).data;
+    var data1 = ctx1.getImageData(0, 0, 50, 50,
+        {colorSpace: 'srgb', storageFormat:'float32'}).data;
     assert_implements(data1, 'ImageData data not supported');
-    var data2 = ctx2.getImageData(0, 0, 50, 50).data;
+    var data2 = ctx2.getImageData(0, 0, 50, 50,
+        {colorSpace: 'srgb', storageFormat:'float32'}).data;
     assert_implements(data2, 'ImageData data not supported');
     var dataMatched = true;
     for (var i = 0; i < data1.length; i++) {
@@ -430,7 +434,8 @@ runAllCreateImageBitmapFromColorManagedBlobTests();
 promise_test(async () => {
     var canvas = initializeTestCanvas('srgb', 'uint8');
     var ctx = canvas.getContext('2d');
-    var data = ctx.getImageData(0, 0, 20, 20);
+    var data = ctx.getImageData(0, 0, 20, 20,
+        {colorSpace: 'srgb', storageFormat:'uint8'});
     await testImageBitmapOpaque(data);
 }, 'createImageBitmap in e-sRGB from an opaque sRGB ImageData with resize.');
 
@@ -439,7 +444,8 @@ promise_test(async () => {
     var canvas = initializeTestCanvas('srgb', 'float16');
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
-    var data = ctx.getImageData(0, 0, 20, 20);
+    var data = ctx.getImageData(0, 0, 20, 20,
+        {colorSpace: 'srgb', storageFormat:'float32'});
     await testImageBitmapOpaque(data);
 }, 'createImageBitmap in e-sRGB from an opaque e-sRGB ImageData with resize.');
 
@@ -449,7 +455,8 @@ promise_test(async () => {
 promise_test(async () => {
     var canvas = initializeTestCanvasTransparent('srgb', 'uint8');
     var ctx = canvas.getContext('2d');
-    var data = ctx.getImageData(0, 0, 20, 20);
+    var data = ctx.getImageData(0, 0, 20, 20,
+        {colorSpace: 'srgb', storageFormat:'uint8'});
     await testImageBitmapTransparent(data);
 }, 'createImageBitmap in e-sRGB from a transparent sRGB ImageData with resize.');
 
@@ -458,7 +465,8 @@ promise_test(async () => {
     var canvas = initializeTestCanvasTransparent('srgb', 'float16');
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
-    var data = ctx.getImageData(0, 0, 20, 20);
+    var data = ctx.getImageData(0, 0, 20, 20,
+        {colorSpace: 'srgb', storageFormat:'float32'});
     await testImageBitmapTransparent(data);
 }, 'createImageBitmap in e-sRGB from a transparent e-sRGB ImageData with resize.');
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
index c72dc97cd0c..b58d78ffafc 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
@@ -20,12 +20,12 @@ function checkImageData(canvasColorSettings, imageData) {
 
 // Test createImageData when the canvas is color managed
 var helperImageData = new ImageData(xWidth, xHeight);
-function runTestCreateImageData(canvasColorSettings) {
+function runTestCreateImageData(canvasColorSettings, imageSetting) {
   var aCanvas = document.createElement("canvas");
   aCanvas.width = xWidth;
   aCanvas.height = xHeight;
   var ctx = aCanvas.getContext('2d', canvasColorSettings);
-  var imageData = ctx.createImageData(xWidth, xHeight);
+  var imageData = ctx.createImageData(xWidth, xHeight, imageSetting);
   checkImageData(canvasColorSettings, imageData);
 
   imageData = ctx.createImageData(helperImageData);
@@ -34,41 +34,47 @@ function runTestCreateImageData(canvasColorSettings) {
 
 var testScenariosCreateImageData = [
   ["Test color managed cretateImageData: {srgb, uint8} -> {srgb, uint8}",
-      {colorSpace: "srgb", pixelFormat: "uint8"}],
+      {colorSpace: "srgb", pixelFormat: "uint8"},
+      {colorSpace: "srgb", storageFormat: "uint8"}],
   ["Test color managed cretateImageData: {srgb, float16} -> {srgb, float32}",
-      {colorSpace: "srgb", pixelFormat: "float16"}],
+      {colorSpace: "srgb", pixelFormat: "float16"},
+      {colorSpace: "srgb", storageFormat: "float32"}],
 ];
 
 function runCreateImageDataTests() {
   for (var i = 0; i < testScenariosCreateImageData.length; i++){
     var t = test(function() {
-      runTestCreateImageData(testScenariosCreateImageData[i][1]);
+      runTestCreateImageData(testScenariosCreateImageData[i][1],
+          testScenariosCreateImageData[i][2]);
     }, testScenariosCreateImageData[i][0]);
   }
 }
 runCreateImageDataTests();
 
 // Test getImageData when the canvas is color managed
-function runTestGetImageData(canvasColorSettings) {
+function runTestGetImageData(canvasColorSettings, imageSetting) {
   var aCanvas = document.createElement("canvas");
   aCanvas.width = xWidth;
   aCanvas.height = xHeight;
   var ctx = aCanvas.getContext('2d', canvasColorSettings);
-  var imageData = ctx.getImageData(0, 0, xWidth, xHeight);
+  var imageData = ctx.getImageData(0, 0, xWidth, xHeight, imageSetting);
   checkImageData(canvasColorSettings, imageData);
 }
 
 var testScenariosGetImageData = [
   ["Test color managed getImageData: {srgb, uint8} -> {srgb, uint8}",
-      {colorSpace: "srgb", pixelFormat: "uint8"}],
+      {colorSpace: "srgb", pixelFormat: "uint8"},
+      {colorSpace: "srgb", storageFormat: "uint8"}],
   ["Test color managed getImageData: {srgb, float16} -> {srgb, float32}",
-      {colorSpace: "srgb", pixelFormat: "float16"}],
+      {colorSpace: "srgb", pixelFormat: "float16"},
+      {colorSpace: "srgb", storageFormat: "float32"}],
 ];
 
 function runGetImageDataTests() {
   for (var i = 0; i < testScenariosGetImageData.length; i++){
     var t = test(function() {
-      runTestGetImageData(testScenariosGetImageData[i][1]);
+      runTestGetImageData(testScenariosGetImageData[i][1],
+      testScenariosGetImageData[i][2]);
     }, testScenariosGetImageData[i][0]);
   }
 }
@@ -81,6 +87,7 @@ function prepareTestScenariosPutImageData() {
   var colorSpaces = ["srgb"];
   var imageDataStorageFormats = ["uint8", "uint16", "float32"];
   var canvasPixelFormats = ["uint8", "float16"];
+  // var canvasStorageFormats = ["uint8", "float32"];
 
   for (i = 0; i < colorSpaces.length; i++)
     for (j = 0; j < imageDataStorageFormats.length; j++)
@@ -93,7 +100,8 @@ function prepareTestScenariosPutImageData() {
             {colorSpace: colorSpaces[i], storageFormat: imageDataStorageFormats[j]};
           canvasColorSettings =
             {colorSpace: colorSpaces[k], pixelFormat: canvasPixelFormats[l]};
-          testScenariosPutImageData.push([testTitle, imageDataColorSettings, canvasColorSettings]);
+          testScenariosPutImageData.push([testTitle, imageDataColorSettings,
+            canvasColorSettings]);
         }
 }
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-draw-high-bit-depth-images.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-draw-high-bit-depth-images.html
index 9907c4e2cf5..d830d6ea335 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-draw-high-bit-depth-images.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-draw-high-bit-depth-images.html
@@ -29,14 +29,16 @@ function runTest(testScenario) {
             var refCtx = refCanvas.getContext(
                 '2d', testScenario.canvasColorParams);
             refCtx.drawImage(_8bitImage, 0, 0);
-            var refPixels = refCtx.getImageData(0, 0, 2, 2).data;
+            var refPixels = refCtx.getImageData(0, 0, 2, 2,
+                testScenario.imageSetting).data;
 
             var testCanvas = document.createElement("canvas");
             testCanvas.width = testCanvas.height = 2;
             var testCtx = testCanvas.getContext(
                 '2d', testScenario.canvasColorParams);
             testCtx.drawImage(_16bitImage, 0, 0);
-            var testPixels = testCtx.getImageData(0, 0, 2, 2).data;
+            var testPixels = testCtx.getImageData(0, 0, 2, 2,
+                testScenario.imageSetting).data;
 
             assert_array_approx_equals(refPixels, testPixels, tolerance);
 
@@ -73,6 +75,11 @@ function runAllTests() {
         {colorSpace: 'srgb', pixelFormat: 'float16'},
     ];
 
+    var imageSettings = [
+        {colorSpace: 'srgb', storageFormat: 'uint8'},
+        {colorSpace: 'srgb', storageFormat: 'float32'},
+    ];
+
     var testScenarioSet = [];
     var id = 1;
     for (var i = 0; i < canvasColorParams.length; i++) {
@@ -81,6 +88,7 @@ function runAllTests() {
                 for (var m = 0; m < pngInterlaceStatus.length; m++) {
                     var testScenario = {};
                     testScenario.canvasColorParams = canvasColorParams[i];
+                    testScenario.imageSetting = imageSettings[i];
                     testScenario._8bitImagePath = _8bitPngPrefix +
                         pngColorSpaces[j] + pngTransparencyStatus[k] + ".png";
                     testScenario._16bitImagePath = _16bitPngPrefix +
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-e_srgb.html
index b6ff5f4657a..793cd920338 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-e_srgb.html
@@ -12,11 +12,11 @@ var e_sRGB_TransparentBlue = [0.121521, 0.121521, 0.886230, 0.501953];
 // sRGB(226,31,31,128)
 var e_sRGB_TransparentBlack = [0.121521, 0.121521, 0.121521, 0.501953];
 
-function testPixels(ctx, tests)
+function testPixels(ctx, tests, imageSetting)
 {
     var actual, expected, tolerance = 0.01;
     for (var i = 0; i < tests.length; i++) {
-      actual = ctx.getImageData(tests[i].x, tests[i].y, 1, 1).data;
+      actual = ctx.getImageData(tests[i].x, tests[i].y, 1, 1, imageSetting).data;
       expected = tests[i].color;
       assert_equals(actual.length, expected.length);
       for (var j = 0; j < actual.length; j++)
@@ -36,7 +36,7 @@ function drawSRGBImageOnExtendedSRGBCanvas(source)
                {x: 15, y: 5, color: e_sRGB_TransparentGreen},
                {x: 5, y: 15, color: e_sRGB_TransparentBlue},
                {x: 15, y: 15, color: e_sRGB_TransparentBlack}];
-  testPixels(ctx, tests);
+  testPixels(ctx, tests, {colorSpace: 'srgb', storageFormat:'float32'});
 }
 
 promise_test(function() {
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-offscreenCanvas.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-offscreenCanvas.html
index 7edbc5ee3c9..aebcea3c1d1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-offscreenCanvas.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-drawImage-offscreenCanvas.html
@@ -88,10 +88,10 @@ function initializeOffscreenCanvasTransparent(canvasColorSpace, canvasPixelForma
     return offscreen;
 }
 
-function testPixels(testCtx, refCtx, pixelFormat, isTrnasparent)
+function testPixels(testCtx, refCtx, pixelFormat, image_setting, isTrnasparent)
 {
-    var actual = testCtx.getImageData(0, 0, 4, 4).data;
-    var expected = refCtx.getImageData(0, 0, 4, 4).data;
+    var actual = testCtx.getImageData(0, 0, 4, 4, image_setting).data;
+    var expected = refCtx.getImageData(0, 0, 4, 4, image_setting).data;
 
     var tolerance = 4;
     if (pixelFormat === 'float16')
@@ -111,8 +111,10 @@ function runDrawOffscreenCanvasTestOpaque(testScenario) {
     var offscreen_canvas_opaque = initializeOffscreenCanvas(
         testScenario.imageColorSpace, testScenario.imagePixelFormat);
     canvas_ctx_blank.drawImage(offscreen_canvas_opaque, 0, 0);
+    var image_setting = {colorSpace: testScenario.canvasColorSpace,
+        storageFormat: testScenario.storageFormat}
     testPixels(canvas_ctx_blank, canvas_ctx_opaque,
-               testScenario.canvasPixelFormat, false);
+               testScenario.canvasPixelFormat, image_setting, false);
 }
 
 function runDrawOffscreenCanvasTestTransparent(testScenario) {
@@ -124,19 +126,23 @@ function runDrawOffscreenCanvasTestTransparent(testScenario) {
     var offscreen_canvas_transparent = initializeOffscreenCanvasTransparent(
         testScenario.imageColorSpace, testScenario.imagePixelFormat);
     canvas_ctx_blank.drawImage(offscreen_canvas_transparent, 0, 0);
+    var image_setting = {colorSpace: testScenario.canvasColorSpace,
+        storageFormat: testScenario.storageFormat}
     testPixels(canvas_ctx_blank, canvas_ctx_transparent,
-               testScenario.canvasPixelFormat, true);
+               testScenario.canvasPixelFormat, image_setting, true);
 }
 
 function runAllTests() {
     var canvasColorSpaces = ['srgb'];
     var canvasPixelFormats = ['uint8', 'float16'];
+    var storageFormats = ['uint8', 'float32'];
 
     var testScenarioSet = [];
     for (var i = 0; i < canvasColorSpaces.length; i++) {
         for (var j = 0; j < canvasPixelFormats.length; j++) {
             var canvas_color_space = canvasColorSpaces[i];
             var canvas_pixel_format = canvasPixelFormats[j];
+            var image_storage_format = storageFormats[j];
             for (var k = 0; k < canvasColorSpaces.length; k++) {
                 for (var m = 0; m < canvasPixelFormats.length; m++) {
                     var image_host_color_space = canvasColorSpaces[k];
@@ -147,6 +153,7 @@ function runAllTests() {
                     testScenario.canvasPixelFormat = canvas_pixel_format;
                     testScenario.imageColorSpace = image_host_color_space;
                     testScenario.imagePixelFormat = image_host_pixel_format;
+                    testScenario.storageFormat = image_storage_format;
                     testScenarioSet.push(testScenario);
                 }
             }
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
index cfc6428d0d0..03e0d29720d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
@@ -27,7 +27,7 @@ function drawSRGBThenGetImageData_e_sRGB() {
         {colorSpace: 'srgb', pixelFormat:'float16'});
     ctx.fillStyle = 'rgba(51, 102, 153, 0.8)';
     ctx.fillRect(0, 0, 10, 10);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    var pixel = ctx.getImageData(5, 5, 1, 1, {colorSpace: 'srgb', storageFormat:'float32'}).data;
     // Check against the same color in e-sRGB. 0.01 protects the test against
     // color conversion deviations.
     assert_array_approx_equals(pixel, [0.2, 0.4, 0.6, 0.8], 0.01);
@@ -46,7 +46,7 @@ function putImageData_e_sRGBThenGetImageData_e_sRGB_InRange() {
     imageData.data[2] = 0.6;
     imageData.data[3] = 0.8;
     ctx.putImageData(imageData, 5, 5);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    var pixel = ctx.getImageData(5, 5, 1, 1, {colorSpace: 'srgb', storageFormat:'float32'}).data;
     // Check against the same color in e-sRGB. 0.001 protects the test against
     // rounding errors.
     assert_array_approx_equals(pixel, [0.2, 0.4, 0.6, 0.8], 0.01);
@@ -65,7 +65,7 @@ function putImageData_e_sRGBThenGetImageData_e_sRGB_OutOfRange() {
     imageData.data[2] = 0.7;
     imageData.data[3] = 1.8;
     ctx.putImageData(imageData, 5, 5);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    var pixel = ctx.getImageData(5, 5, 1, 1, {colorSpace: 'srgb', storageFormat:'float32'}).data;
     // Check against the same color in e-sRGB. 0.001 protects the test against
     // rounding errors.
     assert_array_approx_equals(pixel, [1.3, -1.13, 0.7, 1.8], 0.01);
@@ -85,7 +85,7 @@ function putImageDataSRGBThenGetImageData_e_sRGB() {
     imageData.data[2] = 153;
     imageData.data[3] = 204;
     ctx.putImageData(imageData, 5, 5);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    var pixel = ctx.getImageData(5, 5, 1, 1, {colorSpace: 'srgb', storageFormat:'float32'}).data;
     // Check against the same color in e-sRGB. 0.01 protects the test against
     // color conversion deviations.
     assert_array_approx_equals(pixel, [0.2, 0.4, 0.6, 0.8], 0.01);
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
index 737d2b6ec73..c82bf4cc74b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
@@ -87,8 +87,10 @@ function initializeColorManagedCanvas(canvasColorSettings)
 }
 
 var canvasColorSettingsSet = [
-  {name: "SRGB", colorSettings: {colorSpace: "srgb", pixelFormat: "uint8"}},
-  {name: "e-SRGB", colorSettings: {colorSpace: "srgb", pixelFormat: "float16"}},
+  {name: "SRGB", colorSettings: {colorSpace: "srgb", pixelFormat: "uint8"},
+  imageSetting: {colorSpace: "srgb", storageFormat: "uint8"}},
+  {name: "e-SRGB", colorSettings: {colorSpace: "srgb", pixelFormat: "float16"},
+  imageSetting: {colorSpace: "srgb", storageFormat: "float32"}},
 ];
 
 var srgbImageDataU8, e_srgbImageDataU16, e_srgbImageDataF32;
@@ -127,10 +129,10 @@ var imageDataColorSettingsSet = [
 // * ImageData imagedata = ctx.createImageData(width, height);
 // No color conversion. imagedata follows the color settings of the canvas.
 
-function runTestCreateImageDataWH(canvasColorSettings) {
+function runTestCreateImageDataWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
-  var imageData = ctx.createImageData(xWidth, xHeight);
+  var imageData = ctx.createImageData(xWidth, xHeight, imageSetting);
   checkImageDataColorSettings(canvasColorSettings, imageData);
 }
 
@@ -139,13 +141,15 @@ for (var i = 0; i < canvasColorSettingsSet.length; i++) {
   var message = "Test createImageData(width, height) from " +
                 canvasColorSettingsSet[i].name + " canvas ";
   testScenariosCreateImageDataWH.
-      push([message, canvasColorSettingsSet[i].colorSettings]);
+      push([message, canvasColorSettingsSet[i].colorSettings,
+      canvasColorSettingsSet[i].imageSetting]);
 }
 
 function runTestCreateImageDataWHTests() {
   for (var i = 0; i < testScenariosCreateImageDataWH.length; i++){
     var t = test(function() {
-      runTestCreateImageDataWH(testScenariosCreateImageDataWH[i][1]);
+      runTestCreateImageDataWH(testScenariosCreateImageDataWH[i][1],
+      testScenariosCreateImageDataWH[i][2]);
     }, testScenariosCreateImageDataWH[i][0]);
   }
 }
@@ -156,10 +160,10 @@ runTestCreateImageDataWHTests();
 // * ImageData imagedata = ctx.getImageData(sx, sy, sw, sh);
 // No color conversion. imagedata follows the color settings of the canvas.
 
-function runTestGetImageDataXYWH(canvasColorSettings) {
+function runTestGetImageDataXYWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
-  var imageData = ctx.getImageData(0, 0, xWidth, xHeight);
+  var imageData = ctx.getImageData(0, 0, xWidth, xHeight, imageSetting);
   checkImageDataColorSettings(canvasColorSettings, imageData);
   checkImageDataColorValues(canvasColorSettings, imageData);
 }
@@ -169,13 +173,15 @@ for (var i = 0; i < canvasColorSettingsSet.length; i++) {
   var message = "Test getImageData(sx, sy, sw, sh) from " +
                 canvasColorSettingsSet[i].name + " canvas ";
   testScenariosGetImageDataXYWH.
-      push([message, canvasColorSettingsSet[i].colorSettings]);
+      push([message, canvasColorSettingsSet[i].colorSettings,
+      canvasColorSettingsSet[i].imageSetting]);
 }
 
 function runTestGetImageDataXYWHTests() {
   for (var i = 0; i < testScenariosGetImageDataXYWH.length; i++){
     var t = test(function() {
-      runTestGetImageDataXYWH(testScenariosGetImageDataXYWH[i][1]);
+      runTestGetImageDataXYWH(testScenariosGetImageDataXYWH[i][1],
+          testScenariosGetImageDataXYWH[i][2]);
     }, testScenariosGetImageDataXYWH[i][0]);
   }
 }
@@ -186,7 +192,7 @@ runTestGetImageDataXYWHTests();
 // * void ctx.putImageData(imagedata, dx, dy, ...);
 // Color conversion, if needed, to the color settings of the canvas.
 
-function runTestPutImageDataDxDy(canvasColorSettings, imageData) {
+function runTestPutImageDataDxDy(canvasColorSettings, imageData, imageSetting) {
   var canvas = document.createElement('canvas');
   canvas.width = xWidth * 2;
   canvas.height = xHeight * 2;
@@ -194,7 +200,7 @@ function runTestPutImageDataDxDy(canvasColorSettings, imageData) {
       {colorSpace: canvasColorSettings.colorSpace,
        pixelFormat: canvasColorSettings.pixelFormat});
   ctx.putImageData(imageData, xWidth/2, xHeight/2);
-  var ctxImageData = ctx.getImageData(xWidth/2, xHeight/2, xWidth, xHeight);
+  var ctxImageData = ctx.getImageData(xWidth/2, xHeight/2, xWidth, xHeight, imageSetting);
   checkImageDataColorSettings(canvasColorSettings, ctxImageData);
   checkImageDataColorValues(canvasColorSettings, ctxImageData, 'noBlank',
                             xWidth, xHeight, 'isWCG_U8toSRGB_U8');
@@ -208,7 +214,8 @@ for (var i = 0; i < canvasColorSettingsSet.length; i++) {
                 imageDataColorSettingsSet[j].name + " ImageData";
     testScenariosPutImageDataDxDy.
         push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].imageData]);
+              imageDataColorSettingsSet[j].imageData,
+              canvasColorSettingsSet[i].imageSetting]);
   }
 }
 
@@ -216,7 +223,8 @@ function runTestPutImageDataDxDyTests() {
   for (var i = 0; i < testScenariosPutImageDataDxDy.length; i++){
     var t = test(function() {
       runTestPutImageDataDxDy(
-        testScenariosPutImageDataDxDy[i][1], testScenariosPutImageDataDxDy[i][2]);
+        testScenariosPutImageDataDxDy[i][1], testScenariosPutImageDataDxDy[i][2],
+        testScenariosPutImageDataDxDy[i][3]);
     }, testScenariosPutImageDataDxDy[i][0]);
   }
 }
@@ -248,7 +256,8 @@ for (var i = 0; i < canvasColorSettingsSet.length; i++) {
                 imageDataColorSettingsSet[j].name + " ImageData";
     testScenariosCreateImageDataFromImageData.
         push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].imageData]);
+              imageDataColorSettingsSet[j].imageData,
+              canvasColorSettingsSet[i].imageSetting]);
   }
 }
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/transferFromImageBitmap.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/transferFromImageBitmap.html
index ff8abeb897f..1b903961549 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/transferFromImageBitmap.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/transferFromImageBitmap.html
@@ -41,7 +41,7 @@ function generateExpectedResult(testScenario, canvas)
     ctx.fillRect(0, 1, 1, 1);
     ctx.fillStyle = generateFillStyle(27, 27, 27, testScenario.alpha);
     ctx.fillRect(1, 1, 1, 1);
-    return ctx.getImageData(0, 0, 2, 2).data;
+    return ctx.getImageData(0, 0, 2, 2, testScenario.imageSetting).data;
 }
 
 function generateTestName(testScenario) {
@@ -79,7 +79,7 @@ function runTransferFromImageBitmapTest(testScenario) {
                 {colorSpace: testScenario.colorSpace,
                  pixelFormat: testScenario.pixelFormat});
             ctx.drawImage(dstCanvas, 0, 0);
-            var actualPixels = ctx.getImageData(0, 0, 2, 2).data;
+            var actualPixels = ctx.getImageData(0, 0, 2, 2, testScenario.imageSetting).data;
             testPixels(actualPixels, expectedPixels, testScenario);
         });
        }, generateTestName(testScenario));
@@ -91,6 +91,10 @@ function runAllTests() {
         {colorSpace: 'srgb', pixelFormat: 'uint8'},
         {colorSpace: 'srgb', pixelFormat: 'float16'},
         ];
+    var imageSettings = [
+        {colorSpace: 'srgb', storageFormat: 'uint8'},
+        {colorSpace: 'srgb', storageFormat: 'float32'},
+        ];
     var alphaValues = [0.5, 1];
     var colorSpaceConversions = ['none', 'default'];
 
@@ -103,6 +107,7 @@ function runAllTests() {
                 testScenario.pixelFormat = colorSpaces[i].pixelFormat;
                 testScenario.alpha = alphaValues[j];
                 testScenario.colorSpaceConversion = colorSpaceConversions[k];
+                testScenario.imageSetting = imageSettings[i];
                 testScenarios.push(testScenario);
             }
 
diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html b/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html
new file mode 100644
index 00000000000..bb6f79b6270
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+<ol>
+ <details><summary>summary</summary></details>
+ <li value="1">1</li>
+ <li value="2">2 <details><summary>summary</summary></details></li>
+ <li value="3">3</li>
+ <details><summary>summary</summary></details>
+ <li value="4">4</li>
+</ol>
+
+<ol>
+ <summary>summary</summary>
+ <li value="1">1</li>
+ <li value="2">2 <summary>summary</summary></li>
+ <li value="3">3</li>
+ <summary>summary</summary>
+ <li value="4">4</li>
+</ol>
+
diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html b/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html
new file mode 100644
index 00000000000..0f380bf0589
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>Check if SUMMARY has 'counter-increment: list-item 0'</title>
+<link rel="match" href="summary-in-ol-ref.html">
+
+<ol>
+ <details><summary>summary</summary></details>
+ <li>1</li>
+ <li>2 <details><summary>summary</summary></details></li>
+ <li>3</li>
+ <details><summary>summary</summary></details>
+ <li>4</li>
+</ol>
+
+<ol>
+ <summary>summary</summary>
+ <li>1</li>
+ <li>2 <summary>summary</summary></li>
+ <li>3</li>
+ <summary>summary</summary>
+ <li>4</li>
+</ol>
+
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
index 6ff330cc5a7..9f2ac99250e 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
@@ -8,7 +8,9 @@
       "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
       "lodash-dotdot/": "../node_modules/lodash-es/",
       "mapped/": "https://example.com/",
-      "mapped/path/": "https://github.com/WICG/import-maps/issues/207/"
+      "mapped/path/": "https://github.com/WICG/import-maps/issues/207/",
+      "mapped/non-ascii-1/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+      "mapped/non-ascii-2/": "https://example.com/きつね/"
     }
   },
   "importMapBaseURL": "https://example.com/app/index.html",
@@ -46,11 +48,23 @@
         "mapped/path": "https://example.com/path",
         "mapped/path/": "https://github.com/WICG/import-maps/issues/207/",
         "mapped/path/..": null,
+        "mapped/path/../path/": null,
+        "mapped/path/../207": null,
+        "mapped/path/../207/": "https://github.com/WICG/import-maps/issues/207/",
+        "mapped/path//": null,
+        "mapped/path/WICG/import-maps/issues/207/": "https://github.com/WICG/import-maps/issues/207/WICG/import-maps/issues/207/",
+        "mapped/path//WICG/import-maps/issues/207/": "https://github.com/WICG/import-maps/issues/207/",
         "mapped/path/../backtrack": null,
         "mapped/path/../../backtrack": null,
         "mapped/path/../../../backtrack": null,
         "moment/../backtrack": null,
-        "moment/..": null
+        "moment/..": null,
+        "mapped/non-ascii-1/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+        "mapped/non-ascii-1/../%E3%81%8D%E3%81%A4%E3%81%AD/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+        "mapped/non-ascii-1/../きつね/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+        "mapped/non-ascii-2/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+        "mapped/non-ascii-2/../%E3%81%8D%E3%81%A4%E3%81%AD/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/",
+        "mapped/non-ascii-2/../きつね/": "https://example.com/%E3%81%8D%E3%81%A4%E3%81%AD/"
       }
     }
   }
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json
index d9c80c94750..998fe7fb67d 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json
@@ -8,7 +8,11 @@
       "..": "/lib/dotdot.mjs",
       "..\\": "/lib/dotdotbackslash.mjs",
       "%2E": "/lib/percent2e.mjs",
-      "%2F": "/lib/percent2f.mjs"
+      "%2F": "/lib/percent2f.mjs",
+      "https://map.example/%E3%81%8D%E3%81%A4%E3%81%AD/": "/a/",
+      "https://map.example/きつね/fox/": "/b/",
+      "%E3%81%8D%E3%81%A4%E3%81%AD/": "/c/",
+      "きつね/fox/": "/d/"
     }
   },
   "importMapBaseURL": "https://example.com/app/index.html",
@@ -38,6 +42,30 @@
       "expectedResults": {
         "only-slash": null
       }
+    },
+    "URL-like specifiers are normalized": {
+      "expectedResults": {
+        "https://map.example/%E3%81%8D%E3%81%A4%E3%81%AD/": "https://example.com/a/",
+        "https://map.example/%E3%81%8D%E3%81%A4%E3%81%AD/bar": "https://example.com/a/bar",
+        "https://map.example/%E3%81%8D%E3%81%A4%E3%81%AD/fox/": "https://example.com/b/",
+        "https://map.example/%E3%81%8D%E3%81%A4%E3%81%AD/fox/bar": "https://example.com/b/bar",
+        "https://map.example/きつね/": "https://example.com/a/",
+        "https://map.example/きつね/bar": "https://example.com/a/bar",
+        "https://map.example/きつね/fox/": "https://example.com/b/",
+        "https://map.example/きつね/fox/bar": "https://example.com/b/bar"
+      }
+    },
+    "Bare specifiers are not normalized": {
+      "expectedResults": {
+        "%E3%81%8D%E3%81%A4%E3%81%AD/": "https://example.com/c/",
+        "%E3%81%8D%E3%81%A4%E3%81%AD/bar": "https://example.com/c/bar",
+        "%E3%81%8D%E3%81%A4%E3%81%AD/fox/": "https://example.com/c/fox/",
+        "%E3%81%8D%E3%81%A4%E3%81%AD/fox/bar": "https://example.com/c/fox/bar",
+        "きつね/": null,
+        "きつね/bar": null,
+        "きつね/fox/": "https://example.com/d/",
+        "きつね/fox/bar": "https://example.com/d/bar"
+      }
     }
   }
 }
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini
new file mode 100644
index 00000000000..6b7394fd13b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini
@@ -0,0 +1,10 @@
+[http2-websocket.sub.h2.any.html]
+  [WSS over h2]
+    expected:
+      if product != "firefox": FAIL
+
+
+[http2-websocket.sub.h2.any.worker.html]
+  [WSS over h2]
+    expected:
+      if product != "firefox": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js b/tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js
new file mode 100644
index 00000000000..617f9ca4e0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js
@@ -0,0 +1,20 @@
+function check(protocol, domain, port, done) {
+  var url = protocol + '://' + domain + ':' + port + '/echo';
+  var ws = new WebSocket(url);
+
+  ws.addEventListener('error', function() {
+    done(false);
+  });
+
+  ws.addEventListener('open', function() {
+    done(true);
+  });
+}
+
+async_test(function(t) {
+  check('wss', '{{browser_host}}', {{ports[h2][0]}}, t.step_func(function(result) {
+    assert_true(result);
+
+    t.done();
+  }));
+}, 'WSS over h2');
diff --git a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html b/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html
new file mode 100644
index 00000000000..9af9cda4631
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html>
+  <head>
+    <title>WPT Server checker</title>
+    <meta charset="utf-8" />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <meta name="variant" content="">
+    <meta name="variant" content="?wpt_flags=h2">
+    <meta name="variant" content="?wpt_flags=https">
+  </head>
+</body>
+<body>
+<script>
+
+if (location.search == '?wpt_flags=h2') {
+  test(function() {
+      assert_equals(document.location.port, "{{ports[h2][0]}}");
+  }, "h2 port with wpt_flags=h2")
+} else if (location.search == '?wpt_flags=https') {
+  test(function() {
+      assert_equals(document.location.port, "{{ports[https][0]}}");
+  }, "https port with wpt_flags=https")
+} else {
+  test(function() {
+      assert_equals(document.location.port, "{{ports[http][0]}}");
+  }, "http port without flag")
+}
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py b/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py
index 370e63c2237..084df8f09a8 100644
--- a/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py
+++ b/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py
@@ -1,4 +1,2 @@
-from tests.support.inline import inline
-
-def test_load(session):
+def test_load(session, inline):
     inline("PASS")
diff --git a/tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html b/tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html
new file mode 100644
index 00000000000..9288bf58069
--- /dev/null
+++ b/tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="author" href="mailto:szager@chromium.org" title="Stefan Zager">
+<link rel="help" href="https://w3c.github.io/IntersectionObserver/#update-intersection-observations-algo">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+pre, #log {
+  position: absolute;
+  top: 0;
+  left: 200px;
+}
+iframe {
+  height: 250px;
+  width: 150px;
+  border: 0;
+}
+</style>
+<iframe id="target-iframe" src="resources/iframe-no-root-subframe.html"></iframe>
+
+<script>
+var iframe = document.getElementById("target-iframe");
+var target;
+var root;
+var entries = [];
+
+iframe.onload = function() {
+  runTestCycle(function() {
+    assert_true(!!iframe, "iframe exists");
+
+    target = iframe.contentDocument.getElementById("target");
+    assert_true(!!target, "Target element exists.");
+    var observer = new IntersectionObserver(function(changes) {
+      entries = entries.concat(changes)
+    }, { root: document });
+    observer.observe(target);
+    entries = entries.concat(observer.takeRecords());
+    assert_equals(entries.length, 0, "No initial notifications.");
+    runTestCycle(step0, "First rAF.");
+  }, "Observer with explicit root which is the document, observing a target in a same-origin iframe.");
+};
+
+function step0() {
+  checkLastEntry(entries, 0, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false]);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 20f90ed585c..e63b152d7ec 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -623,14 +623,22 @@ CSS-COLLIDING-REF-NAME: css/css-grid/subgrid/baseline-001-ref.html
 CSS-COLLIDING-REF-NAME: css/css-backgrounds/simple-bg-color-ref.html
 CSS-COLLIDING-REF-NAME: css/css-backgrounds/hidpi/simple-bg-color-ref.html
 
-CSS-COLLIDING-TEST-NAME: css/css-contain/inheritance.html
 CSS-COLLIDING-TEST-NAME: css/css-contain/content-visibility/inheritance.html
-CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html
-CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-invalid.html
-CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html
+CSS-COLLIDING-TEST-NAME: css/css-contain/inheritance.html
+CSS-COLLIDING-TEST-NAME: css/css-grid/grid-items/replaced-element-001.html
+CSS-COLLIDING-TEST-NAME: css/css-grid/grid-items/replaced-element-002.html
+CSS-COLLIDING-TEST-NAME: css/css-grid/grid-items/replaced-element-007.html
+CSS-COLLIDING-TEST-NAME: css/css-grid/grid-items/replaced-element-010.html
 CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-computed.html
-CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-invalid.html
 CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-valid.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/replaced-element-001.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/replaced-element-002.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/replaced-element-007.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/aspect-ratio/replaced-element-010.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html
+CSS-COLLIDING-TEST-NAME: css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html
 
 # CSS tests that used to be at the top level and weren't subject to lints
 MISSING-LINK: css/css-fonts/matching/fixed-stretch-style-over-weight.html
diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html b/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html
index a9dd7072b07..cc9cdc2b501 100644
--- a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html
+++ b/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html
@@ -162,19 +162,15 @@ function runAddSourceBufferTest(argument, isValidArgument, argumentDescription,
         assert_equals(mediaSource.readyState, 'open', 'MediaSource is open');
         let sourceBuffer;
         if (isValidArgument) {
-          // TODO(crbug.com/1144908): Update to expect success once the impl is
-          // more complete.
-          assert_throws_dom('QuotaExceededError',
-            () => { sourceBuffer = mediaSource.addSourceBuffer(argument); },
-            'addSourceBuffer(valid config) throws QuotaExceededError');
-          assert_equals(sourceBuffer, undefined,
-            'addSourceBuffer result for valid config while "open" should be exception');
+          sourceBuffer = mediaSource.addSourceBuffer(argument);
+          assert_true(sourceBuffer instanceof SourceBuffer,
+              'addSourceBuffer result for valid config while "open" should be a SourceBuffer instance');
         } else {
           assert_throws_js(TypeError,
-            () => { sourceBuffer = mediaSource.addSourceBuffer(argument); },
-            'addSourceBuffer(invalid config) throws TypeError if MediaSource is "open"');
+              () => { sourceBuffer = mediaSource.addSourceBuffer(argument); },
+              'addSourceBuffer(invalid config) throws TypeError if MediaSource is "open"');
           assert_equals(sourceBuffer, undefined,
-            'addSourceBufferResult for invalid config while "open" should be exception');
+              'addSourceBufferResult for invalid config while "open" should be exception');
         }
       }, testDescription);
       break;
diff --git a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html b/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
index 370aa45c578..e6405a9c8c6 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
@@ -38,4 +38,25 @@
     }, 'showOpenFilePicker returns correct permissions');
   }, 'showOpenFilePicker works');
 
+  promise_test(async t => {
+    await window.test_driver.bless(
+      'show a file picker.<br />Please select native-file-system/resources/data/testfile.txt');
+    const files = await self.showOpenFilePicker({
+      multiple: false,
+      startIn: null,
+      types: [
+        { description: 'Text files', accept: { ' text/plain ': ['.txt'] } },
+        { description: 'Images', accept: { '  image/*  ': ['.jpg', '.jpeg', '.png'] } },
+      ],
+    });
+    assert_true(Array.isArray(files));
+    assert_equals(files.length, 1);
+    assert_true(files[0] instanceof FileSystemHandle);
+    assert_true(files[0] instanceof FileSystemFileHandle);
+    assert_equals(files[0].kind, "file");
+    assert_equals(files[0].name, 'testfile.txt');
+    assert_equals(await (await files[0].getFile()).text(), 'Hello World!\n');
+  }, 'showOpenFilePicker does not fail when starting directory is null');
+
 </script>
+
diff --git a/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js b/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
index d1dabf37da8..ecc64dfe66d 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
+++ b/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
@@ -80,6 +80,12 @@ function define_file_picker_error_tests(showPickerMethod) {
       showPickerMethod +
           ': MIME type can\'t have invalid characters in subtype.');
 
+  promise_test(async t => {
+    await promise_rejects_js(t, TypeError, self[showPickerMethod]({
+      startIn: 'secrets',
+    }));
+  }, showPickerMethod + ': unknown common starting directory.');
+
   const invalid_extensions = {
     '.extensiontoolong': 'extension length more than 16.',
     '.txt.': 'extenstion ends with "."',
diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js b/tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js
index 8fa83505320..51a01a082e8 100644
--- a/tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js
+++ b/tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js
@@ -24,6 +24,15 @@ function nel_test(callback, name, properties) {
   }, name, properties);
 }
 
+function nel_iframe_test(callback, name, properties) {
+  promise_test(async t => {
+    await obtainNELLock();
+    await clearReportingAndNELConfigurationsInIframe();
+    await callback(t);
+    await releaseNELLock();
+  }, name, properties);
+}
+
 /*
  * Helper functions for constructing domain names that contain NEL policies.
  */
@@ -68,6 +77,37 @@ function fetchResourceWithZeroSuccessFractionPolicy(subdomain) {
   return fetch(url, {mode: "no-cors"});
 }
 
+/*
+ * Similar to the above methods, but fetch resources in an iframe. Allows matching
+ * full context of reports sent from an iframe that's same-site relative to the domains
+ * a policy set.
+ */
+
+ function loadResourceWithBasicPolicyInIframe(subdomain) {
+  return loadResourceWithPolicyInIframe(
+      getURLForResourceWithBasicPolicy(subdomain));
+}
+
+function loadResourceWithZeroSuccessFractionPolicyInIframe(subdomain) {
+  return loadResourceWithPolicyInIframe(
+      _getNELResourceURL(subdomain, "pass.png?id="+reportID+"&success_fraction=0.0"));
+}
+
+function clearResourceWithBasicPolicyInIframe(subdomain) {
+  return loadResourceWithPolicyInIframe(
+      getURLForClearingConfiguration(subdomain));
+}
+
+function loadResourceWithPolicyInIframe(url) {
+  return new Promise((resolve, reject) => {
+    const frame = document.createElement('iframe');
+    frame.src = url;
+    frame.onload = () => resolve(frame);
+    frame.onerror = () => reject('failed to load ' + url);
+    document.body.appendChild(frame);
+  });
+}
+
 /*
  * Fetches a resource whose headers define an include_subdomains NEL policy.
  */
@@ -170,6 +210,16 @@ async function clearReportingAndNELConfigurations(subdomain) {
   return;
 }
 
+async function clearReportingAndNELConfigurationsInIframe(subdomain) {
+  await Promise.all([
+    clearResourceWithBasicPolicyInIframe(""),
+    clearResourceWithBasicPolicyInIframe("www"),
+    clearResourceWithBasicPolicyInIframe("www1"),
+    clearResourceWithBasicPolicyInIframe("www2"),
+  ]);
+  return;
+}
+
 /*
  * Returns whether all of the fields in obj1 also exist in obj2 with the same
  * values.  (Put another way, returns whether obj1 and obj2 are equal, ignoring
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
index 420eaaaf260..ce20c4726e9 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?navigation';
   const cert_url = test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
index bab50b7f885..15a7176e749 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
@@ -9,8 +9,8 @@
 <script>
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
index 99c5c7b910b..e6cdad035e1 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
index 0fd0c8c35d7..a0cc607bf5f 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
@@ -9,8 +9,8 @@
 <script>
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
index 042f7d7094d..d3ad4204f2e 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
index feb705d0101..04fd0e785c0 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
@@ -9,8 +9,8 @@
 <script>
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
index 477eb55d6c7..a92735f714a 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithZeroSuccessFractionPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithZeroSuccessFractionPolicyInIframe();
   const sxg_url =
       alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?navigation';
   const cert_url = test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
index 9d8852cb10d..3e00d9dbe36 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
index b31f3d0a34c..b6d7ba3b1ad 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
@@ -11,8 +11,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html
index b9e7286ab6d..b6cadbca505 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url = alt_origin + '/signed-exchange/resources/sxg/sxg-location.sxg?navigation';
   const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
   const message = await openSXGInIframeAndWaitForMessage(t, sxg_url, 'no-referrer');
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html
index 737c4833d13..351ad927820 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url = alt_origin + '/signed-exchange/resources/sxg/sxg-location.sxg?navigation';
   const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
   const message = await openSXGInIframeAndWaitForMessage(t, sxg_url, 'origin');
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
index 61c9bbdce6d..0afa626d09d 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url = alt_origin + '/signed-exchange/resources/sxg/sxg-location.sxg?navigation';
   const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
   const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
index 444d281378d..95cd140cea9 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
@@ -10,8 +10,8 @@
 <script>
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-format.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
index c92fc6c245d..2679ae5a6c7 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
@@ -10,8 +10,8 @@
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 const test_origin = get_host_info().HTTPS_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
index 8c77317bd59..f3e0b8f0e6e 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
@@ -9,8 +9,8 @@
 <script>
 const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
 
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
+nel_iframe_test(async t => {
+  await loadResourceWithBasicPolicyInIframe();
   const sxg_url =
       alt_origin +
       '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg?navigation';
diff --git a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
index 26e63b9a4a5..a7f42d94616 100644
--- a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
+++ b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
@@ -7,10 +7,10 @@
 <script src="../resources/sxg-util.js"></script>
 <body>
 <script>
-nel_test(async t => {
+nel_iframe_test(async t => {
   const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
   const test_origin = get_host_info().HTTPS_ORIGIN;
-  await fetchResourceWithBasicPolicy();
+  await loadResourceWithBasicPolicyInIframe();
   const iframe_path =
       alt_origin +
       '/signed-exchange/resources/sxg-subresource-mismatch-iframe.html';
diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/web-platform-tests/tools/manifest/item.py
index 9a43a68f1fb..857c8485dd0 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/item.py
@@ -1,7 +1,7 @@
 import os.path
 from inspect import isabstract
 from six import iteritems, with_metaclass
-from six.moves.urllib.parse import urljoin, urlparse
+from six.moves.urllib.parse import urljoin, urlparse, parse_qs
 from abc import ABCMeta, abstractproperty
 
 from .utils import to_os_path
@@ -104,7 +104,7 @@ class ManifestItem(with_metaclass(ManifestItemMeta)):
 
 
 class URLManifestItem(ManifestItem):
-    __slots__ = ("url_base", "_url", "_extras")
+    __slots__ = ("url_base", "_url", "_extras", "_flags")
 
     def __init__(self,
                  tests_root,  # type: Text
@@ -120,6 +120,9 @@ class URLManifestItem(ManifestItem):
         assert url is None or url[0] != "/"
         self._url = url
         self._extras = extras
+        parsed_url = urlparse(self.url)
+        self._flags = (set(parsed_url.path.rsplit("/", 1)[1].split(".")[1:-1]) |
+                       set(parse_qs(parsed_url.query).get("wpt_flags", [])))
 
     @property
     def id(self):
@@ -138,22 +141,19 @@ class URLManifestItem(ManifestItem):
     @property
     def https(self):
         # type: () -> bool
-        flags = set(urlparse(self.url).path.rsplit("/", 1)[1].split(".")[1:-1])
-        return "https" in flags or "serviceworker" in flags
+        return "https" in self._flags or "serviceworker" in self._flags
 
     @property
     def h2(self):
         # type: () -> bool
-        flags = set(urlparse(self.url).path.rsplit("/", 1)[1].split(".")[1:-1])
-        return "h2" in flags
+        return "h2" in self._flags
 
     @property
     def subdomain(self):
         # type: () -> bool
-        flags = set(urlparse(self.url).path.rsplit("/", 1)[1].split(".")[1:-1])
         # Note: this is currently hard-coded to check for `www`, rather than
         # all possible valid subdomains. It can be extended if needed.
-        return "www" in flags
+        return "www" in self._flags
 
     def to_json(self):
         # type: () -> Tuple[Optional[Text], Dict[Any, Any]]
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py
index 4f2fc8f03f2..dd1c4e2004d 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py
@@ -134,3 +134,25 @@ def test_item_types():
     for key, value in item_types.items():
         assert isinstance(key, str)
         assert not inspect.isabstract(value)
+
+
+def test_wpt_flags():
+    m1 = HarnessTest("/foo", "bar", "/", "bar" + "?wpt_flags=www")
+    assert m1.subdomain is True
+    assert m1.https is False
+    assert m1.h2 is False
+
+    m2 = HarnessTest("/foo", "bar", "/", "bar" + "?wpt_flags=https")
+    assert m2.subdomain is False
+    assert m2.https is True
+    assert m2.h2 is False
+
+    m3 = HarnessTest("/foo", "bar", "/", "bar" + "?wpt_flags=h2")
+    assert m3.subdomain is False
+    assert m3.https is False
+    assert m3.h2 is True
+
+    m4 = HarnessTest("/foo", "bar", "/", "bar" + "?wpt_flags=https&wpt_flags=www")
+    assert m4.subdomain is True
+    assert m4.https is True
+    assert m4.h2 is False
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 3a1c782794a..8fdbdc6bc67 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -609,6 +609,7 @@ def start_http2_server(host, port, paths, routes, bind_address, config, **kwargs
                                      port=port,
                                      handler_cls=wptserve.Http2WebTestRequestHandler,
                                      doc_root=paths["doc_root"],
+                                     ws_doc_root=paths["ws_doc_root"],
                                      routes=routes,
                                      rewrites=rewrites,
                                      bind_address=bind_address,
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/h2/.gitignore
deleted file mode 100644
index 9d19e106e3c..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-build/
-env/
-dist/
-*.egg-info/
-*.pyc
-__pycache__
-.coverage
-.tox/
-.hypothesis/
-.cache/
-_trial_temp/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/h2/.travis.yml
deleted file mode 100644
index 7b5a4686c58..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-sudo: false
-language: python
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - .hypothesis
-
-matrix:
-  include:
-    # Main tests on supported Python versions.
-    - python: "2.7"
-      env: TOXENV=py27
-    - python: "3.3"
-      env: TOXENV=py33
-    - python: "3.4"
-      env: TOXENV=py34
-    - python: "3.5"
-      env: TOXENV=py35
-    - python: "3.6"
-      env: TOXENV=py36
-    - python: "pypy-5.3.1"
-      env: TOXENV=pypy
-
-    # Linting, docs, and other non-test stuff.
-    - python: "3.4"
-      env: TOXENV=lint
-    - python: "3.5"
-      env: TOXENV=docs
-    - python: "2.7"
-      env: TOXENV=packaging
-
-    # Test we haven't broken our major dependencies.
-    - python: "2.7"
-      env: TOXENV=py27-twistedMaster
-
-install:
-  - "pip install -U pip setuptools"
-  - "pip install -U tox"
-script:
-  - tox -- --hypothesis-profile travis
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst
index bdc4d06c31a..5c4849fef0f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst
@@ -111,4 +111,5 @@ In chronological order:
 - Fred Thomsen (@fredthomsen)
 
   - Added logging.
-
+  - Enhance equality testing of ``h2.settings.Settings`` objects with
+    ``hypothesis``.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst
index e9fa745d516..5244cd8a941 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst
@@ -1,6 +1,65 @@
 Release History
 ===============
 
+3.2.0 (2020-02-08)
+------------------
+
+Bugfixes
+~~~~~~~~
+
+- Receiving DATA frames on closed (or reset) streams now properly emit a
+  WINDOW_UPDATE to keep the connection flow window topped up.
+
+API Changes (Backward-Incompatible)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``h2.config.logger`` now uses a `trace(...)` function, in addition
+  to `debug(...)`. If you defined a custom logger object, you need to handle
+  these new function calls.
+
+
+3.1.1 (2019-08-02)
+------------------
+
+Bugfixes
+~~~~~~~~
+
+- Ignore WINDOW_UPDATE and RST_STREAM frames received after stream
+  closure.
+
+
+3.1.0 (2019-01-22)
+------------------
+
+API Changes (Backward-Incompatible)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``h2.connection.H2Connection.data_to_send`` first and only argument ``amt``
+  was renamed to ``amount``.
+- Support for Python 3.3 has been removed.
+
+API Changes (Backward-Compatible)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``h2.connection.H2Connection.send_data`` now supports ``data`` parameter
+  being a ``memoryview`` object.
+- Refactor ping-related events: a ``h2.events.PingReceived`` event is fired
+  when a PING frame is received and a ``h2.events.PingAckReceived`` event is
+  fired when a PING frame with an ACK flag is received.
+  ``h2.events.PingAcknowledged`` is deprecated in favour of the identical
+  ``h2.events.PingAckReceived``.
+- Added ``ENABLE_CONNECT_PROTOCOL`` to ``h2.settings.SettingCodes``.
+- Support ``CONNECT`` requests with a ``:protocol`` pseudo header
+  thereby supporting RFC 8441.
+- A limit to the number of closed streams kept in memory by the
+  connection is applied. It can be configured by
+  ``h2.connection.H2Connection.MAX_CLOSED_STREAMS``.
+
+Bugfixes
+~~~~~~~~
+
+- Debug logging when stream_id is None is now fixed and no longer errors.
+
 3.0.1 (2017-04-03)
 ------------------
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in b/tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in
index 3c8b988533e..04400de6b7d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in
@@ -1,7 +1,8 @@
 include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst tox.ini test_requirements.txt .coveragerc Makefile
-recursive-include test *.py
+recursive-include test *.py *.sh
 graft docs
 prune docs/build
 graft visualizer
 recursive-include examples *.py *.crt *.key *.pem *.csr
 recursive-include utils *.sh
+recursive-include _travis *.sh
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst
index 2c71d38d16d..a46f8cce7d4 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst
@@ -53,7 +53,10 @@ Events
 .. autoclass:: h2.events.RemoteSettingsChanged
    :members:
 
-.. autoclass:: h2.events.PingAcknowledged
+.. autoclass:: h2.events.PingReceived
+   :members:
+
+.. autoclass:: h2.events.PingAckReceived
    :members:
 
 .. autoclass:: h2.events.StreamEnded
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst
index 2d5743a288c..b9aab6c6cf8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst
@@ -221,13 +221,11 @@ shown below:
 
 .. code-block:: console
 
-    $ hyper GET http://http2bin.org/get
+    $ hyper GET https://nghttp2.org/httpbin/get
     {'args': {},
-     'headers': {'Connection': 'keep-alive',
-                 'Host': 'http2bin.org',
-                 'Via': '2 http2bin.org'},
+     'headers': {'Host': 'nghttp2.org'},
      'origin': '10.0.0.2',
-     'url': 'http://http2bin.org/get'}
+     'url': 'https://nghttp2.org/httpbin/get'}
 
 Assuming it works, you're now ready to start sending HTTP/2 data.
 
@@ -251,9 +249,11 @@ The function should look something like this:
 .. code-block:: python
 
     import h2.connection
+    import h2.config
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
 
         while True:
             data = sock.recv(65535)
@@ -267,9 +267,11 @@ function. Your ``h2server.py`` should end up looking a like this:
     import socket
 
     import h2.connection
+    import h2.config
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
 
         while True:
             data = sock.recv(65535)
@@ -331,7 +333,8 @@ function to do just that:
 .. code-block:: python
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
         conn.initiate_connection()
         sock.sendall(conn.data_to_send())
 
@@ -359,9 +362,11 @@ Your ``h2server.py`` script should now look like this:
     import socket
 
     import h2.connection
+    import h2.config
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
         conn.initiate_connection()
         sock.sendall(conn.data_to_send())
 
@@ -493,9 +498,11 @@ Let's amend our ``handle`` function again:
 .. code-block:: python
 
     import h2.events
+    import h2.config
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
         conn.initiate_connection()
         sock.sendall(conn.data_to_send())
 
@@ -528,6 +535,7 @@ With these changes, your ``h2server.py`` file should look like this:
 
     import h2.connection
     import h2.events
+    import h2.config
 
     def send_response(conn, event):
         stream_id = event.stream_id
@@ -545,7 +553,8 @@ With these changes, your ``h2server.py`` file should look like this:
         )
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
         conn.initiate_connection()
         sock.sendall(conn.data_to_send())
 
@@ -633,6 +642,7 @@ file, which should now look like this:
 
     import h2.connection
     import h2.events
+    import h2.config
 
     def send_response(conn, event):
         stream_id = event.stream_id
@@ -654,7 +664,8 @@ file, which should now look like this:
         )
 
     def handle(sock):
-        conn = h2.connection.H2Connection(client_side=False)
+        config = h2.config.H2Configuration(client_side=False)
+        conn = h2.connection.H2Connection(config=config)
         conn.initiate_connection()
         sock.sendall(conn.data_to_send())
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py
index a3b3e8a4b99..a15a214634c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py
@@ -55,9 +55,9 @@ copyright = u'2015, Cory Benfield'
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.1'
+version = '3.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.1'
+release = '3.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst
index d4c72b2889e..20d58a71f1b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst
@@ -5,15 +5,19 @@ Negotiating HTTP/2
 
 .. _starting-alpn:
 
-HTTPS URLs (ALPN and NPN)
+HTTPS URLs (ALPN)
 -------------------------
 
-Starting HTTP/2 for HTTPS URLs is outlined in `RFC 7540 Section 3.3`_. In this case, the client and server use a TLS extension to negotiate HTTP/2: typically either or both of `NPN`_ or `ALPN`_. How to use NPN and ALPN is currently not covered in this document: please consult the documentation for either the :mod:`ssl module <python:ssl>` in the standard library, or the :mod:`PyOpenSSL <pyopenssl:OpenSSL.SSL>` third-party modules, for more on this topic.
+Starting HTTP/2 for HTTPS URLs is outlined in `RFC 7540 Section 3.3`_. In this case, the client and server use a TLS extension to negotiate HTTP/2: `ALPN`_. How to use ALPN is currently not covered in this document: please consult the documentation for either the :mod:`ssl module <python:ssl>` in the standard library, or the :mod:`PyOpenSSL <pyopenssl:OpenSSL.SSL>` third-party modules, for more on this topic.
 
 This method is the simplest to use once the TLS connection is established. To use it with Hyper-h2, after you've established the connection and confirmed that HTTP/2 has been negotiated with `ALPN`_, create a :class:`H2Connection <h2.connection.H2Connection>` object and call :meth:`H2Connection.initiate_connection <h2.connection.H2Connection.initiate_connection>`. This will ensure that the appropriate preamble data is placed in the data buffer. You should then immediately send the data returned by :meth:`H2Connection.data_to_send <h2.connection.H2Connection.data_to_send>` on your TLS connection.
 
 At this point, you're free to use all the HTTP/2 functionality provided by Hyper-h2.
 
+.. note::
+   Although Hyper-h2 is not concerned with negotiating protocol versions, it is important to note that support for `ALPN`_ is not available in the standard library of Python versions < 2.7.9.
+   As a consequence, clients may encounter various errors due to protocol versions mismatch.
+
 Server Setup Example
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -90,11 +94,10 @@ The code below demonstrates how to handle a plaintext upgrade from the perspecti
 Prior Knowledge
 ---------------
 
-It's possible that you as a client know that a particular server supports HTTP/2, and that you do not need to perform any of the negotiations described above. In that case, you may follow the steps in :ref:`starting-alpn`, ignoring all references to ALPN and NPN: there's no need to perform the upgrade dance described in :ref:`starting-upgrade`.
+It's possible that you as a client know that a particular server supports HTTP/2, and that you do not need to perform any of the negotiations described above. In that case, you may follow the steps in :ref:`starting-alpn`, ignoring all references to ALPN: there's no need to perform the upgrade dance described in :ref:`starting-upgrade`.
 
 .. _RFC 7540: https://tools.ietf.org/html/rfc7540
 .. _RFC 7540 Section 3.2: https://tools.ietf.org/html/rfc7540#section-3.2
 .. _RFC 7540 Section 3.3: https://tools.ietf.org/html/rfc7540#section-3.3
-.. _NPN: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation
 .. _ALPN: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation
 .. _RFC 7230 Section 6.7: https://tools.ietf.org/html/rfc7230#section-6.7
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst
index 20753527ca3..df93b144e71 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst
@@ -5,7 +5,7 @@ This example is a basic HTTP/2 client written for the `Twisted`_ asynchronous
 networking framework.
 
 This client is fairly simple: it makes a hard-coded HEAD request to
-http2bin.org and prints out the response data. Its purpose is to demonstrate
+nghttp2.org/httpbin/ and prints out the response data. Its purpose is to demonstrate
 how to write a very basic HTTP/2 client implementation.
 
 .. literalinclude:: ../../examples/twisted/head_request.py
@@ -14,4 +14,4 @@ how to write a very basic HTTP/2 client implementation.
    :encoding: utf-8
 
 
-.. _Twisted: https://twistedmatrix.com/
\ No newline at end of file
+.. _Twisted: https://twistedmatrix.com/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst
index 21bc8ac09f3..7e3aba41a38 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst
@@ -5,7 +5,7 @@ This example is a basic HTTP/2 client written for the `Twisted`_ asynchronous
 networking framework.
 
 This client is fairly simple: it makes a hard-coded POST request to
-http2bin.org and prints out the response data, sending a file that is provided
+nghttp2.org/httpbin/post and prints out the response data, sending a file that is provided
 on the command line or the script itself. Its purpose is to demonstrate how to
 write a HTTP/2 client implementation that handles flow control.
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py
index 0e5b912e2df..278774644bc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py
@@ -8,10 +8,6 @@ A fully-functional HTTP/2 server using asyncio. Requires Python 3.5+.
 This example demonstrates handling requests with bodies, as well as handling
 those without. In particular, it demonstrates the fact that DataReceived may
 be called multiple times, and that applications must handle that possibility.
-
-Please note that this example does not handle flow control, and so only works
-properly for relatively small requests. Please see other examples to understand
-how flow control should work.
 """
 import asyncio
 import io
@@ -23,10 +19,12 @@ from typing import List, Tuple
 from h2.config import H2Configuration
 from h2.connection import H2Connection
 from h2.events import (
-    ConnectionTerminated, DataReceived, RequestReceived, StreamEnded
+    ConnectionTerminated, DataReceived, RemoteSettingsChanged,
+    RequestReceived, StreamEnded, StreamReset, WindowUpdated
 )
 from h2.errors import ErrorCodes
-from h2.exceptions import ProtocolError
+from h2.exceptions import ProtocolError, StreamClosedError
+from h2.settings import SettingCodes
 
 
 RequestData = collections.namedtuple('RequestData', ['headers', 'data'])
@@ -38,12 +36,18 @@ class H2Protocol(asyncio.Protocol):
         self.conn = H2Connection(config=config)
         self.transport = None
         self.stream_data = {}
+        self.flow_control_futures = {}
 
     def connection_made(self, transport: asyncio.Transport):
         self.transport = transport
         self.conn.initiate_connection()
         self.transport.write(self.conn.data_to_send())
 
+    def connection_lost(self, exc):
+        for future in self.flow_control_futures.values():
+            future.cancel()
+        self.flow_control_futures = {}
+
     def data_received(self, data: bytes):
         try:
             events = self.conn.receive_data(data)
@@ -61,6 +65,13 @@ class H2Protocol(asyncio.Protocol):
                     self.stream_complete(event.stream_id)
                 elif isinstance(event, ConnectionTerminated):
                     self.transport.close()
+                elif isinstance(event, StreamReset):
+                    self.stream_reset(event.stream_id)
+                elif isinstance(event, WindowUpdated):
+                    self.window_updated(event.stream_id, event.delta)
+                elif isinstance(event, RemoteSettingsChanged):
+                    if SettingCodes.INITIAL_WINDOW_SIZE in event.changed_settings:
+                        self.window_updated(None, 0)
 
                 self.transport.write(self.conn.data_to_send())
 
@@ -68,11 +79,6 @@ class H2Protocol(asyncio.Protocol):
         headers = collections.OrderedDict(headers)
         method = headers[':method']
 
-        # We only support GET and POST.
-        if method not in ('GET', 'POST'):
-            self.return_405(headers, stream_id)
-            return
-
         # Store off the request data.
         request_data = RequestData(headers, io.BytesIO())
         self.stream_data[stream_id] = request_data
@@ -101,18 +107,7 @@ class H2Protocol(asyncio.Protocol):
             ('server', 'asyncio-h2'),
         )
         self.conn.send_headers(stream_id, response_headers)
-        self.conn.send_data(stream_id, data, end_stream=True)
-
-    def return_405(self, headers: List[Tuple[str, str]], stream_id: int):
-        """
-        We don't support the given method, so we want to return a 405 response.
-        """
-        response_headers = (
-            (':status', '405'),
-            ('content-length', '0'),
-            ('server', 'asyncio-h2'),
-        )
-        self.conn.send_headers(stream_id, response_headers, end_stream=True)
+        asyncio.ensure_future(self.send_data(data, stream_id))
 
     def receive_data(self, data: bytes, stream_id: int):
         """
@@ -128,12 +123,72 @@ class H2Protocol(asyncio.Protocol):
         else:
             stream_data.data.write(data)
 
+    def stream_reset(self, stream_id):
+        """
+        A stream reset was sent. Stop sending data.
+        """
+        if stream_id in self.flow_control_futures:
+            future = self.flow_control_futures.pop(stream_id)
+            future.cancel()
+
+    async def send_data(self, data, stream_id):
+        """
+        Send data according to the flow control rules.
+        """
+        while data:
+            while self.conn.local_flow_control_window(stream_id) < 1:
+                try:
+                    await self.wait_for_flow_control(stream_id)
+                except asyncio.CancelledError:
+                    return
+
+            chunk_size = min(
+                self.conn.local_flow_control_window(stream_id),
+                len(data),
+                self.conn.max_outbound_frame_size,
+            )
+
+            try:
+                self.conn.send_data(
+                    stream_id,
+                    data[:chunk_size],
+                    end_stream=(chunk_size == len(data))
+                )
+            except (StreamClosedError, ProtocolError):
+                # The stream got closed and we didn't get told. We're done
+                # here.
+                break
+
+            self.transport.write(self.conn.data_to_send())
+            data = data[chunk_size:]
+
+    async def wait_for_flow_control(self, stream_id):
+        """
+        Waits for a Future that fires when the flow control window is opened.
+        """
+        f = asyncio.Future()
+        self.flow_control_futures[stream_id] = f
+        await f
+
+    def window_updated(self, stream_id, delta):
+        """
+        A window update frame was received. Unblock some number of flow control
+        Futures.
+        """
+        if stream_id and stream_id in self.flow_control_futures:
+            f = self.flow_control_futures.pop(stream_id)
+            f.set_result(delta)
+        elif not stream_id:
+            for f in self.flow_control_futures.values():
+                f.set_result(delta)
+
+            self.flow_control_futures = {}
+
 
 ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
 ssl_context.options |= (
     ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 | ssl.OP_NO_COMPRESSION
 )
-ssl_context.set_ciphers("ECDHE+AESGCM")
 ssl_context.load_cert_chain(certfile="cert.crt", keyfile="cert.key")
 ssl_context.set_alpn_protocols(["h2"])
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py
index 09ab2ce0541..9fdb2fa0fc3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py
@@ -5,7 +5,7 @@ asyncio-server.py
 
 A fully-functional WSGI server, written using hyper-h2. Requires asyncio.
 
-To test it, try installing httpin from pip (``pip install httpbin``) and then
+To test it, try installing httpbin from pip (``pip install httpbin``) and then
 running the server (``python asyncio-server.py httpbin:app``).
 
 This server does not support HTTP/1.1: it is a HTTP/2-only WSGI server. The
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py
index 01604b44e6f..f93d4db9d04 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py
@@ -12,7 +12,7 @@ import mimetypes
 import os
 import sys
 
-from curio import Kernel, Event, spawn, socket, ssl
+from curio import Event, spawn, socket, ssl, run
 
 import h2.config
 import h2.connection
@@ -23,7 +23,7 @@ import h2.events
 READ_CHUNK_SIZE = 8192
 
 
-def create_listening_ssl_socket(address, certfile, keyfile):
+async def create_listening_ssl_socket(address, certfile, keyfile):
     """
     Create and return a listening TLS socket on a given address.
     """
@@ -37,7 +37,7 @@ def create_listening_ssl_socket(address, certfile, keyfile):
 
     sock = socket.socket()
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    sock = ssl_context.wrap_socket(sock)
+    sock = await ssl_context.wrap_socket(sock)
     sock.bind(address)
     sock.listen()
 
@@ -48,7 +48,7 @@ async def h2_server(address, root, certfile, keyfile):
     """
     Create an HTTP/2 server at the given address.
     """
-    sock = create_listening_ssl_socket(address, certfile, keyfile)
+    sock = await create_listening_ssl_socket(address, certfile, keyfile)
     print("Now listening on %s:%d" % address)
 
     async with sock:
@@ -150,7 +150,7 @@ class H2Server:
         Send the data portion of a file. Handles flow control rules.
         """
         while True:
-            while not self.conn.local_flow_control_window(stream_id):
+            while self.conn.local_flow_control_window(stream_id) < 1:
                 await self.wait_for_flow_control(stream_id)
 
             chunk_size = min(
@@ -196,13 +196,11 @@ class H2Server:
 
 if __name__ == '__main__':
     host = sys.argv[2] if len(sys.argv) > 2 else "localhost"
-    kernel = Kernel(with_monitor=True)
     print("Try GETting:")
     print("    On OSX after 'brew install curl --with-c-ares --with-libidn --with-nghttp2 --with-openssl':")
     print("/usr/local/opt/curl/bin/curl --tlsv1.2 --http2 -k https://localhost:5000/bundle.js")
     print("Or open a browser to: https://localhost:5000/")
     print("   (Accept all the warnings)")
-    kernel.run(h2_server((host, 5000),
-                         sys.argv[1],
-                         "{}.crt.pem".format(host),
-                         "{}.key".format(host)))
+    run(h2_server((host, 5000), sys.argv[1],
+                  "{}.crt.pem".format(host),
+                  "{}.key".format(host)), with_monitor=True)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py
index ff34e2f9ccd..a46cfb3d158 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py
@@ -51,7 +51,7 @@ class ConnectionManager(object):
         response_headers = (
             (':status', '200'),
             ('content-type', 'application/json'),
-            ('content-length', len(data)),
+            ('content-length', str(len(data))),
             ('server', 'eventlet-h2'),
         )
         self.conn.send_headers(stream_id, response_headers)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py
index 9958c1bd726..269194d6c77 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py
@@ -48,7 +48,7 @@ def get_http2_ssl_context():
 
     # RFC 7540 Section 9.2.2: "deployments of HTTP/2 that use TLS 1.2 MUST
     # support TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256". In practice, the
-    # blacklist defined in this section allows only the AES GCM and ChaCha20
+    # blocklist defined in this section allows only the AES GCM and ChaCha20
     # cipher suites with ephemeral key negotiation.
     ctx.set_ciphers("ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20")
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py
index 34ff298cd97..f45c002df74 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py
@@ -38,7 +38,7 @@ def send_initial_request(connection, settings):
         b"GET / HTTP/1.1\r\n" +
         b"Host: localhost\r\n" +
         b"Upgrade: h2c\r\n" +
-        b"HTTP2-Settings: " + settings + "\r\n"
+        b"HTTP2-Settings: " + settings + b"\r\n" +
         b"\r\n"
     )
     connection.sendall(request)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py
index 14ec0ef237d..9fc361f2c62 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py
@@ -51,7 +51,7 @@ def get_http2_ssl_context():
 
     # RFC 7540 Section 9.2.2: "deployments of HTTP/2 that use TLS 1.2 MUST
     # support TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256". In practice, the
-    # blacklist defined in this section allows only the AES GCM and ChaCha20
+    # blocklist defined in this section allows only the AES GCM and ChaCha20
     # cipher suites with ephemeral key negotiation.
     ctx.set_ciphers("ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20")
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py
index 5b77c05fe0d..7e8b1f0eea8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py
@@ -45,14 +45,14 @@ def receive_initial_request(connection):
         data += connection.recv(8192)
 
     match = re.search(b'Upgrade: h2c\r\n', data)
-    if match is not None:
+    if match is None:
         raise RuntimeError("HTTP/2 upgrade not requested!")
 
     # We need to look for the HTTP2-Settings header field. Again, in production
     # code you shouldn't use regular expressions for this, but it's good enough
     # for the example.
     match = re.search(b'HTTP2-Settings: (\\S+)\r\n', data)
-    if match is not None:
+    if match is None:
         raise RuntimeError("HTTP2-Settings header field not present!")
 
     return match.group(1)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py
index 72fe5f88918..4a7538024a9 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py
@@ -23,8 +23,8 @@ from h2.events import (
 )
 
 
-AUTHORITY = u'http2bin.org'
-PATH = '/'
+AUTHORITY = u'nghttp2.org'
+PATH = '/httpbin/'
 SIZE = 4096
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py
index 746f13266a2..c817bac465f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py
@@ -30,8 +30,8 @@ from h2.events import (
 )
 
 
-AUTHORITY = u'http2bin.org'
-PATH = '/post'
+AUTHORITY = u'nghttp2.org'
+PATH = '/httpbin/post'
 
 
 class H2Protocol(Protocol):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py
index 7cde609db0c..75a271d9b79 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py
@@ -20,6 +20,7 @@ from h2.connection import H2Connection
 from h2.events import (
     RequestReceived, DataReceived, WindowUpdated
 )
+from h2.exceptions import ProtocolError
 
 
 def close_file(file, d):
@@ -46,17 +47,23 @@ class H2Protocol(Protocol):
         if not self.known_proto:
             self.known_proto = True
 
-        events = self.conn.receive_data(data)
-        if self.conn.data_to_send:
-            self.transport.write(self.conn.data_to_send())
+        try:
+            events = self.conn.receive_data(data)
+        except ProtocolError:
+            if self.conn.data_to_send:
+                self.transport.write(self.conn.data_to_send())
+            self.transport.loseConnection()
+        else:
+            for event in events:
+                if isinstance(event, RequestReceived):
+                    self.requestReceived(event.headers, event.stream_id)
+                elif isinstance(event, DataReceived):
+                    self.dataFrameReceived(event.stream_id)
+                elif isinstance(event, WindowUpdated):
+                    self.windowUpdated(event)
 
-        for event in events:
-            if isinstance(event, RequestReceived):
-                self.requestReceived(event.headers, event.stream_id)
-            elif isinstance(event, DataReceived):
-                self.dataFrameReceived(event.stream_id)
-            elif isinstance(event, WindowUpdated):
-                self.windowUpdated(event)
+            if self.conn.data_to_send:
+                self.transport.write(self.conn.data_to_send())
 
     def requestReceived(self, headers, stream_id):
         headers = dict(headers)  # Invalid conversion, fix later.
@@ -86,7 +93,9 @@ class H2Protocol(Protocol):
 
     def sendFile(self, file_path, stream_id):
         filesize = os.stat(file_path).st_size
-        content_type, content_encoding = mimetypes.guess_type(file_path)
+        content_type, content_encoding = mimetypes.guess_type(
+            file_path.decode('utf-8')
+        )
         response_headers = [
             (':status', '200'),
             ('content-length', str(filesize)),
@@ -159,10 +168,11 @@ class H2Factory(Factory):
         self.root = root
 
     def buildProtocol(self, addr):
+        print(H2Protocol)
         return H2Protocol(self.root)
 
 
-root = sys.argv[1]
+root = sys.argv[1].encode('utf-8')
 
 with open('server.crt', 'r') as f:
     cert_data = f.read()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py
index 38805dd770d..6290710e634 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py
@@ -5,4 +5,4 @@ h2
 
 A HTTP/2 implementation.
 """
-__version__ = '3.0.1'
+__version__ = '3.2.0'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py
index 08129a40668..1c437ee24f8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py
@@ -29,7 +29,7 @@ class DummyLogger(object):
     """
     An Logger object that does not actual logging, hence a DummyLogger.
 
-    For the class the log operation is merely a no-op.  The intent is to avoid
+    For the class the log operation is merely a no-op. The intent is to avoid
     conditionals being sprinkled throughout the hyper-h2 code for calls to
     logging functions when no logger is passed into the corresponding object.
     """
@@ -42,6 +42,12 @@ class DummyLogger(object):
         """
         pass
 
+    def trace(self, *vargs, **kwargs):
+        """
+        No-op logging. Only level needed for now.
+        """
+        pass
+
 
 class H2Configuration(object):
     """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py
index 4405183e866..35e6fd6da88 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py
@@ -21,7 +21,7 @@ from hpack.exceptions import HPACKError, OversizedHeaderListError
 from .config import H2Configuration
 from .errors import ErrorCodes, _error_code_from_int
 from .events import (
-    WindowUpdated, RemoteSettingsChanged, PingAcknowledged,
+    WindowUpdated, RemoteSettingsChanged, PingReceived, PingAckReceived,
     SettingsAcknowledged, ConnectionTerminated, PriorityUpdated,
     AlternativeServiceAvailable, UnknownFrameReceived
 )
@@ -33,7 +33,7 @@ from .exceptions import (
 from .frame_buffer import FrameBuffer
 from .settings import Settings, SettingCodes
 from .stream import H2Stream, StreamClosedBy
-from .utilities import guard_increment_window
+from .utilities import SizeLimitDict, guard_increment_window
 from .windows import WindowManager
 
 
@@ -281,6 +281,9 @@ class H2Connection(object):
     # The initial default value of SETTINGS_MAX_HEADER_LIST_SIZE.
     DEFAULT_MAX_HEADER_LIST_SIZE = 2**16
 
+    # Keep in memory limited amount of results for streams closes
+    MAX_CLOSED_STREAMS = 2**16
+
     def __init__(self, config=None):
         self.state_machine = H2ConnectionStateMachine()
         self.streams = {}
@@ -325,7 +328,7 @@ class H2Connection(object):
         )
         self.remote_settings = Settings(client=not self.config.client_side)
 
-        # The curent value of the connection flow control windows on the
+        # The current value of the connection flow control windows on the
         # connection.
         self.outbound_flow_control_window = (
             self.remote_settings.initial_window_size
@@ -347,7 +350,7 @@ class H2Connection(object):
         self._header_frames = []
 
         # Data that needs to be sent.
-        self._data_to_send = b''
+        self._data_to_send = bytearray()
 
         # Keeps track of how streams are closed.
         # Used to ensure that we don't blow up in the face of frames that were
@@ -355,7 +358,9 @@ class H2Connection(object):
         # Also used to determine whether we should consider a frame received
         # while a stream is closed as either a stream error or a connection
         # error.
-        self._closed_streams = {}
+        self._closed_streams = SizeLimitDict(
+            size_limit=self.MAX_CLOSED_STREAMS
+        )
 
         # The flow control window manager for the connection.
         self._inbound_flow_control_window_manager = WindowManager(
@@ -909,16 +914,21 @@ class H2Connection(object):
             frames = stream.increase_flow_control_window(
                 increment
             )
+
+            self.config.logger.debug(
+                "Increase stream ID %d flow control window by %d",
+                stream_id, increment
+            )
         else:
             self._inbound_flow_control_window_manager.window_opened(increment)
             f = WindowUpdateFrame(0)
             f.window_increment = increment
             frames = [f]
 
-        self.config.logger.debug(
-            "Increase stream ID %d flow control window by %d",
-            stream_id, increment
-        )
+            self.config.logger.debug(
+                "Increase connection flow control window by %d", increment
+            )
+
         self._prepare_for_sending(frames)
 
     def push_stream(self, stream_id, promised_stream_id, request_headers):
@@ -1327,7 +1337,7 @@ class H2Connection(object):
 
         self._prepare_for_sending(frames)
 
-    def data_to_send(self, amt=None):
+    def data_to_send(self, amount=None):
         """
         Returns some data for sending out of the internal data buffer.
 
@@ -1336,19 +1346,19 @@ class H2Connection(object):
         or less if that much data is not available. It does not perform any
         I/O, and so uses a different name.
 
-        :param amt: (optional) The maximum amount of data to return. If not
+        :param amount: (optional) The maximum amount of data to return. If not
             set, or set to ``None``, will return as much data as possible.
-        :type amt: ``int``
+        :type amount: ``int``
         :returns: A bytestring containing the data to send on the wire.
         :rtype: ``bytes``
         """
-        if amt is None:
-            data = self._data_to_send
-            self._data_to_send = b''
+        if amount is None:
+            data = bytes(self._data_to_send)
+            self._data_to_send = bytearray()
             return data
         else:
-            data = self._data_to_send[:amt]
-            self._data_to_send = self._data_to_send[amt:]
+            data = bytes(self._data_to_send[:amount])
+            self._data_to_send = self._data_to_send[amount:]
             return data
 
     def clear_outbound_data_buffer(self):
@@ -1361,7 +1371,7 @@ class H2Connection(object):
         This method should not normally be used, but is made available to avoid
         exposing implementation details.
         """
-        self._data_to_send = b''
+        self._data_to_send = bytearray()
 
     def _acknowledge_settings(self):
         """
@@ -1440,7 +1450,7 @@ class H2Connection(object):
         :returns: A list of events that the remote peer triggered by sending
             this data.
         """
-        self.config.logger.debug(
+        self.config.logger.trace(
             "Process received data on connection. Received data: %r", data
         )
 
@@ -1624,6 +1634,35 @@ class H2Connection(object):
 
         return frames, events + stream_events
 
+    def _handle_data_on_closed_stream(self, events, exc, frame):
+        # This stream is already closed - and yet we received a DATA frame.
+        # The received DATA frame counts towards the connection flow window.
+        # We need to manually to acknowledge the DATA frame to update the flow
+        # window of the connection. Otherwise the whole connection stalls due
+        # the inbound flow window being 0.
+        frames = []
+        conn_manager = self._inbound_flow_control_window_manager
+        conn_increment = conn_manager.process_bytes(
+            frame.flow_controlled_length
+        )
+        if conn_increment:
+            f = WindowUpdateFrame(0)
+            f.window_increment = conn_increment
+            frames.append(f)
+            self.config.logger.debug(
+                "Received DATA frame on closed stream %d - "
+                "auto-emitted a WINDOW_UPDATE by %d",
+                frame.stream_id, conn_increment
+            )
+        f = RstStreamFrame(exc.stream_id)
+        f.error_code = exc.error_code
+        frames.append(f)
+        self.config.logger.debug(
+            "Stream %d already CLOSED or cleaned up - "
+            "auto-emitted a RST_FRAME" % frame.stream_id
+        )
+        return frames, events + exc._events
+
     def _receive_data_frame(self, frame):
         """
         Receive a data frame on the connection.
@@ -1636,12 +1675,19 @@ class H2Connection(object):
         self._inbound_flow_control_window_manager.window_consumed(
             flow_controlled_length
         )
-        stream = self._get_stream_by_id(frame.stream_id)
-        frames, stream_events = stream.receive_data(
-            frame.data,
-            'END_STREAM' in frame.flags,
-            flow_controlled_length
-        )
+
+        try:
+            stream = self._get_stream_by_id(frame.stream_id)
+            frames, stream_events = stream.receive_data(
+                frame.data,
+                'END_STREAM' in frame.flags,
+                flow_controlled_length
+            )
+        except StreamClosedError as e:
+            # This stream is either marked as CLOSED or already gone from our
+            # internal state.
+            return self._handle_data_on_closed_stream(events, e, frame)
+
         return frames, events + stream_events
 
     def _receive_settings_frame(self, frame):
@@ -1717,15 +1763,19 @@ class H2Connection(object):
         flags = []
 
         if 'ACK' in frame.flags:
-            evt = PingAcknowledged()
-            evt.ping_data = frame.opaque_data
-            events.append(evt)
+            evt = PingAckReceived()
         else:
+            evt = PingReceived()
+
+            # automatically ACK the PING with the same 'opaque data'
             f = PingFrame(0)
             f.flags = {'ACK'}
             f.opaque_data = frame.opaque_data
             flags.append(f)
 
+        evt.ping_data = frame.opaque_data
+        events.append(evt)
+
         return flags, events
 
     def _receive_rst_stream_frame(self, frame):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py
index ff3ec3df313..a06c9903d5a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py
@@ -356,22 +356,51 @@ class RemoteSettingsChanged(Event):
         )
 
 
-class PingAcknowledged(Event):
+class PingReceived(Event):
     """
-    The PingAcknowledged event is fired whenever a user-emitted PING is
-    acknowledged. This contains the data in the ACK'ed PING, allowing the
-    user to correlate PINGs and calculate RTT.
+    The PingReceived event is fired whenever a PING is received. It contains
+    the 'opaque data' of the PING frame. A ping acknowledgment with the same
+    'opaque data' is automatically emitted after receiving a ping.
+
+    .. versionadded:: 3.1.0
     """
     def __init__(self):
         #: The data included on the ping.
         self.ping_data = None
 
     def __repr__(self):
-        return "<PingAcknowledged ping_data:%s>" % (
+        return "<PingReceived ping_data:%s>" % (
             _bytes_representation(self.ping_data),
         )
 
 
+class PingAcknowledged(Event):
+    """
+    Same as PingAckReceived.
+
+    .. deprecated:: 3.1.0
+    """
+    def __init__(self):
+        #: The data included on the ping.
+        self.ping_data = None
+
+    def __repr__(self):
+        return "<PingAckReceived ping_data:%s>" % (
+            _bytes_representation(self.ping_data),
+        )
+
+
+class PingAckReceived(PingAcknowledged):
+    """
+    The PingAckReceived event is fired whenever a PING acknowledgment is
+    received. It contains the 'opaque data' of the PING+ACK frame, allowing the
+    user to correlate PINGs and calculate RTT.
+
+    .. versionadded:: 3.1.0
+    """
+    pass
+
+
 class StreamEnded(Event):
     """
     The StreamEnded event is fired whenever a stream is ended by a remote
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py
index 3da720329cb..bf87c94f4e8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py
@@ -15,6 +15,12 @@ from hyperframe.frame import SettingsFrame
 from h2.errors import ErrorCodes
 from h2.exceptions import InvalidSettingsValueError
 
+try:
+    from collections.abc import MutableMapping
+except ImportError:  # pragma: no cover
+    # Python 2.7 compatibility
+    from collections import MutableMapping
+
 
 class SettingCodes(enum.IntEnum):
     """
@@ -49,6 +55,10 @@ class SettingCodes(enum.IntEnum):
     #: and value in octets plus an overhead of 32 octets for each header field.
     MAX_HEADER_LIST_SIZE = SettingsFrame.MAX_HEADER_LIST_SIZE
 
+    #: This setting can be used to enable the connect protocol. To enable on a
+    #: client set this to 1.
+    ENABLE_CONNECT_PROTOCOL = SettingsFrame.ENABLE_CONNECT_PROTOCOL
+
 
 def _setting_code_from_int(code):
     """
@@ -88,7 +98,7 @@ class ChangedSetting:
         )
 
 
-class Settings(collections.MutableMapping):
+class Settings(MutableMapping):
     """
     An object that encapsulates HTTP/2 settings state.
 
@@ -135,6 +145,7 @@ class Settings(collections.MutableMapping):
             SettingCodes.ENABLE_PUSH: collections.deque([int(client)]),
             SettingCodes.INITIAL_WINDOW_SIZE: collections.deque([65535]),
             SettingCodes.MAX_FRAME_SIZE: collections.deque([16384]),
+            SettingCodes.ENABLE_CONNECT_PROTOCOL: collections.deque([0]),
         }
         if initial_values is not None:
             for key, value in initial_values.items():
@@ -243,6 +254,18 @@ class Settings(collections.MutableMapping):
     def max_header_list_size(self, value):
         self[SettingCodes.MAX_HEADER_LIST_SIZE] = value
 
+    @property
+    def enable_connect_protocol(self):
+        """
+        The current value of the :data:`ENABLE_CONNECT_PROTOCOL
+        <h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL>` setting.
+        """
+        return self[SettingCodes.ENABLE_CONNECT_PROTOCOL]
+
+    @enable_connect_protocol.setter
+    def enable_connect_protocol(self, value):
+        self[SettingCodes.ENABLE_CONNECT_PROTOCOL] = value
+
     # Implement the MutableMapping API.
     def __getitem__(self, key):
         val = self._settings[key][0]
@@ -292,7 +315,7 @@ class Settings(collections.MutableMapping):
             return NotImplemented
 
 
-def _validate_setting(setting, value):
+def _validate_setting(setting, value):  # noqa: C901
     """
     Confirms that a specific setting has a well-formed value. If the setting is
     invalid, returns an error code. Otherwise, returns 0 (NO_ERROR).
@@ -309,5 +332,8 @@ def _validate_setting(setting, value):
     elif setting == SettingCodes.MAX_HEADER_LIST_SIZE:
         if value < 0:
             return ErrorCodes.PROTOCOL_ERROR
+    elif setting == SettingCodes.ENABLE_CONNECT_PROTOCOL:
+        if value not in (0, 1):
+            return ErrorCodes.PROTOCOL_ERROR
 
     return 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py
index 489ea4d8d6f..1cb91786d42 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py
@@ -378,41 +378,6 @@ class H2StreamStateMachine(object):
         """
         raise ProtocolError("Attempted to push on closed stream.")
 
-    def window_on_closed_stream(self, previous_state):
-        """
-        Called when a WINDOW_UPDATE frame is received on an already-closed
-        stream.
-
-        If we sent an END_STREAM frame, we just ignore the frame, as instructed
-        in RFC 7540 Section 5.1. Technically we should eventually consider
-        WINDOW_UPDATE in this state an error, but we don't have access to a
-        clock so we just always allow it. If we closed the stream for any other
-        reason, we behave as we do for receiving any other frame on a closed
-        stream.
-        """
-        assert self.stream_closed_by is not None
-
-        if self.stream_closed_by == StreamClosedBy.SEND_END_STREAM:
-            return []
-        return self.recv_on_closed_stream(previous_state)
-
-    def reset_on_closed_stream(self, previous_state):
-        """
-        Called when a RST_STREAM frame is received on an already-closed stream.
-
-        If we sent an END_STREAM frame, we just ignore the frame, as instructed
-        in RFC 7540 Section 5.1. Technically we should eventually consider
-        RST_STREAM in this state an error, but we don't have access to a clock
-        so we just always allow it. If we closed the stream for any other
-        reason, we behave as we do for receiving any other frame on a closed
-        stream.
-        """
-        assert self.stream_closed_by is not None
-
-        if self.stream_closed_by is StreamClosedBy.SEND_END_STREAM:
-            return []
-        return self.recv_on_closed_stream(previous_state)
-
     def send_informational_response(self, previous_state):
         """
         Called when an informational header block is sent (that is, a block
@@ -740,11 +705,12 @@ _transitions = {
 
     # > WINDOW_UPDATE or RST_STREAM frames can be received in this state
     # > for a short period after a DATA or HEADERS frame containing a
-    # > END_STREAM flag is sent.
+    # > END_STREAM flag is sent, as instructed in RFC 7540 Section 5.1. But we
+    # > don't have access to a clock so we just always allow it.
     (StreamState.CLOSED, StreamInputs.RECV_WINDOW_UPDATE):
-        (H2StreamStateMachine.window_on_closed_stream, StreamState.CLOSED),
+        (None, StreamState.CLOSED),
     (StreamState.CLOSED, StreamInputs.RECV_RST_STREAM):
-        (H2StreamStateMachine.reset_on_closed_stream, StreamState.CLOSED),
+        (None, StreamState.CLOSED),
 
     # > A receiver MUST treat the receipt of a PUSH_PROMISE on a stream that is
     # > neither "open" nor "half-closed (local)" as a connection error of type
@@ -788,7 +754,7 @@ class H2Stream(object):
         self.max_outbound_frame_size = None
         self.request_method = None
 
-        # The curent value of the outbound stream flow control window
+        # The current value of the outbound stream flow control window
         self.outbound_flow_control_window = outbound_window_size
 
         # The flow control manager.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py
index 0cff0fa6710..06c916eea7b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py
@@ -33,6 +33,7 @@ _ALLOWED_PSEUDO_HEADER_FIELDS = frozenset([
     b':authority', u':authority',
     b':path', u':path',
     b':status', u':status',
+    b':protocol', u':protocol',
 ])
 
 
@@ -47,13 +48,19 @@ _REQUEST_ONLY_HEADERS = frozenset([
     b':scheme', u':scheme',
     b':path', u':path',
     b':authority', u':authority',
-    b':method', u':method'
+    b':method', u':method',
+    b':protocol', u':protocol',
 ])
 
 
 _RESPONSE_ONLY_HEADERS = frozenset([b':status', u':status'])
 
 
+# A Set of pseudo headers that are only valid if the method is
+# CONNECT, see RFC 8441 § 5
+_CONNECT_REQUEST_ONLY_HEADERS = frozenset([b':protocol', u':protocol'])
+
+
 if sys.version_info[0] == 2:  # Python 2.X
     _WHITESPACE = frozenset(whitespace)
 else:  # Python 3.3+
@@ -323,6 +330,7 @@ def _reject_pseudo_header_fields(headers, hdr_validation_flags):
     """
     seen_pseudo_header_fields = set()
     seen_regular_header = False
+    method = None
 
     for header in headers:
         if _custom_startswith(header[0], b':', u':'):
@@ -344,6 +352,12 @@ def _reject_pseudo_header_fields(headers, hdr_validation_flags):
                     "Received custom pseudo-header field %s" % header[0]
                 )
 
+            if header[0] in (b':method', u':method'):
+                if not isinstance(header[1], bytes):
+                    method = header[1].encode('utf-8')
+                else:
+                    method = header[1]
+
         else:
             seen_regular_header = True
 
@@ -351,11 +365,12 @@ def _reject_pseudo_header_fields(headers, hdr_validation_flags):
 
     # Check the pseudo-headers we got to confirm they're acceptable.
     _check_pseudo_header_field_acceptability(
-        seen_pseudo_header_fields, hdr_validation_flags
+        seen_pseudo_header_fields, method, hdr_validation_flags
     )
 
 
 def _check_pseudo_header_field_acceptability(pseudo_headers,
+                                             method,
                                              hdr_validation_flags):
     """
     Given the set of pseudo-headers present in a header block and the
@@ -394,6 +409,13 @@ def _check_pseudo_header_field_acceptability(pseudo_headers,
                 "Encountered response-only headers %s" %
                 invalid_request_headers
             )
+        if method != b'CONNECT':
+            invalid_headers = pseudo_headers & _CONNECT_REQUEST_ONLY_HEADERS
+            if invalid_headers:
+                raise ProtocolError(
+                    "Encountered connect-request-only headers %s" %
+                    invalid_headers
+                )
 
 
 def _validate_host_authority_header(headers):
@@ -617,3 +639,22 @@ def validate_outbound_headers(headers, hdr_validation_flags):
     headers = _check_path_header(headers, hdr_validation_flags)
 
     return headers
+
+
+class SizeLimitDict(collections.OrderedDict):
+
+    def __init__(self, *args, **kwargs):
+        self._size_limit = kwargs.pop("size_limit", None)
+        super(SizeLimitDict, self).__init__(*args, **kwargs)
+
+        self._check_size_limit()
+
+    def __setitem__(self, key, value):
+        super(SizeLimitDict, self).__setitem__(key, value)
+
+        self._check_size_limit()
+
+    def _check_size_limit(self):
+        if self._size_limit is not None:
+            while len(self) > self._size_limit:
+                self.popitem(last=False)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg
index 5e4090017a9..3670507ff12 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg
@@ -1,2 +1,10 @@
+[tool:pytest]
+testpaths = test
+
 [wheel]
 universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.py b/tests/wpt/web-platform-tests/tools/third_party/h2/setup.py
index d3b77f9d790..1ce95d5796d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/setup.py
@@ -40,7 +40,11 @@ setup(
     long_description=u'\n\n'.join([readme, history]),
     author='Cory Benfield',
     author_email='cory@lukasa.co.uk',
-    url='http://hyper.rtfd.org',
+    url='https://github.com/python-hyper/hyper-h2',
+    project_urls={
+        'Documentation': 'https://python-hyper.org/projects/h2',
+        'Source': 'https://github.com/python-hyper/hyper-h2',
+    },
     packages=packages,
     package_data={'': ['LICENSE', 'README.rst', 'CONTRIBUTORS.rst', 'HISTORY.rst', 'NOTICES']},
     package_dir={'h2': 'h2'},
@@ -54,18 +58,19 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
     install_requires=[
-        'hyperframe>=5.0, <6',
-        'hpack>=2.3, <4',
+        'hyperframe>=5.2.0, <6',
+        'hpack>=3.0,<4',
     ],
     extras_require={
-        ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.1.6, <2'],
+        ':python_version == "2.7"': ['enum34>=1.1.6, <2'],
     }
 )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py
index 3cfc7cc7e8c..7df99a6a571 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py
@@ -114,6 +114,23 @@ class TestBasicClient(object):
             expected_data_frame_pad_length=0
         )
 
+    def test_sending_data_in_memoryview(self):
+        """
+        Support memoryview for sending data.
+        """
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+        c.send_headers(1, self.example_request_headers)
+
+        # Clear the data, then send some data.
+        c.clear_outbound_data_buffer()
+        events = c.send_data(1, memoryview(b'some data'))
+        assert not events
+        data_to_send = c.data_to_send()
+        assert (
+            data_to_send == b'\x00\x00\t\x00\x00\x00\x00\x00\x01some data'
+        )
+
     def test_sending_data_with_padding(self):
         """
         Single data frames with padding are encoded correctly.
@@ -1081,7 +1098,12 @@ class TestBasicServer(object):
         c.clear_outbound_data_buffer()
         events = c.receive_data(sent_frame.serialize())
 
-        assert not events
+        assert len(events) == 1
+        event = events[0]
+
+        assert isinstance(event, h2.events.PingReceived)
+        assert event.ping_data == ping_data
+
         assert c.data_to_send() == expected_data
 
     def test_receiving_settings_frame_event(self, frame_factory):
@@ -1324,7 +1346,7 @@ class TestBasicServer(object):
 
     def test_receiving_ping_acknowledgement(self, frame_factory):
         """
-        Receiving a PING acknolwedgement fires a PingAcknolwedged event.
+        Receiving a PING acknowledgement fires a PingAckReceived event.
         """
         c = h2.connection.H2Connection(config=self.server_config)
         c.receive_data(frame_factory.preamble())
@@ -1339,7 +1361,8 @@ class TestBasicServer(object):
         assert len(events) == 1
         event = events[0]
 
-        assert isinstance(event, h2.events.PingAcknowledged)
+        assert isinstance(event, h2.events.PingAckReceived)
+        assert isinstance(event, h2.events.PingAcknowledged)  # deprecated
         assert event.ping_data == ping_data
 
     def test_stream_ended_remotely(self, frame_factory):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py
index 2344f72d6a1..631a66787af 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py
@@ -107,6 +107,77 @@ class TestClosedStreams(object):
         # The streams dictionary should be empty.
         assert not c.streams
 
+    def test_receive_rst_stream_on_closed_stream(self, frame_factory):
+        """
+        RST_STREAM frame should be ignored if stream is in a closed state.
+        See RFC 7540 Section 5.1 (closed state)
+        """
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+
+        # Client sends request
+        c.send_headers(1, self.example_request_headers)
+
+        # Some time passes and client sends DATA frame and closes stream,
+        # so it is in a half-closed state
+        c.send_data(1, b'some data', end_stream=True)
+
+        # Server received HEADERS frame but DATA frame is still on the way.
+        # Stream is in open state on the server-side. In this state server is
+        # allowed to end stream and reset it - this trick helps immediately
+        # close stream on the server-side.
+        headers_frame = frame_factory.build_headers_frame(
+            [(':status', '200')],
+            flags=['END_STREAM'],
+            stream_id=1,
+        )
+        events = c.receive_data(headers_frame.serialize())
+        assert len(events) == 2
+        response_received, stream_ended = events
+        assert isinstance(response_received, h2.events.ResponseReceived)
+        assert isinstance(stream_ended, h2.events.StreamEnded)
+
+        rst_stream_frame = frame_factory.build_rst_stream_frame(stream_id=1)
+        events = c.receive_data(rst_stream_frame.serialize())
+        assert not events
+
+    def test_receive_window_update_on_closed_stream(self, frame_factory):
+        """
+        WINDOW_UPDATE frame should be ignored if stream is in a closed state.
+        See RFC 7540 Section 5.1 (closed state)
+        """
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+
+        # Client sends request
+        c.send_headers(1, self.example_request_headers)
+
+        # Some time passes and client sends DATA frame and closes stream,
+        # so it is in a half-closed state
+        c.send_data(1, b'some data', end_stream=True)
+
+        # Server received HEADERS frame but DATA frame is still on the way.
+        # Stream is in open state on the server-side. In this state server is
+        # allowed to end stream and after that acknowledge received data by
+        # sending WINDOW_UPDATE frames.
+        headers_frame = frame_factory.build_headers_frame(
+            [(':status', '200')],
+            flags=['END_STREAM'],
+            stream_id=1,
+        )
+        events = c.receive_data(headers_frame.serialize())
+        assert len(events) == 2
+        response_received, stream_ended = events
+        assert isinstance(response_received, h2.events.ResponseReceived)
+        assert isinstance(stream_ended, h2.events.StreamEnded)
+
+        window_update_frame = frame_factory.build_window_update_frame(
+            stream_id=1,
+            increment=1,
+        )
+        events = c.receive_data(window_update_frame.serialize())
+        assert not events
+
 
 class TestStreamsClosedByEndStream(object):
     example_request_headers = [
@@ -124,7 +195,6 @@ class TestStreamsClosedByEndStream(object):
     @pytest.mark.parametrize(
         "frame",
         [
-            lambda self, ff: ff.build_data_frame(b'hello'),
             lambda self, ff: ff.build_headers_frame(
                 self.example_request_headers, flags=['END_STREAM']),
             lambda self, ff: ff.build_headers_frame(
@@ -174,7 +244,6 @@ class TestStreamsClosedByEndStream(object):
     @pytest.mark.parametrize(
         "frame",
         [
-            lambda self, ff: ff.build_data_frame(b'hello'),
             lambda self, ff: ff.build_headers_frame(
                 self.example_response_headers, flags=['END_STREAM']),
             lambda self, ff: ff.build_headers_frame(
@@ -273,8 +342,6 @@ class TestStreamsClosedByRstStream(object):
                 self.example_request_headers),
             lambda self, ff: ff.build_headers_frame(
                 self.example_request_headers, flags=['END_STREAM']),
-            lambda self, ff: ff.build_data_frame(b'hello'),
-            lambda self, ff: ff.build_window_update_frame(1, 1),
         ]
     )
     def test_resets_further_frames_after_recv_reset(self,
@@ -282,7 +349,8 @@ class TestStreamsClosedByRstStream(object):
                                                     frame):
         """
         A stream that is closed by receive RST_STREAM can receive further
-        frames: it simply sends RST_STREAM for it.
+        frames: it simply sends RST_STREAM for it, and additionally
+        WINDOW_UPDATE for DATA frames.
         """
         c = h2.connection.H2Connection(config=self.server_config)
         c.receive_data(frame_factory.preamble())
@@ -326,6 +394,59 @@ class TestStreamsClosedByRstStream(object):
         assert not events
         assert c.data_to_send() == rst_frame.serialize() * 3
 
+    def test_resets_further_data_frames_after_recv_reset(self,
+                                                         frame_factory):
+        """
+        A stream that is closed by receive RST_STREAM can receive further
+        DATA frames: it simply sends WINDOW_UPDATE for the connection flow
+        window, and RST_STREAM for the stream.
+        """
+        c = h2.connection.H2Connection(config=self.server_config)
+        c.receive_data(frame_factory.preamble())
+        c.initiate_connection()
+
+        header_frame = frame_factory.build_headers_frame(
+            self.example_request_headers, flags=['END_STREAM']
+        )
+        c.receive_data(header_frame.serialize())
+
+        c.send_headers(
+            stream_id=1,
+            headers=self.example_response_headers,
+            end_stream=False
+        )
+
+        rst_frame = frame_factory.build_rst_stream_frame(
+            1, h2.errors.ErrorCodes.STREAM_CLOSED
+        )
+        c.receive_data(rst_frame.serialize())
+        c.clear_outbound_data_buffer()
+
+        f = frame_factory.build_data_frame(
+            data=b'some data'
+        )
+
+        events = c.receive_data(f.serialize())
+        assert not events
+
+        expected = frame_factory.build_rst_stream_frame(
+            stream_id=1,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
+
+        events = c.receive_data(f.serialize() * 3)
+        assert not events
+        assert c.data_to_send() == expected * 3
+
+        # Iterate over the streams to make sure it's gone, then confirm the
+        # behaviour is unchanged.
+        c.open_outbound_streams
+
+        events = c.receive_data(f.serialize() * 3)
+        assert not events
+        assert c.data_to_send() == expected * 3
+
     @pytest.mark.parametrize(
         "frame",
         [
@@ -333,8 +454,6 @@ class TestStreamsClosedByRstStream(object):
                 self.example_request_headers),
             lambda self, ff: ff.build_headers_frame(
                 self.example_request_headers, flags=['END_STREAM']),
-            lambda self, ff: ff.build_data_frame(b'hello'),
-            lambda self, ff: ff.build_window_update_frame(1, 1),
         ]
     )
     def test_resets_further_frames_after_send_reset(self,
@@ -386,3 +505,51 @@ class TestStreamsClosedByRstStream(object):
         events = c.receive_data(f.serialize() * 3)
         assert not events
         assert c.data_to_send() == rst_frame.serialize() * 3
+
+    def test_resets_further_data_frames_after_send_reset(self,
+                                                         frame_factory):
+        """
+        A stream that is closed by sent RST_STREAM can receive further
+        data frames: it simply sends WINDOW_UPDATE and RST_STREAM for it.
+        """
+        c = h2.connection.H2Connection(config=self.server_config)
+        c.receive_data(frame_factory.preamble())
+        c.initiate_connection()
+
+        header_frame = frame_factory.build_headers_frame(
+            self.example_request_headers, flags=['END_STREAM']
+        )
+        c.receive_data(header_frame.serialize())
+
+        c.send_headers(
+            stream_id=1,
+            headers=self.example_response_headers,
+            end_stream=False
+        )
+
+        c.reset_stream(1, h2.errors.ErrorCodes.INTERNAL_ERROR)
+
+        c.clear_outbound_data_buffer()
+
+        f = frame_factory.build_data_frame(
+            data=b'some data'
+        )
+        events = c.receive_data(f.serialize())
+        assert not events
+        expected = frame_factory.build_rst_stream_frame(
+            stream_id=1,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
+
+        events = c.receive_data(f.serialize() * 3)
+        assert not events
+        assert c.data_to_send() == expected * 3
+
+        # Iterate over the streams to make sure it's gone, then confirm the
+        # behaviour is unchanged.
+        c.open_outbound_streams
+
+        events = c.receive_data(f.serialize() * 3)
+        assert not events
+        assert c.data_to_send() == expected * 3
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py
index 06f7da39c7b..a6e8d837906 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py
@@ -213,14 +213,23 @@ class TestEventReprs(object):
             "new_value=32768)}>"
         )
 
-    def test_pingacknowledged_repr(self):
+    def test_pingreceived_repr(self):
         """
-        PingAcknowledged has a useful debug representation.
+        PingReceived has a useful debug representation.
         """
-        e = h2.events.PingAcknowledged()
+        e = h2.events.PingReceived()
         e.ping_data = b'abcdefgh'
 
-        assert repr(e) == "<PingAcknowledged ping_data:6162636465666768>"
+        assert repr(e) == "<PingReceived ping_data:6162636465666768>"
+
+    def test_pingackreceived_repr(self):
+        """
+        PingAckReceived has a useful debug representation.
+        """
+        e = h2.events.PingAckReceived()
+        e.ping_data = b'abcdefgh'
+
+        assert repr(e) == "<PingAckReceived ping_data:6162636465666768>"
 
     def test_streamended_repr(self):
         """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py
index 380cd61e3b1..24b345aac3a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py
@@ -638,6 +638,42 @@ class TestFlowControl(object):
         with pytest.raises(h2.exceptions.FlowControlError):
             c.increment_flow_control_window(increment=increment, stream_id=1)
 
+    def test_send_update_on_closed_streams(self, frame_factory):
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+        c.send_headers(1, self.example_request_headers)
+        c.reset_stream(1)
+
+        c.clear_outbound_data_buffer()
+        c.open_outbound_streams
+        c.open_inbound_streams
+
+        f = frame_factory.build_data_frame(b'some data'*1500)
+        events = c.receive_data(f.serialize()*3)
+        assert not events
+
+        expected = frame_factory.build_rst_stream_frame(
+            stream_id=1,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize() * 2 + frame_factory.build_window_update_frame(
+            stream_id=0,
+            increment=40500,
+        ).serialize() + frame_factory.build_rst_stream_frame(
+            stream_id=1,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
+
+        f = frame_factory.build_data_frame(b'')
+        events = c.receive_data(f.serialize())
+        assert not events
+
+        expected = frame_factory.build_rst_stream_frame(
+            stream_id=1,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
+
 
 class TestAutomaticFlowControl(object):
     """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py
index 1d4eac67f64..d63d44f3f78 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py
@@ -260,11 +260,11 @@ class TestServerUpgrade(object):
         )
         c.receive_data(f.serialize())
 
-        expected_frame = frame_factory.build_rst_stream_frame(
+        expected = frame_factory.build_rst_stream_frame(
             stream_id=1,
             error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
-        )
-        assert c.data_to_send() == expected_frame.serialize()
+        ).serialize()
+        assert c.data_to_send() == expected
 
     def test_client_settings_are_applied(self, frame_factory):
         """
@@ -278,7 +278,7 @@ class TestServerUpgrade(object):
         # start of the connection, do not agree on their initial settings
         # state.
         assert (
-            client.local_settings._settings != server.remote_settings._settings
+            client.local_settings != server.remote_settings
         )
 
         # Get the client header data and pass it to the server.
@@ -297,10 +297,6 @@ class TestServerUpgrade(object):
         )
         assert server.data_to_send() == expected_frame.serialize()
 
-        # We violate abstraction layers here, but I don't think defining __eq__
-        # for this is worth it. In this case, both the client and server should
-        # agree that these settings have been ACK'd, so their underlying
-        # dictionaries should be identical.
         assert (
-            client.local_settings._settings == server.remote_settings._settings
+            client.local_settings == server.remote_settings
         )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py
index 313bf12a7c3..ef73007254e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py
@@ -8,49 +8,48 @@ import pytest
 
 
 class TestHeadRequest(object):
+    example_request_headers = [
+        (b':authority', b'example.com'),
+        (b':path', b'/'),
+        (b':scheme', b'https'),
+        (b':method', b'HEAD'),
+    ]
 
-        example_request_headers = [
-            (b':authority', b'example.com'),
-            (b':path', b'/'),
-            (b':scheme', b'https'),
-            (b':method', b'HEAD'),
-        ]
+    example_response_headers = [
+        (b':status', b'200'),
+        (b'server', b'fake-serv/0.1.0'),
+        (b'content_length', b'1'),
+    ]
 
-        example_response_headers = [
-            (b':status', b'200'),
-            (b'server', b'fake-serv/0.1.0'),
-            (b'content_length', b'1'),
-        ]
+    def test_non_zero_content_and_no_body(self, frame_factory):
 
-        def test_non_zero_content_and_no_body(self, frame_factory):
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+        c.send_headers(1, self.example_request_headers, end_stream=True)
 
-            c = h2.connection.H2Connection()
-            c.initiate_connection()
-            c.send_headers(1, self.example_request_headers, end_stream=True)
+        f = frame_factory.build_headers_frame(
+            self.example_response_headers,
+            flags=['END_STREAM']
+        )
+        events = c.receive_data(f.serialize())
 
-            f = frame_factory.build_headers_frame(
-                self.example_response_headers,
-                flags=['END_STREAM']
-            )
-            events = c.receive_data(f.serialize())
+        assert len(events) == 2
+        event = events[0]
 
-            assert len(events) == 2
-            event = events[0]
+        assert isinstance(event, h2.events.ResponseReceived)
+        assert event.stream_id == 1
+        assert event.headers == self.example_response_headers
 
-            assert isinstance(event, h2.events.ResponseReceived)
-            assert event.stream_id == 1
-            assert event.headers == self.example_response_headers
+    def test_reject_non_zero_content_and_body(self, frame_factory):
+        c = h2.connection.H2Connection()
+        c.initiate_connection()
+        c.send_headers(1, self.example_request_headers)
 
-        def test_reject_non_zero_content_and_body(self, frame_factory):
-            c = h2.connection.H2Connection()
-            c.initiate_connection()
-            c.send_headers(1, self.example_request_headers)
+        headers = frame_factory.build_headers_frame(
+            self.example_response_headers
+        )
+        data = frame_factory.build_data_frame(data=b'\x01')
 
-            headers = frame_factory.build_headers_frame(
-                self.example_response_headers
-            )
-            data = frame_factory.build_data_frame(data=b'\x01')
-
-            c.receive_data(headers.serialize())
-            with pytest.raises(h2.exceptions.InvalidBodyLengthError):
-                c.receive_data(data.serialize())
+        c.receive_data(headers.serialize())
+        with pytest.raises(h2.exceptions.InvalidBodyLengthError):
+            c.receive_data(data.serialize())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py
index 1f2f6c77aae..12b70c4a6bc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py
@@ -149,14 +149,16 @@ class TestInvalidFrameSequences(object):
         c.receive_data(f.serialize())
         c.clear_outbound_data_buffer()
 
-        bad_frame = frame_factory.build_data_frame(data=b'hello')
+        bad_frame = frame_factory.build_data_frame(
+            data=b'some data'
+        )
         c.receive_data(bad_frame.serialize())
 
-        expected_frame = frame_factory.build_rst_stream_frame(
+        expected = frame_factory.build_rst_stream_frame(
             stream_id=1,
-            error_code=0x5,
-        )
-        assert c.data_to_send() == expected_frame.serialize()
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
 
     def test_unexpected_continuation_on_closed_stream(self, frame_factory):
         """
@@ -293,15 +295,15 @@ class TestInvalidFrameSequences(object):
         c.clear_outbound_data_buffer()
 
         bad_frame = frame_factory.build_data_frame(
-            data=b'hello'
+            data=b'some data'
         )
         events = c.receive_data(bad_frame.serialize())
 
-        expected_frame = frame_factory.build_rst_stream_frame(
+        expected = frame_factory.build_rst_stream_frame(
             stream_id=1,
-            error_code=0x5,
-        )
-        assert c.data_to_send() == expected_frame.serialize()
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
 
         assert len(events) == 1
         event = events[0]
@@ -327,16 +329,16 @@ class TestInvalidFrameSequences(object):
         c.clear_outbound_data_buffer()
 
         bad_frame = frame_factory.build_data_frame(
-            data=b'hello'
+            data=b'some data'
         )
         # Receive 5 frames.
         events = c.receive_data(bad_frame.serialize() * 5)
 
-        expected_frame = frame_factory.build_rst_stream_frame(
+        expected = frame_factory.build_rst_stream_frame(
             stream_id=1,
-            error_code=0x5,
-        )
-        assert c.data_to_send() == expected_frame.serialize() * 5
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected * 5
 
         assert len(events) == 1
         event = events[0]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py
index 1a315ee26ac..a379950733d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py
@@ -54,6 +54,7 @@ class TestInvalidFrameSequences(object):
         base_request_headers + [('name', 'value with trailing space ')],
         [header for header in base_request_headers
          if header[0] != ':authority'],
+        [(':protocol', 'websocket')] + base_request_headers,
     ]
     server_config = h2.config.H2Configuration(
         client_side=False, header_encoding='utf-8'
@@ -203,7 +204,7 @@ class TestInvalidFrameSequences(object):
         # Raise exception if pseudo header in trailer
         with pytest.raises(h2.exceptions.ProtocolError) as e:
             c.receive_data(trailer)
-        assert "pseudo-header in trailer" in str(e)
+        assert "pseudo-header in trailer" in str(e.value)
 
         # Test appropriate response frame is generated
         expected_frame = frame_factory.build_goaway_frame(
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py
index 2163bb9b8d4..d19f93a7c2e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py
@@ -12,7 +12,9 @@ import h2.exceptions
 import h2.settings
 
 from hypothesis import given, assume
-from hypothesis.strategies import integers
+from hypothesis.strategies import (
+    integers, booleans, fixed_dictionaries, builds
+)
 
 
 class TestSettings(object):
@@ -29,6 +31,7 @@ class TestSettings(object):
         assert s[h2.settings.SettingCodes.ENABLE_PUSH] == 1
         assert s[h2.settings.SettingCodes.INITIAL_WINDOW_SIZE] == 65535
         assert s[h2.settings.SettingCodes.MAX_FRAME_SIZE] == 16384
+        assert s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] == 0
 
     def test_settings_defaults_server(self):
         """
@@ -40,6 +43,7 @@ class TestSettings(object):
         assert s[h2.settings.SettingCodes.ENABLE_PUSH] == 0
         assert s[h2.settings.SettingCodes.INITIAL_WINDOW_SIZE] == 65535
         assert s[h2.settings.SettingCodes.MAX_FRAME_SIZE] == 16384
+        assert s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] == 0
 
     @pytest.mark.parametrize('client', [True, False])
     def test_can_set_initial_values(self, client):
@@ -52,6 +56,7 @@ class TestSettings(object):
             h2.settings.SettingCodes.MAX_FRAME_SIZE: 16388,
             h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS: 100,
             h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE: 2**16,
+            h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL: 1,
         }
         s = h2.settings.Settings(client=client, initial_values=overrides)
 
@@ -61,6 +66,7 @@ class TestSettings(object):
         assert s[h2.settings.SettingCodes.MAX_FRAME_SIZE] == 16388
         assert s[h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS] == 100
         assert s[h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE] == 2**16
+        assert s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] == 1
 
     @pytest.mark.parametrize(
         'setting,value',
@@ -72,6 +78,7 @@ class TestSettings(object):
             (h2.settings.SettingCodes.MAX_FRAME_SIZE, 1),
             (h2.settings.SettingCodes.MAX_FRAME_SIZE, 2**30),
             (h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE, -1),
+            (h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL, -1),
         ]
     )
     def test_cannot_set_invalid_initial_values(self, setting, value):
@@ -106,6 +113,7 @@ class TestSettings(object):
             h2.settings.SettingCodes.ENABLE_PUSH: 0,
             h2.settings.SettingCodes.INITIAL_WINDOW_SIZE: 60,
             h2.settings.SettingCodes.MAX_FRAME_SIZE: 16385,
+            h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL: 1,
         }
         s.update(new_settings)
 
@@ -169,16 +177,16 @@ class TestSettings(object):
         Length is related only to the number of keys.
         """
         s = h2.settings.Settings(client=True)
-        assert len(s) == 4
+        assert len(s) == 5
 
         s[h2.settings.SettingCodes.HEADER_TABLE_SIZE] == 8000
-        assert len(s) == 4
+        assert len(s) == 5
 
         s.acknowledge()
-        assert len(s) == 4
+        assert len(s) == 5
 
         del s[h2.settings.SettingCodes.HEADER_TABLE_SIZE]
-        assert len(s) == 3
+        assert len(s) == 4
 
     def test_new_values_work(self):
         """
@@ -232,6 +240,9 @@ class TestSettings(object):
         assert s.max_frame_size == s[h2.settings.SettingCodes.MAX_FRAME_SIZE]
         assert s.max_concurrent_streams == 2**32 + 1  # A sensible default.
         assert s.max_header_list_size is None
+        assert s.enable_connect_protocol == s[
+            h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL
+        ]
 
     def test_settings_setters(self):
         """
@@ -245,6 +256,7 @@ class TestSettings(object):
         s.max_frame_size = 16385
         s.max_concurrent_streams = 4
         s.max_header_list_size = 2**16
+        s.enable_connect_protocol = 1
 
         s.acknowledge()
         assert s[h2.settings.SettingCodes.HEADER_TABLE_SIZE] == 0
@@ -253,6 +265,7 @@ class TestSettings(object):
         assert s[h2.settings.SettingCodes.MAX_FRAME_SIZE] == 16385
         assert s[h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS] == 4
         assert s[h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE] == 2**16
+        assert s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] == 1
 
     @given(integers())
     def test_cannot_set_invalid_values_for_enable_push(self, val):
@@ -361,131 +374,97 @@ class TestSettings(object):
             with pytest.raises(KeyError):
                 s[h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE]
 
+    @given(integers())
+    def test_cannot_set_invalid_values_for_enable_connect_protocol(self, val):
+        """
+        SETTINGS_ENABLE_CONNECT_PROTOCOL only allows two values: 0, 1.
+        """
+        assume(val not in (0, 1))
+        s = h2.settings.Settings()
+
+        with pytest.raises(h2.exceptions.InvalidSettingsValueError) as e:
+            s.enable_connect_protocol = val
+
+        s.acknowledge()
+        assert e.value.error_code == h2.errors.ErrorCodes.PROTOCOL_ERROR
+        assert s.enable_connect_protocol == 0
+
+        with pytest.raises(h2.exceptions.InvalidSettingsValueError) as e:
+            s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] = val
+
+        s.acknowledge()
+        assert e.value.error_code == h2.errors.ErrorCodes.PROTOCOL_ERROR
+        assert s[h2.settings.SettingCodes.ENABLE_CONNECT_PROTOCOL] == 0
+
 
 class TestSettingsEquality(object):
     """
     A class defining tests for the standard implementation of == and != .
     """
 
-    def an_instance(self):
-        """
-        Return an instance of the class under test.  Each call to this method
-        must return a different object.  All objects returned must be equal to
-        each other.
-        """
-        overrides = {
-            h2.settings.SettingCodes.HEADER_TABLE_SIZE: 0,
-            h2.settings.SettingCodes.MAX_FRAME_SIZE: 16384,
-            h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS: 4,
-            h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE: 2**16,
-        }
-        return h2.settings.Settings(client=True, initial_values=overrides)
+    SettingsStrategy = builds(
+        h2.settings.Settings,
+        client=booleans(),
+        initial_values=fixed_dictionaries({
+            h2.settings.SettingCodes.HEADER_TABLE_SIZE:
+                integers(0, 2**32 - 1),
+            h2.settings.SettingCodes.ENABLE_PUSH: integers(0, 1),
+            h2.settings.SettingCodes.INITIAL_WINDOW_SIZE:
+                integers(0, 2**31 - 1),
+            h2.settings.SettingCodes.MAX_FRAME_SIZE:
+                integers(2**14, 2**24 - 1),
+            h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS:
+                integers(0, 2**32 - 1),
+            h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE:
+                integers(0, 2**32 - 1),
+        })
+    )
 
-    def another_instance(self):
+    @given(settings=SettingsStrategy)
+    def test_equality_reflexive(self, settings):
         """
-        Return an instance of the class under test.  Each call to this method
-        must return a different object.  The objects must not be equal to the
-        objects returned by an_instance.  They may or may not be equal to
-        each other (they will not be compared against each other).
+        An object compares equal to itself using the == operator and the !=
+        operator.
         """
-        overrides = {
-            h2.settings.SettingCodes.HEADER_TABLE_SIZE: 8080,
-            h2.settings.SettingCodes.MAX_FRAME_SIZE: 16388,
-            h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS: 100,
-            h2.settings.SettingCodes.MAX_HEADER_LIST_SIZE: 2**16,
-        }
-        return h2.settings.Settings(client=False, initial_values=overrides)
+        assert (settings == settings)
+        assert not (settings != settings)
 
-    def test_identical_eq(self):
+    @given(settings=SettingsStrategy, o_settings=SettingsStrategy)
+    def test_equality_multiple(self, settings, o_settings):
         """
-        An object compares equal to itself using the == operator.
+        Two objects compare themselves using the == operator and the !=
+        operator.
         """
-        o = self.an_instance()
-        assert (o == o)
+        if settings == o_settings:
+            assert settings == o_settings
+            assert not (settings != o_settings)
+        else:
+            assert settings != o_settings
+            assert not (settings == o_settings)
 
-    def test_identical_ne(self):
-        """
-        An object doesn't compare not equal to itself using the != operator.
-        """
-        o = self.an_instance()
-        assert not (o != o)
-
-    def test_same_eq(self):
-        """
-        Two objects that are equal to each other compare equal to each other
-        using the == operator.
-        """
-        a = self.an_instance()
-        b = self.an_instance()
-        assert (a == b)
-
-    def test_same_ne(self):
-        """
-        Two objects that are equal to each other do not compare not equal to
-        each other using the != operator.
-        """
-        a = self.an_instance()
-        b = self.an_instance()
-        assert not (a != b)
-
-    def test_different_eq(self):
-        """
-        Two objects that are not equal to each other do not compare equal to
-        each other using the == operator.
-        """
-        a = self.an_instance()
-        b = self.another_instance()
-        assert not (a == b)
-
-    def test_different_ne(self):
-        """
-        Two objects that are not equal to each other compare not equal to each
-        other using the != operator.
-        """
-        a = self.an_instance()
-        b = self.another_instance()
-        assert (a != b)
-
-    def test_another_type_eq(self):
+    @given(settings=SettingsStrategy)
+    def test_another_type_equality(self, settings):
         """
         The object does not compare equal to an object of an unrelated type
         (which does not implement the comparison) using the == operator.
         """
-        a = self.an_instance()
-        b = object()
-        assert not (a == b)
+        obj = object()
+        assert (settings != obj)
+        assert not (settings == obj)
 
-    def test_another_type_ne(self):
+    @given(settings=SettingsStrategy)
+    def test_delegated_eq(self, settings):
         """
-        The object compares not equal to an object of an unrelated type (which
-        does not implement the comparison) using the != operator.
-        """
-        a = self.an_instance()
-        b = object()
-        assert (a != b)
-
-    def test_delegated_eq(self):
-        """
-        The result of comparison using == is delegated to the right-hand
-        operand if it is of an unrelated type.
+        The result of comparison is delegated to the right-hand operand if
+        it is of an unrelated type.
         """
         class Delegate(object):
             def __eq__(self, other):
                 return [self]
 
-        a = self.an_instance()
-        b = Delegate()
-        assert (a == b) == [b]
-
-    def test_delegate_ne(self):
-        """
-        The result of comparison using != is delegated to the right-hand
-        operand if it is of an unrelated type.
-        """
-        class Delegate(object):
             def __ne__(self, other):
                 return [self]
 
-        a = self.an_instance()
-        b = Delegate()
-        assert (a != b) == [b]
+        delg = Delegate()
+        assert (settings == delg) == [delg]
+        assert (settings != delg) == [delg]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py
index 08886e8e3ed..778445515fa 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py
@@ -70,8 +70,8 @@ class TestStreamReset(object):
                                                      other_id,
                                                      frame_factory):
         """
-        A stream that has been reset still affects the connection flow control
-        window.
+        A stream that has been reset does not affect the connection flow
+        control window.
         """
         c = h2.connection.H2Connection()
         c.initiate_connection()
@@ -89,19 +89,19 @@ class TestStreamReset(object):
         c.clear_outbound_data_buffer()
 
         f = frame_factory.build_data_frame(
-            data=b'some data!',
+            data=b'some data',
             stream_id=close_id
         )
-        events = c.receive_data(f.serialize())
+        c.receive_data(f.serialize())
 
-        rst_frame = frame_factory.build_rst_stream_frame(
-            close_id, h2.errors.ErrorCodes.STREAM_CLOSED
-        )
-        assert not events
-        assert c.data_to_send() == rst_frame.serialize()
+        expected = frame_factory.build_rst_stream_frame(
+            stream_id=close_id,
+            error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+        ).serialize()
+        assert c.data_to_send() == expected
 
         new_window = c.remote_flow_control_window(stream_id=other_id)
-        assert initial_window - len(b'some data!') == new_window
+        assert initial_window - len(b'some data') == new_window
 
     @pytest.mark.parametrize('clear_streams', [True, False])
     def test_reset_stream_automatically_resets_pushed_streams(self,
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py
index 61d527f688b..4cb0b2ae608 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py
@@ -12,7 +12,7 @@ import h2.connection
 import h2.errors
 import h2.events
 import h2.exceptions
-from h2.utilities import extract_method_header
+from h2.utilities import SizeLimitDict, extract_method_header
 
 # These tests require a non-list-returning range function.
 try:
@@ -176,3 +176,51 @@ class TestExtractHeader(object):
     )
     def test_extract_header_method(self, headers):
         assert extract_method_header(headers) == b'GET'
+
+
+def test_size_limit_dict_limit():
+    dct = SizeLimitDict(size_limit=2)
+
+    dct[1] = 1
+    dct[2] = 2
+
+    assert len(dct) == 2
+    assert dct[1] == 1
+    assert dct[2] == 2
+
+    dct[3] = 3
+
+    assert len(dct) == 2
+    assert dct[2] == 2
+    assert dct[3] == 3
+    assert 1 not in dct
+
+
+def test_size_limit_dict_limit_init():
+    initial_dct = {
+        1: 1,
+        2: 2,
+        3: 3,
+    }
+
+    dct = SizeLimitDict(initial_dct, size_limit=2)
+
+    assert len(dct) == 2
+
+
+def test_size_limit_dict_no_limit():
+    dct = SizeLimitDict(size_limit=None)
+
+    dct[1] = 1
+    dct[2] = 2
+
+    assert len(dct) == 2
+    assert dct[1] == 1
+    assert dct[2] == 2
+
+    dct[3] = 3
+
+    assert len(dct) == 3
+    assert dct[1] == 1
+    assert dct[2] == 2
+    assert dct[3] == 3
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt
index 35bcbc2f091..e0eefa28acf 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt
@@ -1,5 +1,5 @@
-pytest==3.0.7
-pytest-cov==2.4.0
-coverage==4.3.4
-pytest-xdist==1.15.0
-hypothesis==3.7.0
+pytest==4.6.5  # rq.filter: < 5
+pytest-cov==2.8.1
+pytest-xdist==1.31.0
+coverage==4.5.4
+hypothesis
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini
index a3d6c4a785b..971f9a07e93 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini
@@ -1,37 +1,24 @@
 [tox]
-envlist = py27, py33, py34, py35, py36, pypy, lint, packaging, docs
+envlist = py27, py34, py35, py36, py37, py38, pypy, lint, packaging, docs
 
 [testenv]
 deps= -r{toxinidir}/test_requirements.txt
 commands=
-    coverage run -m py.test {posargs} {toxinidir}/test/
+    coverage run -m py.test {posargs}
     coverage report
 
 [testenv:pypy]
 # temporarily disable coverage testing on PyPy due to performance problems
-commands= py.test {posargs} {toxinidir}/test/
-
-[testenv:py27-twistedMaster]
-# This is a validation test that confirms that Twisted's test cases haven't
-# broken.
-deps =
-    # [tls,http2] syntax doesn't work here so we enumerate all dependencies.
-    git+https://github.com/twisted/twisted
-    pyopenssl
-    service_identity
-    idna
-    priority
-    sphinx
-commands = python -m twisted.trial --reporter=text twisted
+commands= py.test {posargs}
 
 [testenv:lint]
-basepython=python3.4
-deps = flake8==3.3.0
+basepython=python3.7
+deps = flake8==3.7.8
 commands = flake8 --max-complexity 10 h2 test
 
 [testenv:docs]
-basepython=python3.5
-deps = sphinx==1.4.9
+basepython=python3.7
+deps = sphinx==2.2.0
 changedir = {toxinidir}/docs
 whitelist_externals = rm
 commands =
@@ -40,15 +27,22 @@ commands =
 
 [testenv:graphs]
 basepython=python2.7
-deps = graphviz==0.6
+deps = graphviz==0.13
 commands =
     python visualizer/visualize.py -i docs/source/_static
 
 [testenv:packaging]
-basepython=python2.7
+basepython=python3.7
 deps =
-    check-manifest==0.35
-    readme_renderer==17.2
+    check-manifest==0.39
+    readme-renderer==24.0
 commands =
     check-manifest
     python setup.py check --metadata --restructuredtext --strict
+
+[testenv:h2spec]
+basepython=python3.6
+deps = twisted[tls]==19.7.0
+whitelist_externals = {toxinidir}/test/h2spectest.sh
+commands =
+    {toxinidir}/test/h2spectest.sh
diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh b/tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh
index 3f5d0767994..273c1479b27 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh
+++ b/tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh
@@ -16,6 +16,7 @@ fi
 if ! git pull --ff-only; then
     echo "Unable to update $TARGET_BRANCH"
     exit 2
+fi
 
 if ! git checkout -b "$PR_BRANCH"; then
     echo "Failed to open new branch $PR_BRANCH"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst
index 22cd87eb345..172b2b91baf 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst
@@ -4,6 +4,18 @@ Release History
 6.0.0dev0
 ---------
 
+5.2.0 (2019-01-18)
+------------------
+
+**API Changes (Backward-compatible)**
+
+- Add a new ENABLE_CONNECT_PROTOCOL settings paramter.
+
+**Other Changes**
+
+- Fix collections.abc deprecation.
+- Drop support for Python 3.3 and support 3.7.
+
 5.1.0 (2017-04-24)
 ------------------
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO
index 393c1e8d86d..cfd53f7e938 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: hyperframe
-Version: 5.1.0
+Version: 5.2.0
 Summary: HTTP/2 framing layer for Python
-Home-page: http://hyper.rtfd.org
+Home-page: https://python-hyper.org/hyperframe/en/latest/
 Author: Cory Benfield
 Author-email: cory@lukasa.co.uk
 License: MIT License
@@ -53,6 +53,18 @@ Description: ======================================
         6.0.0dev0
         ---------
         
+        5.2.0 (2019-01-18)
+        ------------------
+        
+        **API Changes (Backward-compatible)**
+        
+        - Add a new ENABLE_CONNECT_PROTOCOL settings paramter.
+        
+        **Other Changes**
+        
+        - Fix collections.abc deprecation.
+        - Drop support for Python 3.3 and support 3.7.
+        
         5.1.0 (2017-04-24)
         ------------------
         
@@ -223,8 +235,8 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: Implementation :: CPython
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO
index 393c1e8d86d..cfd53f7e938 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: hyperframe
-Version: 5.1.0
+Version: 5.2.0
 Summary: HTTP/2 framing layer for Python
-Home-page: http://hyper.rtfd.org
+Home-page: https://python-hyper.org/hyperframe/en/latest/
 Author: Cory Benfield
 Author-email: cory@lukasa.co.uk
 License: MIT License
@@ -53,6 +53,18 @@ Description: ======================================
         6.0.0dev0
         ---------
         
+        5.2.0 (2019-01-18)
+        ------------------
+        
+        **API Changes (Backward-compatible)**
+        
+        - Add a new ENABLE_CONNECT_PROTOCOL settings paramter.
+        
+        **Other Changes**
+        
+        - Fix collections.abc deprecation.
+        - Drop support for Python 3.3 and support 3.7.
+        
         5.1.0 (2017-04-24)
         ------------------
         
@@ -223,8 +235,8 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: Implementation :: CPython
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py
index 8fd1cd3388b..7620b4bdf7f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py
@@ -5,4 +5,4 @@ hyperframe
 
 A module for providing a pure-Python HTTP/2 framing layer.
 """
-__version__ = '5.1.0'
+__version__ = '5.2.0'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py
index 05b35017e70..1660bd1800a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py
@@ -7,11 +7,16 @@ Defines basic Flag and Flags data structures.
 """
 import collections
 
+try:
+    from collections.abc import MutableSet
+except ImportError:  # pragma: no cover
+    # Python 2.7 compatibility
+    from collections import MutableSet
 
 Flag = collections.namedtuple("Flag", ["name", "bit"])
 
 
-class Flags(collections.MutableSet):
+class Flags(MutableSet):
     """
     A simple MutableSet implementation that will only accept known flags as
     elements.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py
index 5294768a288..795057279b5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py
@@ -395,6 +395,8 @@ class SettingsFrame(Frame):
     MAX_FRAME_SIZE = 0x05
     #: The byte that signals the SETTINGS_MAX_HEADER_LIST_SIZE setting.
     MAX_HEADER_LIST_SIZE = 0x06
+    #: The byte that signals SETTINGS_ENABLE_CONNECT_PROTOCOL setting.
+    ENABLE_CONNECT_PROTOCOL = 0x08
 
     def __init__(self, stream_id=0, settings=None, **kwargs):
         super(SettingsFrame, self).__init__(stream_id, **kwargs)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg
index 1e3eb367c11..50220e135bc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg
@@ -1,6 +1,9 @@
 [wheel]
 universal = 1
 
+[tool:pytest]
+testpaths = test
+
 [egg_info]
 tag_build = 
 tag_date = 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py
index 8f13c2639f5..1ab72121416 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py
@@ -36,7 +36,7 @@ setup(
     long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
     author='Cory Benfield',
     author_email='cory@lukasa.co.uk',
-    url='http://hyper.rtfd.org',
+    url='https://python-hyper.org/hyperframe/en/latest/',
     packages=packages,
     package_data={'': ['LICENSE', 'README.rst', 'CONTRIBUTORS.rst', 'HISTORY.rst']},
     package_dir={'hyperframe': 'hyperframe'},
@@ -50,10 +50,10 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
 )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py
index 948349a91e7..abfecb692dc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py
@@ -56,29 +56,29 @@ class TestGeneralFrameBehaviour(object):
         assert f.stream_id == 0
 
     def test_parse_frame_header_unknown_type(self):
-        f, l = Frame.parse_frame_header(
+        frame, length = Frame.parse_frame_header(
             b'\x00\x00\x59\xFF\x00\x00\x00\x00\x01'
         )
-        assert f.type == 0xFF
-        assert l == 0x59
-        assert isinstance(f, ExtensionFrame)
-        assert f.stream_id == 1
+        assert frame.type == 0xFF
+        assert length == 0x59
+        assert isinstance(frame, ExtensionFrame)
+        assert frame.stream_id == 1
 
     def test_flags_are_persisted(self):
-        f, l = Frame.parse_frame_header(
+        frame, length = Frame.parse_frame_header(
             b'\x00\x00\x59\xFF\x09\x00\x00\x00\x01'
         )
-        assert f.type == 0xFF
-        assert l == 0x59
-        assert f.flag_byte == 0x09
+        assert frame.type == 0xFF
+        assert length == 0x59
+        assert frame.flag_byte == 0x09
 
     def test_parse_body_unknown_type(self):
-        f = decode_frame(
+        frame = decode_frame(
             b'\x00\x00\x0C\xFF\x00\x00\x00\x00\x01hello world!'
         )
-        assert f.body == b'hello world!'
-        assert f.body_len == 12
-        assert f.stream_id == 1
+        assert frame.body == b'hello world!'
+        assert frame.body_len == 12
+        assert frame.stream_id == 1
 
     def test_can_round_trip_unknown_frames(self):
         frame_data = b'\x00\x00\x0C\xFF\x00\x00\x00\x00\x01hello world!'
@@ -306,13 +306,14 @@ class TestRstStreamFrame(object):
 
 class TestSettingsFrame(object):
     serialized = (
-        b'\x00\x00\x24\x04\x01\x00\x00\x00\x00' +  # Frame header
+        b'\x00\x00\x2A\x04\x01\x00\x00\x00\x00' +  # Frame header
         b'\x00\x01\x00\x00\x10\x00' +              # HEADER_TABLE_SIZE
         b'\x00\x02\x00\x00\x00\x00' +              # ENABLE_PUSH
         b'\x00\x03\x00\x00\x00\x64' +              # MAX_CONCURRENT_STREAMS
         b'\x00\x04\x00\x00\xFF\xFF' +              # INITIAL_WINDOW_SIZE
         b'\x00\x05\x00\x00\x40\x00' +              # MAX_FRAME_SIZE
-        b'\x00\x06\x00\x00\xFF\xFF'                # MAX_HEADER_LIST_SIZE
+        b'\x00\x06\x00\x00\xFF\xFF' +              # MAX_HEADER_LIST_SIZE
+        b'\x00\x08\x00\x00\x00\x01'                # ENABLE_CONNECT_PROTOCOL
     )
 
     settings = {
@@ -322,6 +323,7 @@ class TestSettingsFrame(object):
         SettingsFrame.INITIAL_WINDOW_SIZE: 65535,
         SettingsFrame.MAX_FRAME_SIZE: 16384,
         SettingsFrame.MAX_HEADER_LIST_SIZE: 65535,
+        SettingsFrame.ENABLE_CONNECT_PROTOCOL: 1,
     }
 
     def test_settings_frame_has_only_one_flag(self):
@@ -359,7 +361,7 @@ class TestSettingsFrame(object):
         assert isinstance(f, SettingsFrame)
         assert f.flags == set(['ACK'])
         assert f.settings == self.settings
-        assert f.body_len == 36
+        assert f.body_len == 42
 
     def test_settings_frames_never_have_streams(self):
         with pytest.raises(ValueError):
@@ -519,6 +521,19 @@ class TestGoAwayFrame(object):
         assert f.additional_data == b'hello'
         assert f.body_len == 13
 
+        s = (
+            b'\x00\x00\x08\x07\x00\x00\x00\x00\x00' +  # Frame header
+            b'\x00\x00\x00\x40' +                      # Last Stream ID
+            b'\x00\x00\x00\x20' +                      # Error Code
+            b''                                        # Additional data
+        )
+        f = decode_frame(s)
+
+        assert isinstance(f, GoAwayFrame)
+        assert f.flags == set()
+        assert f.additional_data == b''
+        assert f.body_len == 8
+
     def test_goaway_frame_never_has_a_stream(self):
         with pytest.raises(ValueError):
             GoAwayFrame(stream_id=1)
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 d6c61965d96..d4472811e59 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -17,17 +17,24 @@ from six.moves.queue import Queue
 from h2.config import H2Configuration
 from h2.connection import H2Connection
 from h2.events import RequestReceived, ConnectionTerminated, DataReceived, StreamReset, StreamEnded
+from h2.exceptions import StreamClosedError, ProtocolError
+from h2.settings import SettingCodes
+from h2.utilities import extract_method_header
 
 from six.moves.urllib.parse import urlsplit, urlunsplit
 
+from mod_pywebsocket import dispatch
+from mod_pywebsocket.handshake import HandshakeException
+
 from . import routes as default_routes
 from .config import ConfigBuilder
 from .logger import get_logger
 from .request import Server, Request, H2Request
 from .response import Response, H2Response
 from .router import Router
-from .utils import HTTPException, isomorphic_decode
+from .utils import HTTPException, isomorphic_decode, isomorphic_encode
 from .constants import h2_headers
+from .ws_h2_handshake import WsH2Handshaker
 
 # We need to stress test that browsers can send/receive many headers (there is
 # no specified limit), but the Python stdlib has an arbitrary limit of 100
@@ -131,7 +138,7 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
     daemon_threads = True
 
     def __init__(self, server_address, request_handler_cls,
-                 router, rewriter, bind_address,
+                 router, rewriter, bind_address, ws_doc_root=None,
                  config=None, use_ssl=False, key_file=None, certificate=None,
                  encrypt_after_connect=False, latency=None, http2=False, **kwargs):
         """Server for HTTP(s) Requests
@@ -156,6 +163,8 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
 
         :param certificate: Path to certificate to use if SSL is enabled.
 
+        :param ws_doc_root: Document root for websockets
+
         :param encrypt_after_connect: For each connection, don't start encryption
                                       until a CONNECT message has been received.
                                       This enables the server to act as a
@@ -195,6 +204,7 @@ class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
 
 
 
+        self.ws_doc_root = ws_doc_root
         self.key_file = key_file
         self.certificate = certificate
         self.encrypt_after_connect = use_ssl and encrypt_after_connect
@@ -353,6 +363,14 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
         self.logger.debug('(%s) Initiating h2 Connection' % self.uid)
 
         with self.conn as connection:
+            # Bootstrapping WebSockets with HTTP/2 specification requires
+            # ENABLE_CONNECT_PROTOCOL to be set in order to enable WebSocket
+            # over HTTP/2
+            new_settings = dict(connection.local_settings)
+            new_settings[SettingCodes.ENABLE_CONNECT_PROTOCOL] = 1
+            connection.local_settings.update(new_settings)
+            connection.local_settings.acknowledge()
+
             connection.initiate_connection()
             data = connection.data_to_send()
             window_size = connection.remote_settings.initial_window_size
@@ -406,6 +424,24 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
             for stream_id, (thread, queue) in stream_queues.items():
                 thread.join()
 
+    def _is_extended_connect_frame(self, frame):
+        if not isinstance(frame, RequestReceived):
+            return False
+
+        method = extract_method_header(frame.headers)
+        if method != "CONNECT":
+            return False
+
+        protocol = ""
+        for key, value in frame.headers:
+            if key in (b':protocol', u':protocol'):
+                protocol = isomorphic_encode(value)
+                break
+        if protocol != "websocket":
+            raise ProtocolError("Invalid protocol %s with CONNECT METHOD" % (protocol,))
+
+        return True
+
     def start_stream_thread(self, frame, queue):
         """
         This starts a new thread to handle frames for a specific stream.
@@ -413,13 +449,91 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
         :param queue: A queue object that the thread will use to check for new frames
         :return: The thread object that has already been started
         """
+        if self._is_extended_connect_frame(frame):
+            target = Http2WebTestRequestHandler._stream_ws_thread
+        else:
+            target = Http2WebTestRequestHandler._stream_thread
         t = threading.Thread(
-            target=Http2WebTestRequestHandler._stream_thread,
+            target=target,
             args=(self, frame.stream_id, queue)
         )
         t.start()
         return t
 
+    def _stream_ws_thread(self, stream_id, queue):
+        frame = queue.get(True, None)
+
+        rfile, wfile = os.pipe()
+        rfile, wfile = os.fdopen(rfile, 'rb'), os.fdopen(wfile, 'wb', 0)  # needs to be unbuffer for websockets
+        stream_handler = H2HandlerCopy(self, frame, rfile)
+
+        h2request = H2Request(stream_handler)
+        h2response = H2Response(stream_handler, h2request)
+
+        dispatcher = dispatch.Dispatcher(self.server.ws_doc_root, None, False)
+        if not dispatcher.get_handler_suite(stream_handler.path):
+            h2response.set_error(404)
+            h2response.write()
+            return
+
+        request_wrapper = _WebSocketRequest(stream_handler, h2response)
+
+        handshaker = WsH2Handshaker(request_wrapper, dispatcher)
+        try:
+            handshaker.do_handshake()
+        except HandshakeException as e:
+            self.logger.info('Handshake failed for error: %s', e)
+            h2response.set_error(e.status)
+            h2response.write()
+            return
+
+        # h2 Handshaker prepares the headers but does not send them down the
+        # wire. Flush the headers here.
+        h2response.write_status_headers()
+
+        request_wrapper._dispatcher = dispatcher
+
+        # we need two threads:
+        # - one to handle the frame queue
+        # - one to handle the request (dispatcher.transfer_data is blocking)
+        # the alternative is to have only one (blocking) thread. That thread
+        # will call transfer_data. That would require a special case in
+        # handle_one_request, to bypass the queue and write data to wfile
+        # directly.
+        t = threading.Thread(
+            target=Http2WebTestRequestHandler._stream_ws_sub_thread,
+            args=(self, request_wrapper, stream_handler, queue)
+        )
+        t.start()
+
+        while not self.close_connection:
+            frame = queue.get(True, None)
+
+            if isinstance(frame, DataReceived):
+                wfile.write(frame.data)
+                if frame.stream_ended:
+                    raise NotImplementedError("frame.stream_ended")
+                    wfile.close()
+            elif frame is None or isinstance(frame, (StreamReset, StreamEnded, ConnectionTerminated)):
+                self.logger.debug('(%s - %s) Stream Reset, Thread Closing' % (self.uid, stream_id))
+                break
+
+        t.join()
+
+    def _stream_ws_sub_thread(self, request, stream_handler, queue):
+        dispatcher = request._dispatcher
+        dispatcher.transfer_data(request)
+
+        stream_id = stream_handler.h2_stream_id
+        with stream_handler.conn as connection:
+            try:
+                connection.end_stream(stream_id)
+                data = connection.data_to_send()
+                stream_handler.request.sendall(data)
+            except StreamClosedError:  # maybe the stream has already been closed
+                pass
+        queue.put(None)
+
     def _stream_thread(self, stream_id, queue):
         """
         This thread processes frames for a specific stream. It waits for frames to be placed
@@ -599,6 +713,7 @@ class WebTestHttpd(object):
                                   self-proxy.
     :param router_cls: Router class to use when matching URLs to handlers
     :param doc_root: Document root for serving files
+    :param ws_doc_root: Document root for websockets
     :param routes: List of routes with which to initialize the router
     :param rewriter_cls: Class to use for request rewriter
     :param rewrites: List of rewrites with which to initialize the rewriter_cls
@@ -641,7 +756,7 @@ class WebTestHttpd(object):
     def __init__(self, host="127.0.0.1", port=8000,
                  server_cls=None, handler_cls=Http1WebTestRequestHandler,
                  use_ssl=False, key_file=None, certificate=None, encrypt_after_connect=False,
-                 router_cls=Router, doc_root=os.curdir, routes=None,
+                 router_cls=Router, doc_root=os.curdir, ws_doc_root=None, routes=None,
                  rewriter_cls=RequestRewriter, bind_address=True, rewrites=None,
                  latency=None, config=None, http2=False):
 
@@ -673,6 +788,7 @@ class WebTestHttpd(object):
                                     self.rewriter,
                                     config=config,
                                     bind_address=bind_address,
+                                    ws_doc_root=ws_doc_root,
                                     use_ssl=use_ssl,
                                     key_file=key_file,
                                     certificate=certificate,
@@ -727,3 +843,54 @@ class WebTestHttpd(object):
         return urlunsplit(("http" if not self.use_ssl else "https",
                            "%s:%s" % (self.host, self.port),
                            path, query, fragment))
+
+
+class _WebSocketConnection(object):
+    def __init__(self, request_handler, response):
+        """Mimic mod_python mp_conn.
+
+        :param request_handler: A H2HandlerCopy instance.
+
+        :param response: A H2Response instance.
+        """
+
+        self._request_handler = request_handler
+        self._response = response
+
+        self.remote_addr = self._request_handler.client_address
+
+    def write(self, data):
+        self._response.writer.write_data(data, False)
+
+    def read(self, length):
+        return self._request_handler.rfile.read(length)
+
+
+class _WebSocketRequest(object):
+    def __init__(self, request_handler, response):
+        """Mimic mod_python request.
+
+        :param request_handler: A H2HandlerCopy instance.
+
+        :param response: A H2Response instance.
+        """
+
+        self.connection = _WebSocketConnection(request_handler, response)
+        self._response = response
+
+        self.uri = request_handler.path
+        self.unparsed_uri = request_handler.path
+        self.method = request_handler.command
+        # read headers from request_handler
+        self.headers_in = request_handler.headers
+        # write headers directly into H2Response
+        self.headers_out = response.headers
+
+    # proxies status to H2Response
+    @property
+    def status(self):
+        return self._response.status
+
+    @status.setter
+    def status(self, status):
+        self._response.status = status
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py
new file mode 100644
index 00000000000..98796c0baf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py
@@ -0,0 +1,247 @@
+"""This file provides the opening handshake processor for the Bootstrapping
+WebSockets with HTTP/2 protocol (RFC 8441).
+
+Specification:
+https://tools.ietf.org/html/rfc8441
+"""
+
+from __future__ import absolute_import
+
+from mod_pywebsocket import common
+from mod_pywebsocket.stream import Stream
+from mod_pywebsocket.stream import StreamOptions
+from mod_pywebsocket import util
+from six.moves import map
+from six.moves import range
+
+# TODO: We are using "private" methods of pywebsocket. We might want to
+# refactor pywebsocket to expose those methods publicly. Also, _get_origin
+# _check_version _set_protocol _parse_extensions and a large part of do_handshake
+# are identical with hybi handshake. We need some refactoring to get remove that
+# code duplication.
+from mod_pywebsocket.extensions import get_extension_processor
+from mod_pywebsocket.handshake._base import get_mandatory_header
+from mod_pywebsocket.handshake._base import HandshakeException
+from mod_pywebsocket.handshake._base import parse_token_list
+from mod_pywebsocket.handshake._base import validate_mandatory_header
+from mod_pywebsocket.handshake._base import validate_subprotocol
+from mod_pywebsocket.handshake._base import VersionException
+
+# Defining aliases for values used frequently.
+_VERSION_LATEST = common.VERSION_HYBI_LATEST
+_VERSION_LATEST_STRING = str(_VERSION_LATEST)
+_SUPPORTED_VERSIONS = [
+    _VERSION_LATEST,
+]
+
+
+def check_connect_method(request):
+    if request.method != u'CONNECT':
+        raise HandshakeException('Method is not CONNECT: %r' % request.method)
+
+
+class WsH2Handshaker(object):
+    def __init__(self, request, dispatcher):
+        """Opening handshake processor for the WebSocket protocol (RFC 6455).
+
+        :param request: mod_python request.
+
+        :param dispatcher: Dispatcher (dispatch.Dispatcher).
+
+        WsH2Handshaker will add attributes such as ws_resource during handshake.
+        """
+
+        self._logger = util.get_class_logger(self)
+
+        self._request = request
+        self._dispatcher = dispatcher
+
+    def _get_extension_processors_requested(self):
+        processors = []
+        if self._request.ws_requested_extensions is not None:
+            for extension_request in self._request.ws_requested_extensions:
+                processor = get_extension_processor(extension_request)
+                # Unknown extension requests are just ignored.
+                if processor is not None:
+                    processors.append(processor)
+        return processors
+
+    def do_handshake(self):
+        self._request.ws_close_code = None
+        self._request.ws_close_reason = None
+
+        # Parsing.
+
+        check_connect_method(self._request)
+
+        validate_mandatory_header(self._request, ':protocol', 'websocket')
+
+        self._request.ws_resource = self._request.uri
+
+        get_mandatory_header(self._request, 'authority')
+
+        self._request.ws_version = self._check_version()
+
+        try:
+            self._get_origin()
+            self._set_protocol()
+            self._parse_extensions()
+
+            # Setup extension processors.
+            self._request.ws_extension_processors = self._get_extension_processors_requested()
+
+            # List of extra headers. The extra handshake handler may add header
+            # data as name/value pairs to this list and pywebsocket appends
+            # them to the WebSocket handshake.
+            self._request.extra_headers = []
+
+            # Extra handshake handler may modify/remove processors.
+            self._dispatcher.do_extra_handshake(self._request)
+            processors = [
+                processor
+                for processor in self._request.ws_extension_processors
+                if processor is not None
+            ]
+
+            # Ask each processor if there are extensions on the request which
+            # cannot co-exist. When processor decided other processors cannot
+            # co-exist with it, the processor marks them (or itself) as
+            # "inactive". The first extension processor has the right to
+            # make the final call.
+            for processor in reversed(processors):
+                if processor.is_active():
+                    processor.check_consistency_with_other_processors(
+                        processors)
+            processors = [
+                processor for processor in processors if processor.is_active()
+            ]
+
+            accepted_extensions = []
+
+            stream_options = StreamOptions()
+
+            for index, processor in enumerate(processors):
+                if not processor.is_active():
+                    continue
+
+                extension_response = processor.get_extension_response()
+                if extension_response is None:
+                    # Rejected.
+                    continue
+
+                accepted_extensions.append(extension_response)
+
+                processor.setup_stream_options(stream_options)
+
+                # Inactivate all of the following compression extensions.
+                for j in range(index + 1, len(processors)):
+                    processors[j].set_active(False)
+
+            if len(accepted_extensions) > 0:
+                self._request.ws_extensions = accepted_extensions
+                self._logger.debug(
+                    'Extensions accepted: %r',
+                    list(
+                        map(common.ExtensionParameter.name,
+                            accepted_extensions)))
+            else:
+                self._request.ws_extensions = None
+
+            self._request.ws_stream = self._create_stream(stream_options)
+
+            if self._request.ws_requested_protocols is not None:
+                if self._request.ws_protocol is None:
+                    raise HandshakeException(
+                        'do_extra_handshake must choose one subprotocol from '
+                        'ws_requested_protocols and set it to ws_protocol')
+                validate_subprotocol(self._request.ws_protocol)
+
+                self._logger.debug('Subprotocol accepted: %r',
+                                   self._request.ws_protocol)
+            else:
+                if self._request.ws_protocol is not None:
+                    raise HandshakeException(
+                        'ws_protocol must be None when the client didn\'t '
+                        'request any subprotocol')
+
+            self._prepare_handshake_response()
+        except HandshakeException as e:
+            if not e.status:
+                # Fallback to 400 bad request by default.
+                e.status = common.HTTP_STATUS_BAD_REQUEST
+            raise e
+
+    def _get_origin(self):
+        origin = self._request.headers_in.get('origin')
+        if origin is None:
+            self._logger.debug('Client request does not have origin header')
+        self._request.ws_origin = origin
+
+    def _check_version(self):
+        sec_websocket_version_header = 'sec-websocket-version'
+        version = get_mandatory_header(self._request, sec_websocket_version_header)
+        if version == _VERSION_LATEST_STRING:
+            return _VERSION_LATEST
+
+        if version.find(',') >= 0:
+            raise HandshakeException(
+                'Multiple versions (%r) are not allowed for header %s' %
+                (version, sec_websocket_version_header),
+                status=common.HTTP_STATUS_BAD_REQUEST)
+        raise VersionException('Unsupported version %r for header %s' %
+                               (version, sec_websocket_version_header),
+                               supported_versions=', '.join(
+                                   map(str, _SUPPORTED_VERSIONS)))
+
+    def _set_protocol(self):
+        self._request.ws_protocol = None
+
+        protocol_header = self._request.headers_in.get('sec-websocket-protocol')
+
+        if protocol_header is None:
+            self._request.ws_requested_protocols = None
+            return
+
+        self._request.ws_requested_protocols = parse_token_list(
+            protocol_header)
+        self._logger.debug('Subprotocols requested: %r',
+                           self._request.ws_requested_protocols)
+
+    def _parse_extensions(self):
+        extensions_header = self._request.headers_in.get('sec-websocket-extensions')
+        if not extensions_header:
+            self._request.ws_requested_extensions = None
+            return
+
+        try:
+            self._request.ws_requested_extensions = common.parse_extensions(
+                extensions_header)
+        except common.ExtensionParsingException as e:
+            raise HandshakeException(
+                'Failed to parse sec-websocket-extensions header: %r' % e)
+
+        self._logger.debug(
+            'Extensions requested: %r',
+            list(
+                map(common.ExtensionParameter.name,
+                    self._request.ws_requested_extensions)))
+
+    def _create_stream(self, stream_options):
+        return Stream(self._request, stream_options)
+
+    def _prepare_handshake_response(self):
+        self._request.status = 200
+
+        self._request.headers_out['upgrade'] = common.WEBSOCKET_UPGRADE_TYPE
+        self._request.headers_out['connection'] = common.UPGRADE_CONNECTION_TYPE
+
+        if self._request.ws_protocol is not None:
+            self._request.headers_out['sec-websocket-protocol'] = self._request.ws_protocol
+
+        if (self._request.ws_extensions is not None and
+                len(self._request.ws_extensions) != 0):
+            self._request.headers_out['sec-websocket-extensions'] = common.format_extensions(self._request.ws_extensions)
+
+        # Headers not specific for WebSocket
+        for name, value in self._request.extra_headers:
+            self._request.headers_out[name] = value
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html
index 5944b0e92d6..a4a9c9e3512 100644
--- a/tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html
@@ -35,6 +35,9 @@
           _ => script.textContent = "2+2" ],
       [ "about:blank", "TrustedScriptURL", "HTMLScriptElement src",
           _ => script.src = "about:blank" ],
+      [ "2+2", "TrustedScript", "eval", _ => eval("2+2") ],
+      [ "(function anonymous(\n) {\nreturn 2+2\n})", "TrustedScript",
+        "Function", _ => new Function("return 2+2") ],
     ];
     for (var tc of cases) {
       test(t => {
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py b/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
index 711ad5af79f..940733659eb 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
@@ -1,7 +1,6 @@
 from webdriver.error import NoSuchAlertException
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
@@ -10,7 +9,7 @@ def accept_alert(session):
         "POST", "session/{session_id}/alert/accept".format(**vars(session)))
 
 
-def test_null_response_value(session, url):
+def test_null_response_value(session, inline):
     session.url = inline("<script>window.alert('Hello');</script>")
 
     response = accept_alert(session)
@@ -33,20 +32,20 @@ def test_no_user_prompt(session):
     assert_error(response, "no such alert")
 
 
-def test_accept_alert(session):
+def test_accept_alert(session, inline):
     session.url = inline("<script>window.alert('Hello');</script>")
     response = accept_alert(session)
     assert_success(response)
 
 
-def test_accept_confirm(session):
+def test_accept_confirm(session, inline):
     session.url = inline("<script>window.result = window.confirm('Hello');</script>")
     response = accept_alert(session)
     assert_success(response)
     assert session.execute_script("return window.result") is True
 
 
-def test_accept_prompt(session):
+def test_accept_prompt(session, inline):
     session.url = inline("""
         <script>
           window.result = window.prompt('Enter Your Name: ', 'Federer');
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/back/back.py b/tests/wpt/web-platform-tests/webdriver/tests/back/back.py
index 5b50bc1bbb5..ee82adf81ca 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/back/back.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/back/back.py
@@ -1,4 +1,3 @@
-from tests.support.inline import inline
 from tests.support.asserts import assert_error, assert_success
 
 
@@ -7,7 +6,7 @@ def back(session):
         "POST", "session/{session_id}/back".format(**vars(session)))
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<div>")
     session.url = inline("<p>")
 
@@ -31,7 +30,7 @@ def test_no_browsing_history(session):
     assert_success(response)
 
 
-def test_data_urls(session):
+def test_data_urls(session, inline):
     test_pages = [
         inline("<p id=1>"),
         inline("<p id=2>"),
@@ -46,7 +45,7 @@ def test_data_urls(session):
     assert session.url == test_pages[0]
 
 
-def test_dismissed_beforeunload(session):
+def test_dismissed_beforeunload(session, inline):
     url_beforeunload = inline("""
       <input type="text">
       <script>
@@ -88,7 +87,7 @@ def test_fragments(session, url):
     assert session.url == test_pages[0]
 
 
-def test_history_pushstate(session, url):
+def test_history_pushstate(session, inline):
     pushstate_page = inline("""
       <script>
         function pushState() {
@@ -111,7 +110,7 @@ def test_history_pushstate(session, url):
     assert session.execute_script("return history.state;") is None
 
 
-def test_removed_iframe(session, url):
+def test_removed_iframe(session, url, inline):
     page = inline("<p>foo")
 
     session.url = page
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/back/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/back/user_prompts.py
index 7121f7c6b2a..9d04f0f4ab1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/back/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/back/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def back(session):
@@ -12,7 +11,7 @@ def back(session):
 
 
 @pytest.fixture
-def pages(session):
+def pages(session, inline):
     pages = [
         inline("<p id=1>"),
         inline("<p id=2>"),
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py b/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py
index 2d665d5a883..7b382fa9bbc 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py
@@ -2,7 +2,6 @@ import pytest
 from webdriver import error
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def close(session):
@@ -46,7 +45,7 @@ def test_close_browsing_context(session):
     assert new_handle not in handles
 
 
-def test_close_browsing_context_with_dismissed_beforeunload_prompt(session):
+def test_close_browsing_context_with_dismissed_beforeunload_prompt(session, inline):
     original_handles = session.handles
 
     new_handle = session.new_window()
@@ -83,7 +82,7 @@ def test_close_last_browsing_context(session):
     session.session_id = None
 
 
-def test_element_usage_after_closing_browsing_context(session):
+def test_element_usage_after_closing_browsing_context(session, inline):
     session.url = inline("<p id='a'>foo")
     a = session.find.css("p", all=False)
     first = session.window_handle
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/delete_session/delete.py b/tests/wpt/web-platform-tests/webdriver/tests/delete_session/delete.py
index d0b4d796308..a3032cc1347 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/delete_session/delete.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/delete_session/delete.py
@@ -2,7 +2,6 @@ import pytest
 from webdriver import error
 
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
 
 
 def delete_session(session):
@@ -19,7 +18,7 @@ def test_null_response_value(session):
     session.end()
 
 
-def test_dismissed_beforeunload_prompt(session):
+def test_dismissed_beforeunload_prompt(session, inline):
     session.url = inline("""
       <input type="text">
       <script>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py b/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
index da65bac388d..63874ade632 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
@@ -1,7 +1,6 @@
 from webdriver.error import NoSuchAlertException
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
@@ -10,7 +9,7 @@ def dismiss_alert(session):
         "POST", "session/{session_id}/alert/dismiss".format(**vars(session)))
 
 
-def test_null_response_value(session, url):
+def test_null_response_value(session, inline):
     session.url = inline("<script>window.alert('Hello');</script>")
 
     response = dismiss_alert(session)
@@ -33,20 +32,20 @@ def test_no_user_prompt(session):
     assert_error(response, "no such alert")
 
 
-def test_dismiss_alert(session):
+def test_dismiss_alert(session, inline):
     session.url = inline("<script>window.alert('Hello');</script>")
     response = dismiss_alert(session)
     assert_success(response)
 
 
-def test_dismiss_confirm(session):
+def test_dismiss_confirm(session, inline):
     session.url = inline("<script>window.result = window.confirm('Hello');</script>")
     response = dismiss_alert(session)
     assert_success(response)
     assert session.execute_script("return window.result;") is False
 
 
-def test_dismiss_prompt(session):
+def test_dismiss_prompt(session, inline):
     session.url = inline("<script>window.result = window.prompt('Enter Your Name: ', 'Federer');</script>")
     response = dismiss_alert(session)
     assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
index 8b7bb501043..b65f443aa75 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
@@ -11,7 +11,6 @@ from tests.support.asserts import (
     assert_in_events,
     assert_success,
 )
-from tests.support.inline import inline
 
 
 @pytest.fixture
@@ -37,7 +36,7 @@ def text_file(tmpdir_factory):
     return fh
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -67,7 +66,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_connected_element(session):
+def test_connected_element(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -76,7 +75,7 @@ def test_connected_element(session):
     assert_error(response, "stale element reference")
 
 
-def test_pointer_interactable(session):
+def test_pointer_interactable(session, inline):
     session.url = inline("<input style='margin-left: -1000px' value=foobar>")
     element = session.find.css("input", all=False)
 
@@ -84,7 +83,7 @@ def test_pointer_interactable(session):
     assert_error(response, "element not interactable")
 
 
-def test_keyboard_interactable(session):
+def test_keyboard_interactable(session, inline):
     session.url = inline("""
         <input value=foobar>
         <div></div>
@@ -121,7 +120,7 @@ def test_keyboard_interactable(session):
                           ("time", "19:48", ""),
                           ("month", "2017-11", ""),
                           ("week", "2017-W52", "")])
-def test_input(session, add_event_listeners, tracked_events, type, value, default):
+def test_input(session, inline, add_event_listeners, tracked_events, type, value, default):
     session.url = inline("<input type=%s value='%s'>" % (type, value))
     element = session.find.css("input", all=False)
     add_event_listeners(element, tracked_events)
@@ -151,7 +150,7 @@ def test_input(session, add_event_listeners, tracked_events, type, value, defaul
                           "month",
                           "week",
                           "file"])
-def test_input_disabled(session, type):
+def test_input_disabled(session, inline, type):
     session.url = inline("<input type=%s disabled>" % type)
     element = session.find.css("input", all=False)
 
@@ -176,7 +175,7 @@ def test_input_disabled(session, type):
                           "month",
                           "week",
                           "file"])
-def test_input_readonly(session, type):
+def test_input_readonly(session, inline, type):
     session.url = inline("<input type=%s readonly>" % type)
     element = session.find.css("input", all=False)
 
@@ -184,7 +183,7 @@ def test_input_readonly(session, type):
     assert_error(response, "invalid element state")
 
 
-def test_textarea(session, add_event_listeners, tracked_events):
+def test_textarea(session, inline, add_event_listeners, tracked_events):
     session.url = inline("<textarea>foobar</textarea>")
     element = session.find.css("textarea", all=False)
     add_event_listeners(element, tracked_events)
@@ -196,7 +195,7 @@ def test_textarea(session, add_event_listeners, tracked_events):
     assert_in_events(session, ["focus", "change", "blur"])
 
 
-def test_textarea_disabled(session):
+def test_textarea_disabled(session, inline):
     session.url = inline("<textarea disabled></textarea>")
     element = session.find.css("textarea", all=False)
 
@@ -204,7 +203,7 @@ def test_textarea_disabled(session):
     assert_error(response, "invalid element state")
 
 
-def test_textarea_readonly(session):
+def test_textarea_readonly(session, inline):
     session.url = inline("<textarea readonly></textarea>")
     element = session.find.css("textarea", all=False)
 
@@ -212,7 +211,7 @@ def test_textarea_readonly(session):
     assert_error(response, "invalid element state")
 
 
-def test_input_file(session, text_file):
+def test_input_file(session, text_file, inline):
     session.url = inline("<input type=file>")
     element = session.find.css("input", all=False)
     element.send_keys(str(text_file))
@@ -222,7 +221,7 @@ def test_input_file(session, text_file):
     assert element.property("value") == ""
 
 
-def test_input_file_multiple(session, text_file):
+def test_input_file_multiple(session, text_file, inline):
     session.url = inline("<input type=file multiple>")
     element = session.find.css("input", all=False)
     element.send_keys(str(text_file))
@@ -233,7 +232,7 @@ def test_input_file_multiple(session, text_file):
     assert element.property("value") == ""
 
 
-def test_select(session):
+def test_select(session, inline):
     session.url = inline("""
         <select>
           <option>foo
@@ -248,7 +247,7 @@ def test_select(session):
     assert_error(response, "invalid element state")
 
 
-def test_button(session):
+def test_button(session, inline):
     session.url = inline("<button></button>")
     button = session.find.css("button", all=False)
 
@@ -256,7 +255,7 @@ def test_button(session):
     assert_error(response, "invalid element state")
 
 
-def test_button_with_subtree(session):
+def test_button_with_subtree(session, inline):
     """
     Elements inside button elements are interactable.
     """
@@ -271,7 +270,7 @@ def test_button_with_subtree(session):
     assert_success(response)
 
 
-def test_contenteditable(session, add_event_listeners, tracked_events):
+def test_contenteditable(session, inline, add_event_listeners, tracked_events):
     session.url = inline("<p contenteditable>foobar</p>")
     element = session.find.css("p", all=False)
     add_event_listeners(element, tracked_events)
@@ -284,7 +283,7 @@ def test_contenteditable(session, add_event_listeners, tracked_events):
     assert_element_has_focus(session.execute_script("return document.body"))
 
 
-def test_designmode(session):
+def test_designmode(session, inline):
     session.url = inline("foobar")
     element = session.find.css("body", all=False)
     assert element.property("innerHTML") == "foobar"
@@ -296,7 +295,7 @@ def test_designmode(session):
     assert_element_has_focus(session.execute_script("return document.body"))
 
 
-def test_resettable_element_focus_when_empty(session, add_event_listeners, tracked_events):
+def test_resettable_element_focus_when_empty(session, inline, add_event_listeners, tracked_events):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     add_event_listeners(element, tracked_events)
@@ -320,7 +319,7 @@ def test_resettable_element_focus_when_empty(session, add_event_listeners, track
                           ("time", "foo"),
                           ("month", "foo"),
                           ("week", "foo")])
-def test_resettable_element_does_not_satisfy_validation_constraints(session, type, invalid_value):
+def test_resettable_element_does_not_satisfy_validation_constraints(session, inline, type, invalid_value):
     """
     Some UAs allow invalid input to certain types of constrained
     form controls.  For example, Gecko allows non-valid characters
@@ -357,7 +356,7 @@ def test_resettable_element_does_not_satisfy_validation_constraints(session, typ
                           "submit",
                           "button",
                           "image"])
-def test_non_editable_inputs(session, type):
+def test_non_editable_inputs(session, inline, type):
     session.url = inline("<input type=%s>" % type)
     element = session.find.css("input", all=False)
 
@@ -365,7 +364,7 @@ def test_non_editable_inputs(session, type):
     assert_error(response, "invalid element state")
 
 
-def test_scroll_into_view(session):
+def test_scroll_into_view(session, inline):
     session.url = inline("""
         <input value=foobar>
         <div style='height: 200vh; width: 5000vh'>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/user_prompts.py
index cfb850e08d5..7a8564a684a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_clear(session, element):
@@ -14,7 +13,7 @@ def element_clear(session, element):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -35,7 +34,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -56,7 +55,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
index a069a5a5df3..7620ec3224f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -9,7 +8,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_click_event_bubbles_to_parents(session):
+def test_click_event_bubbles_to_parents(session, inline):
     session.url = inline("""
         <style>
         body * {
@@ -45,7 +44,7 @@ def test_click_event_bubbles_to_parents(session):
     assert three in clicks
 
 
-def test_spin_event_loop(session):
+def test_spin_event_loop(session, inline):
     """
     Wait until the user agent event loop has spun enough times to
     process the DOM events generated by clicking.
@@ -86,7 +85,7 @@ def test_spin_event_loop(session):
     assert three in delayed_clicks
 
 
-def test_element_disappears_during_click(session):
+def test_element_disappears_during_click(session, inline):
     """
     When an element in the event bubbling order disappears (its CSS
     display style is set to "none") during a click, Gecko and Blink
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/center_point.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/center_point.py
index da60a087277..ef0c9a7fe27 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/center_point.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/center_point.py
@@ -2,7 +2,6 @@ import pytest
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.helpers import center_point
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -12,7 +11,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def square(size):
+def square(inline, size):
     return inline("""
         <style>
         body {{ margin: 0 }}
@@ -41,8 +40,8 @@ def assert_one_click(session):
     return tuple(clicks[0])
 
 
-def test_entirely_in_view(session):
-    session.url = square(444)
+def test_entirely_in_view(session, inline):
+    session.url = square(inline, 444)
     element = session.find.css("#target", all=False)
 
     response = element_click(session, element)
@@ -53,8 +52,8 @@ def test_entirely_in_view(session):
 
 
 @pytest.mark.parametrize("size", range(1, 11))
-def test_css_pixel_rounding(session, size):
-    session.url = square(size)
+def test_css_pixel_rounding(session, inline, size):
+    session.url = square(inline, size)
     element = session.find.css("#target", all=False)
     expected_click_point = center_point(element)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
index 50982fe4bdd..b1b10162e4d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
@@ -1,7 +1,6 @@
 from webdriver import Element
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -11,7 +10,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<p>foo")
     element = session.find.css("p", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/file_upload.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/file_upload.py
index cd5bb434204..73832d0f85a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/file_upload.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/file_upload.py
@@ -1,5 +1,5 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
+
 
 def element_click(session, element):
     return session.transport.send(
@@ -8,7 +8,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_file_upload_state(session):
+def test_file_upload_state(session,inline):
     session.url = inline("<input type=file>")
 
     element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
index 7463d493e3d..d55860c8746 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -11,7 +10,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_display_none(session):
+def test_display_none(session, inline):
     session.url = inline("""<button style="display: none">foobar</button>""")
     element = session.find.css("button", all=False)
 
@@ -19,7 +18,7 @@ def test_display_none(session):
     assert_error(response, "element not interactable")
 
 
-def test_visibility_hidden(session):
+def test_visibility_hidden(session, inline):
     session.url = inline("""<button style="visibility: hidden">foobar</button>""")
     element = session.find.css("button", all=False)
 
@@ -27,7 +26,7 @@ def test_visibility_hidden(session):
     assert_error(response, "element not interactable")
 
 
-def test_hidden(session):
+def test_hidden(session, inline):
     session.url = inline("<button hidden>foobar</button>")
     element = session.find.css("button", all=False)
 
@@ -35,7 +34,7 @@ def test_hidden(session):
     assert_error(response, "element not interactable")
 
 
-def test_disabled(session):
+def test_disabled(session, inline):
     session.url = inline("""<button disabled>foobar</button>""")
     element = session.find.css("button", all=False)
 
@@ -44,7 +43,7 @@ def test_disabled(session):
 
 
 @pytest.mark.parametrize("transform", ["translate(-100px, -100px)", "rotate(50deg)"])
-def test_element_not_interactable_css_transform(session, transform):
+def test_element_not_interactable_css_transform(session, inline, transform):
     session.url = inline("""
         <div style="width: 500px; height: 100px;
             background-color: blue; transform: {transform};">
@@ -55,7 +54,7 @@ def test_element_not_interactable_css_transform(session, transform):
     assert_error(response, "element not interactable")
 
 
-def test_element_not_interactable_out_of_view(session):
+def test_element_not_interactable_out_of_view(session, inline):
     session.url = inline("""
         <style>
         input {
@@ -73,7 +72,7 @@ def test_element_not_interactable_out_of_view(session):
 
 
 @pytest.mark.parametrize("tag_name", ["div", "span"])
-def test_zero_sized_element(session, tag_name):
+def test_zero_sized_element(session, inline, tag_name):
     session.url = inline("<{0}></{0}>".format(tag_name))
     element = session.find.css(tag_name, all=False)
 
@@ -81,7 +80,7 @@ def test_zero_sized_element(session, tag_name):
     assert_error(response, "element not interactable")
 
 
-def test_element_intercepted(session):
+def test_element_intercepted(session, inline):
     session.url = inline("""
         <style>
         div {
@@ -102,14 +101,14 @@ def test_element_intercepted(session):
     assert_error(response, "element click intercepted")
 
 
-def test_element_intercepted_no_pointer_events(session):
+def test_element_intercepted_no_pointer_events(session, inline):
     session.url = inline("""<input type=button value=Roger style="pointer-events: none">""")
     element = session.find.css("input", all=False)
     response = element_click(session, element)
     assert_error(response, "element click intercepted")
 
 
-def test_element_not_visible_overflow_hidden(session):
+def test_element_not_visible_overflow_hidden(session, inline):
     session.url = inline("""
         <style>
         div {
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/navigate.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/navigate.py
index 548587cd2b6..c537fabe2e2 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/navigate.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/navigate.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.error import NoSuchElementException
 
 from tests.support.asserts import assert_success
-from tests.support.inline import iframe, inline
 from tests.support.sync import Poll
 
 from . import wait_for_new_handle
@@ -16,7 +15,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_numbers_link(session, server_config):
+def test_numbers_link(session, server_config, inline):
     link = "/webdriver/tests/element_click/support/input.html"
     session.url = inline("<a href={url}>123456</a>".format(url=link))
     element = session.find.css("a", all=False)
@@ -28,7 +27,7 @@ def test_numbers_link(session, server_config):
     assert session.url == "http://{host}:{port}{url}".format(host=host, port=port, url=link)
 
 
-def test_multi_line_link(session, server_config):
+def test_multi_line_link(session, server_config, inline):
     link = "/webdriver/tests/element_click/support/input.html"
     session.url = inline("""
         <p style="background-color: yellow; width: 50px;">
@@ -43,7 +42,7 @@ def test_multi_line_link(session, server_config):
     assert session.url == "http://{host}:{port}{url}".format(host=host, port=port, url=link)
 
 
-def test_link_unload_event(session, server_config):
+def test_link_unload_event(session, server_config, inline):
     link = "/webdriver/tests/element_click/support/input.html"
     session.url = inline("""
         <body onunload="checkUnload()">
@@ -74,7 +73,7 @@ def test_link_unload_event(session, server_config):
     assert response is True
 
 
-def test_link_hash(session):
+def test_link_hash(session, inline):
     id = "anchor"
     session.url = inline("""
         <a href="#{url}">aaaa</a>
@@ -106,7 +105,7 @@ def test_link_hash(session):
     "_self",
     "_top",
 ])
-def test_link_from_toplevel_context_with_target(session, target):
+def test_link_from_toplevel_context_with_target(session, inline, target):
     target_page = inline("<p id='foo'>foo</p>")
 
     session.url = inline("<a href='{}' target='{}'>click</a>".format(target_page, target))
@@ -135,7 +134,7 @@ def test_link_from_toplevel_context_with_target(session, target):
     "_self",
     "_top",
 ])
-def test_link_from_nested_context_with_target(session, target):
+def test_link_from_nested_context_with_target(session, inline, iframe, target):
     target_page = inline("<p id='foo'>foo</p>")
 
     session.url = inline(iframe("<a href='{}' target='{}'>click</a>".format(target_page, target)))
@@ -167,7 +166,7 @@ def test_link_from_nested_context_with_target(session, target):
     wait.until(lambda s: s.find.css("#foo"))
 
 
-def test_link_closes_window(session):
+def test_link_closes_window(session, inline):
     new_handle = session.new_window()
     session.window_handle = new_handle
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/scroll_into_view.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/scroll_into_view.py
index 4b026e986a2..c2dc6485286 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/scroll_into_view.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/scroll_into_view.py
@@ -2,7 +2,7 @@ import pytest
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.helpers import center_point
-from tests.support.inline import inline
+
 
 def element_click(session, element):
     return session.transport.send(
@@ -18,7 +18,7 @@ def assert_one_click(session):
     return tuple(clicks[0])
 
 
-def test_scroll_into_view(session):
+def test_scroll_into_view(session, inline):
     session.url = inline("""
         <input type=text value=Federer
         style="position: absolute; left: 0vh; top: 500vh">""")
@@ -38,7 +38,7 @@ def test_scroll_into_view(session):
 
 
 @pytest.mark.parametrize("offset", range(9, 0, -1))
-def test_partially_visible_does_not_scroll(session, offset):
+def test_partially_visible_does_not_scroll(session, offset, inline):
     session.url = inline("""
         <style>
         body {{
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/select.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/select.py
index dcf92e64589..62d40755b59 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/select.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/select.py
@@ -1,7 +1,4 @@
-from tests.support.inline import inline
-
-
-def test_click_option(session):
+def test_click_option(session, inline):
     session.url = inline("""
       <select>
         <option>first
@@ -17,7 +14,7 @@ def test_click_option(session):
     assert not options[0].selected
 
 
-def test_click_multiple_option(session):
+def test_click_multiple_option(session, inline):
     session.url = inline("""
       <select multiple>
         <option>first
@@ -33,7 +30,7 @@ def test_click_multiple_option(session):
     assert not options[1].selected
 
 
-def test_click_preselected_option(session):
+def test_click_preselected_option(session, inline):
     session.url = inline("""
       <select>
         <option>first
@@ -53,7 +50,7 @@ def test_click_preselected_option(session):
     assert not options[1].selected
 
 
-def test_click_preselected_multiple_option(session):
+def test_click_preselected_multiple_option(session, inline):
     session.url = inline("""
       <select multiple>
         <option>first
@@ -73,7 +70,7 @@ def test_click_preselected_multiple_option(session):
     assert not options[1].selected
 
 
-def test_click_deselects_others(session):
+def test_click_deselects_others(session, inline):
     session.url = inline("""
       <select>
         <option>first
@@ -92,7 +89,7 @@ def test_click_deselects_others(session):
     assert options[0].selected
 
 
-def test_click_multiple_does_not_deselect_others(session):
+def test_click_multiple_does_not_deselect_others(session, inline):
     session.url = inline("""
       <select multiple>
         <option>first
@@ -112,7 +109,7 @@ def test_click_multiple_does_not_deselect_others(session):
     assert options[2].selected
 
 
-def test_click_selected_option(session):
+def test_click_selected_option(session, inline):
     session.url = inline("""
       <select>
         <option>first
@@ -130,7 +127,7 @@ def test_click_selected_option(session):
     assert options[1].selected
 
 
-def test_click_selected_multiple_option(session):
+def test_click_selected_multiple_option(session, inline):
     session.url = inline("""
       <select multiple>
         <option>first
@@ -152,7 +149,7 @@ def test_click_selected_multiple_option(session):
     assert not options[1].selected
 
 
-def test_out_of_view_dropdown(session):
+def test_out_of_view_dropdown(session, inline):
     session.url = inline("""
       <select>
         <option>1
@@ -182,7 +179,7 @@ def test_out_of_view_dropdown(session):
     assert options[14].selected
 
 
-def test_out_of_view_multiple(session):
+def test_out_of_view_multiple(session, inline):
     session.url = inline("""
       <select multiple>
         <option>1
@@ -213,7 +210,7 @@ def test_out_of_view_multiple(session):
     assert last_option.selected
 
 
-def test_option_disabled(session):
+def test_option_disabled(session, inline):
     session.url = inline("""
         <select>
           <option disabled>foo
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py
index b52f27429c1..45493b730d6 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py
@@ -1,6 +1,5 @@
-from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 import pytest
+from tests.support.asserts import assert_error, assert_success
 
 
 def element_click(session, element):
@@ -10,7 +9,8 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def get_checkbox_dom():
+@pytest.fixture
+def get_checkbox_dom(inline):
     return inline("""
         <style>
             custom-checkbox-element {
@@ -32,8 +32,8 @@ def get_checkbox_dom():
 
 
 @pytest.mark.parametrize("click_on", ["custom_element", "checkbox_element"])
-def test_shadow_element_click(session, click_on):
-    session.url = get_checkbox_dom()
+def test_shadow_element_click(session, get_checkbox_dom, click_on):
+    session.url = get_checkbox_dom
     custom_element = session.find.css("custom-checkbox-element", all=False)
     checkbox_element = session.execute_script("return arguments[0].shadowRoot.querySelector('input')",
                                               args=(custom_element,))
@@ -47,7 +47,8 @@ def test_shadow_element_click(session, click_on):
     assert is_post_checked == True
 
 
-def get_nested_shadow_checkbox_dom():
+@pytest.fixture
+def get_nested_shadow_checkbox_dom(inline):
     return inline("""
         <style>
             custom-nesting-element {
@@ -83,8 +84,8 @@ def get_nested_shadow_checkbox_dom():
 
 
 @pytest.mark.parametrize("click_on", ["outer_element", "inner_element", "checkbox_element"])
-def test_nested_shadow_element_click(session, click_on):
-    session.url = get_nested_shadow_checkbox_dom()
+def test_nested_shadow_element_click(session, get_nested_shadow_checkbox_dom, click_on):
+    session.url = get_nested_shadow_checkbox_dom
     outer_element = session.find.css("custom-nesting-element", all=False)
     inner_element = session.execute_script("return arguments[0].shadowRoot.querySelector('custom-checkbox-element')",
                                            args=(outer_element,))
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
index cd24dd70603..8d2ae348ef4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -9,7 +8,7 @@ def element_click(session, element):
             element_id=element.id))
 
 
-def test_is_stale(session):
+def test_is_stale(session, inline):
     session.url = inline("<button>foo</button>")
     button = session.find.css("button", all=False)
     session.url = inline("<button>bar</button>")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/user_prompts.py
index b3706fe4af1..140aceb3ced 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_click(session, element):
@@ -14,7 +13,7 @@ def element_click(session, element):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -32,7 +31,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -50,7 +49,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py
index 16ebc2d018f..7f628f96a53 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py
@@ -1,9 +1,4 @@
-import pytest
-
-from tests.support.inline import inline
-
-
-def test_sets_insertion_point_to_end(session):
+def test_sets_insertion_point_to_end(session, inline):
     session.url = inline('<div contenteditable=true>Hello,</div>')
     input = session.find.css("div", all=False)
     input.send_keys(' world!')
@@ -15,7 +10,7 @@ def test_sets_insertion_point_to_end(session):
 #
 # 13. Set the text insertion caret using set selection range using current
 #     text length for both the start and end parameters.
-def test_sets_insertion_point_to_after_last_text_node(session):
+def test_sets_insertion_point_to_after_last_text_node(session, inline):
     session.url = inline('<div contenteditable=true>Hel<span>lo</span>,</div>')
     input = session.find.css("div", all=False)
     input.send_keys(" world!")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/events.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/events.py
index 41b00ef37fa..4be1432bf3c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/events.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/events.py
@@ -5,7 +5,6 @@ from tests.support.asserts import (
     assert_events_equal,
     assert_success,
 )
-from tests.support.inline import inline
 
 from . import map_files_to_multiline_text
 
@@ -31,7 +30,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_file_upload(session, create_files, add_event_listeners, tracked_events):
+def test_file_upload(session, create_files, add_event_listeners, tracked_events, inline):
     expected_events = [
         "input",
         "change",
@@ -50,7 +49,7 @@ def test_file_upload(session, create_files, add_event_listeners, tracked_events)
 
 
 @pytest.mark.parametrize("tag", ["input", "textarea"])
-def test_form_control_send_text(session, add_event_listeners, tracked_events, tag):
+def test_form_control_send_text(session, add_event_listeners, tracked_events, inline, tag):
     expected_events = [
         "focus",
         "keydown",
@@ -77,7 +76,7 @@ def test_form_control_send_text(session, add_event_listeners, tracked_events, ta
 
 
 @pytest.mark.parametrize("tag", ["input", "textarea"])
-def test_not_blurred(session, tag):
+def test_not_blurred(session, inline, tag):
     session.url = inline("<%s>" % tag)
     element = session.find.css(tag, all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
index 7fbab8a66aa..ef792f4dd85 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_files_uploaded, assert_success
-from tests.support.inline import inline
 
 from . import map_files_to_multiline_text
 
@@ -14,7 +13,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_empty_text(session):
+def test_empty_text(session, inline):
     session.url = inline("<input type=file>")
     element = session.find.css("input", all=False)
 
@@ -22,7 +21,7 @@ def test_empty_text(session):
     assert_error(response, "invalid argument")
 
 
-def test_multiple_files(session, create_files):
+def test_multiple_files(session, create_files, inline):
     files = create_files(["foo", "bar"])
 
     session.url = inline("<input type=file multiple>")
@@ -35,7 +34,7 @@ def test_multiple_files(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_multiple_files_last_path_not_found(session, create_files):
+def test_multiple_files_last_path_not_found(session, create_files, inline):
     files = create_files(["foo", "bar"])
     files.append("foo bar")
 
@@ -49,7 +48,7 @@ def test_multiple_files_last_path_not_found(session, create_files):
     assert_files_uploaded(session, element, [])
 
 
-def test_multiple_files_without_multiple_attribute(session, create_files):
+def test_multiple_files_without_multiple_attribute(session, create_files, inline):
     files = create_files(["foo", "bar"])
 
     session.url = inline("<input type=file>")
@@ -62,7 +61,7 @@ def test_multiple_files_without_multiple_attribute(session, create_files):
     assert_files_uploaded(session, element, [])
 
 
-def test_multiple_files_send_twice(session, create_files):
+def test_multiple_files_send_twice(session, create_files, inline):
     first_files = create_files(["foo", "bar"])
     second_files = create_files(["john", "doe"])
 
@@ -80,7 +79,7 @@ def test_multiple_files_send_twice(session, create_files):
     assert_files_uploaded(session, element, first_files + second_files)
 
 
-def test_multiple_files_reset_with_element_clear(session, create_files):
+def test_multiple_files_reset_with_element_clear(session, create_files, inline):
     first_files = create_files(["foo", "bar"])
     second_files = create_files(["john", "doe"])
 
@@ -102,7 +101,7 @@ def test_multiple_files_reset_with_element_clear(session, create_files):
     assert_files_uploaded(session, element, second_files)
 
 
-def test_single_file(session, create_files):
+def test_single_file(session, create_files, inline):
     files = create_files(["foo"])
 
     session.url = inline("<input type=file>")
@@ -114,7 +113,7 @@ def test_single_file(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_single_file_replaces_without_multiple_attribute(session, create_files):
+def test_single_file_replaces_without_multiple_attribute(session, create_files, inline):
     files = create_files(["foo", "bar"])
 
     session.url = inline("<input type=file>")
@@ -129,7 +128,7 @@ def test_single_file_replaces_without_multiple_attribute(session, create_files):
     assert_files_uploaded(session, element, [files[1]])
 
 
-def test_single_file_appends_with_multiple_attribute(session, create_files):
+def test_single_file_appends_with_multiple_attribute(session, create_files, inline):
     files = create_files(["foo", "bar"])
 
     session.url = inline("<input type=file multiple>")
@@ -144,7 +143,7 @@ def test_single_file_appends_with_multiple_attribute(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_transparent(session, create_files):
+def test_transparent(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("""<input type=file style="opacity: 0">""")
     element = session.find.css("input", all=False)
@@ -154,7 +153,7 @@ def test_transparent(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_obscured(session, create_files):
+def test_obscured(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("""
         <style>
@@ -178,7 +177,7 @@ def test_obscured(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_outside_viewport(session, create_files):
+def test_outside_viewport(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("""<input type=file style="margin-left: -100vh">""")
     element = session.find.css("input", all=False)
@@ -188,7 +187,7 @@ def test_outside_viewport(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_hidden(session, create_files):
+def test_hidden(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("<input type=file hidden>")
     element = session.find.css("input", all=False)
@@ -198,7 +197,7 @@ def test_hidden(session, create_files):
     assert_files_uploaded(session, element, files)
 
 
-def test_display_none(session, create_files):
+def test_display_none(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("""<input type=file style="display: none">""")
     element = session.find.css("input", all=False)
@@ -209,7 +208,7 @@ def test_display_none(session, create_files):
 
 
 @pytest.mark.capabilities({"strictFileInteractability": True})
-def test_strict_hidden(session, create_files):
+def test_strict_hidden(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("<input type=file hidden>")
     element = session.find.css("input", all=False)
@@ -219,7 +218,7 @@ def test_strict_hidden(session, create_files):
 
 
 @pytest.mark.capabilities({"strictFileInteractability": True})
-def test_strict_display_none(session, create_files):
+def test_strict_display_none(session, create_files, inline):
     files = create_files(["foo"])
     session.url = inline("""<input type=file style="display: none">""")
     element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
index e53d0610f1e..0403dc92372 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_element_has_focus
-from tests.support.inline import inline
 
 
 def element_send_keys(session, element, text):
@@ -10,7 +9,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_input(session):
+def test_input(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     assert element.property("value") == ""
@@ -20,7 +19,7 @@ def test_input(session):
     assert_element_has_focus(element)
 
 
-def test_textarea(session):
+def test_textarea(session, inline):
     session.url = inline("<textarea>")
     element = session.find.css("textarea", all=False)
     assert element.property("value") == ""
@@ -30,7 +29,7 @@ def test_textarea(session):
     assert_element_has_focus(element)
 
 
-def test_input_append(session):
+def test_input_append(session, inline):
     session.url = inline("<input value=a>")
     element = session.find.css("input", all=False)
     assert element.property("value") == "a"
@@ -42,7 +41,7 @@ def test_input_append(session):
     assert element.property("value") == "abc"
 
 
-def test_textarea_append(session):
+def test_textarea_append(session, inline):
     session.url = inline("<textarea>a</textarea>")
     element = session.find.css("textarea", all=False)
     assert element.property("value") == "a"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
index 0717537ae5d..273843fb7b4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import iframe, inline
 
 
 def element_send_keys(session, element, text):
@@ -10,7 +9,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_body_is_interactable(session):
+def test_body_is_interactable(session, inline):
     session.url = inline("""
         <body onkeypress="document.querySelector('input').value += event.key">
           <input>
@@ -29,7 +28,7 @@ def test_body_is_interactable(session):
     assert result.property("value") == "foo"
 
 
-def test_document_element_is_interactable(session):
+def test_document_element_is_interactable(session, inline):
     session.url = inline("""
         <html onkeypress="document.querySelector('input').value += event.key">
           <input>
@@ -49,7 +48,7 @@ def test_document_element_is_interactable(session):
     assert result.property("value") == "foo"
 
 
-def test_iframe_is_interactable(session):
+def test_iframe_is_interactable(session, inline, iframe):
     session.url = inline(iframe("""
         <body onkeypress="document.querySelector('input').value += event.key">
           <input>
@@ -73,7 +72,7 @@ def test_iframe_is_interactable(session):
     assert result.property("value") == "foo"
 
 
-def test_transparent_element(session):
+def test_transparent_element(session, inline):
     session.url = inline("""<input style="opacity: 0">""")
     element = session.find.css("input", all=False)
 
@@ -82,7 +81,7 @@ def test_transparent_element(session):
     assert element.property("value") == "foo"
 
 
-def test_readonly_element(session):
+def test_readonly_element(session, inline):
     session.url = inline("<input readonly>")
     element = session.find.css("input", all=False)
 
@@ -91,7 +90,7 @@ def test_readonly_element(session):
     assert element.property("value") == ""
 
 
-def test_obscured_element(session):
+def test_obscured_element(session, inline):
     session.url = inline("""
       <input>
       <div style="position: relative; top: -3em; height: 5em; background: blue;"></div>
@@ -103,7 +102,7 @@ def test_obscured_element(session):
     assert element.property("value") == "foo"
 
 
-def test_not_a_focusable_element(session):
+def test_not_a_focusable_element(session, inline):
     session.url = inline("<div>foo</div>")
     element = session.find.css("div", all=False)
 
@@ -111,7 +110,7 @@ def test_not_a_focusable_element(session):
     assert_error(response, "element not interactable")
 
 
-def test_display_none(session):
+def test_display_none(session, inline):
     session.url = inline("""<input style="display: none">""")
     element = session.find.css("input", all=False)
 
@@ -119,7 +118,7 @@ def test_display_none(session):
     assert_error(response, "element not interactable")
 
 
-def test_visibility_hidden(session):
+def test_visibility_hidden(session, inline):
     session.url = inline("""<input style="visibility: hidden">""")
     element = session.find.css("input", all=False)
 
@@ -127,7 +126,7 @@ def test_visibility_hidden(session):
     assert_error(response, "element not interactable")
 
 
-def test_hidden(session):
+def test_hidden(session, inline):
     session.url = inline("<input hidden>")
     element = session.find.css("input", all=False)
 
@@ -135,7 +134,7 @@ def test_hidden(session):
     assert_error(response, "element not interactable")
 
 
-def test_disabled(session):
+def test_disabled(session, inline):
     session.url = inline("""<input disabled>""")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
index 18f87ffaaec..205c4e30e1e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
@@ -1,6 +1,6 @@
 from tests.support.asserts import assert_success
 from tests.support.helpers import is_element_in_viewport
-from tests.support.inline import inline
+
 
 def element_send_keys(session, element, text):
     return session.transport.send(
@@ -10,7 +10,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_element_outside_of_not_scrollable_viewport(session):
+def test_element_outside_of_not_scrollable_viewport(session, inline):
     session.url = inline("<input style=\"position: relative; left: -9999px;\">")
     element = session.find.css("input", all=False)
 
@@ -20,7 +20,7 @@ def test_element_outside_of_not_scrollable_viewport(session):
     assert not is_element_in_viewport(session, element)
 
 
-def test_element_outside_of_scrollable_viewport(session):
+def test_element_outside_of_scrollable_viewport(session, inline):
     session.url = inline("<input style=\"margin-top: 102vh;\">")
     element = session.find.css("input", all=False)
 
@@ -30,7 +30,7 @@ def test_element_outside_of_scrollable_viewport(session):
     assert is_element_in_viewport(session, element)
 
 
-def test_option_select_container_outside_of_scrollable_viewport(session):
+def test_option_select_container_outside_of_scrollable_viewport(session, inline):
     session.url = inline("""
         <select style="margin-top: 102vh;">
           <option value="foo">foo</option>
@@ -47,7 +47,7 @@ def test_option_select_container_outside_of_scrollable_viewport(session):
     assert is_element_in_viewport(session, element)
 
 
-def test_option_stays_outside_of_scrollable_viewport(session):
+def test_option_stays_outside_of_scrollable_viewport(session, inline):
     session.url = inline("""
         <select multiple style="height: 105vh; margin-top: 100vh;">
           <option value="foo" id="foo" style="height: 100vh;">foo</option>
@@ -66,7 +66,7 @@ def test_option_stays_outside_of_scrollable_viewport(session):
     assert not is_element_in_viewport(session, option_bar)
 
 
-def test_contenteditable_element_outside_of_scrollable_viewport(session):
+def test_contenteditable_element_outside_of_scrollable_viewport(session, inline):
     session.url = inline("<div contenteditable style=\"margin-top: 102vh;\"></div>")
     element = session.find.css("div", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
index acdc1164a40..aa393e16d81 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
@@ -4,7 +4,6 @@ from webdriver import Element
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_send_keys(session, element, text):
@@ -15,7 +14,7 @@ def element_send_keys(session, element, text):
         {"text": text})
 
 
-def test_null_parameter_value(session, http):
+def test_null_parameter_value(session, http, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -25,7 +24,7 @@ def test_null_parameter_value(session, http):
         assert_error(Response.from_http(response), "invalid argument")
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -56,7 +55,7 @@ def test_no_browsing_context(session, closed_frame):
 
 
 @pytest.mark.parametrize("value", [True, None, 1, [], {}])
-def test_invalid_text_type(session, value):
+def test_invalid_text_type(session, inline, value):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -64,7 +63,7 @@ def test_invalid_text_type(session, value):
     assert_error(response, "invalid argument")
 
 
-def test_stale_element(session):
+def test_stale_element(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/user_prompts.py
index 621bdffa664..c1046840fa4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def element_send_keys(session, element, text):
@@ -15,7 +14,7 @@ def element_send_keys(session, element, text):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -33,7 +32,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
@@ -51,7 +50,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input type=text>")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
index 484a247cffd..d3f197e41b5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
@@ -3,7 +3,6 @@ import os
 from six import text_type
 
 from tests.support.asserts import assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def execute_async_script(session, script, args=None):
@@ -35,7 +34,7 @@ def test_array(session):
     assert_success(response, [1, 2])
 
 
-def test_file_list(session, tmpdir):
+def test_file_list(session, tmpdir, inline):
     files = [tmpdir.join("foo.txt"), tmpdir.join("bar.txt")]
 
     session.url = inline("<input type=file multiple>")
@@ -58,7 +57,7 @@ def test_file_list(session, tmpdir):
         assert os.path.basename(str(expected)) == actual["name"]
 
 
-def test_html_all_collection(session):
+def test_html_all_collection(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -86,7 +85,7 @@ def test_html_all_collection(session):
     assert_same_element(session, ps[1], value[5])
 
 
-def test_html_collection(session):
+def test_html_collection(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -104,7 +103,7 @@ def test_html_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_html_form_controls_collection(session):
+def test_html_form_controls_collection(session, inline):
     session.url = inline("""
         <form>
             <input>
@@ -124,7 +123,7 @@ def test_html_form_controls_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_html_options_collection(session):
+def test_html_options_collection(session, inline):
     session.url = inline("""
         <select>
             <option>
@@ -144,7 +143,7 @@ def test_html_options_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_node_list(session):
+def test_node_list(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/properties.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/properties.py
index 394ae3294cd..e51b3e3ea57 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/properties.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/properties.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def execute_async_script(session, script, args=None):
@@ -11,7 +10,7 @@ def execute_async_script(session, script, args=None):
         body)
 
 
-def test_content_attribute(session):
+def test_content_attribute(session, inline):
     session.url = inline("<input value=foobar>")
     response = execute_async_script(session, """
         const resolve = arguments[0];
@@ -21,7 +20,7 @@ def test_content_attribute(session):
     assert_success(response, "foobar")
 
 
-def test_idl_attribute(session):
+def test_idl_attribute(session, inline):
     session.url = inline("""
         <input>
         <script>
@@ -37,7 +36,7 @@ def test_idl_attribute(session):
     assert_success(response, "foobar")
 
 
-def test_idl_attribute_element(session):
+def test_idl_attribute_element(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -59,7 +58,7 @@ def test_idl_attribute_element(session):
     assert_same_element(session, bar, value)
 
 
-def test_script_defining_property(session):
+def test_script_defining_property(session, inline):
     session.url = inline("<input>")
     session.execute_script("""
         const input = document.querySelector("input");
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
index be0b3a018c5..cce32b64155 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
@@ -3,7 +3,6 @@ import os
 from six import text_type
 
 from tests.support.asserts import assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def execute_script(session, script, args=None):
@@ -31,7 +30,7 @@ def test_array(session):
     assert_success(response, [1, 2])
 
 
-def test_file_list(session, tmpdir):
+def test_file_list(session, tmpdir, inline):
     files = [tmpdir.join("foo.txt"), tmpdir.join("bar.txt")]
 
     session.url = inline("<input type=file multiple>")
@@ -51,7 +50,7 @@ def test_file_list(session, tmpdir):
         assert os.path.basename(str(expected)) == actual["name"]
 
 
-def test_html_all_collection(session):
+def test_html_all_collection(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -76,7 +75,7 @@ def test_html_all_collection(session):
     assert_same_element(session, ps[1], value[5])
 
 
-def test_html_collection(session):
+def test_html_collection(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -91,7 +90,7 @@ def test_html_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_html_form_controls_collection(session):
+def test_html_form_controls_collection(session, inline):
     session.url = inline("""
         <form>
             <input>
@@ -108,7 +107,7 @@ def test_html_form_controls_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_html_options_collection(session):
+def test_html_options_collection(session, inline):
     session.url = inline("""
         <select>
             <option>
@@ -125,7 +124,7 @@ def test_html_options_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_node_list(session):
+def test_node_list(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
index 16bdcdd1dea..e3094f89f3b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def execute_script(session, script, args=None):
@@ -49,7 +48,7 @@ def test_object_in_array(session):
     assert_error(response, "javascript error")
 
 
-def test_element_in_collection(session):
+def test_element_in_collection(session, inline):
     session.url = inline("<div></div>")
     divs = session.find.css("div")
 
@@ -63,7 +62,7 @@ def test_element_in_collection(session):
         assert_same_element(session, expected, actual)
 
 
-def test_element_in_object(session):
+def test_element_in_object(session, inline):
     session.url = inline("<div></div>")
     div = session.find.css("div", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
index bd719b27859..1d1511be376 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
@@ -34,7 +33,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_opening_new_window_keeps_current_window_handle(session):
+def test_opening_new_window_keeps_current_window_handle(session, inline):
     original_handle = session.window_handle
     original_handles = session.handles
 
@@ -57,7 +56,7 @@ def test_ending_comment(session):
     assert_success(response, 1)
 
 
-def test_override_listeners(session):
+def test_override_listeners(session, inline):
     session.url = inline("""
 <script>
 called = [];
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/properties.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/properties.py
index 2be4f1f3ccc..51999936e71 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/properties.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/properties.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def execute_script(session, script, args=None):
@@ -11,7 +10,7 @@ def execute_script(session, script, args=None):
         body)
 
 
-def test_content_attribute(session):
+def test_content_attribute(session, inline):
     session.url = inline("<input value=foobar>")
     response = execute_script(session, """
         const input = document.querySelector("input");
@@ -20,7 +19,7 @@ def test_content_attribute(session):
     assert_success(response, "foobar")
 
 
-def test_idl_attribute(session):
+def test_idl_attribute(session, inline):
     session.url = inline("""
         <input>
         <script>
@@ -35,7 +34,7 @@ def test_idl_attribute(session):
     assert_success(response, "foobar")
 
 
-def test_idl_attribute_element(session):
+def test_idl_attribute_element(session, inline):
     session.url = inline("""
         <p>foo
         <p>bar
@@ -56,7 +55,7 @@ def test_idl_attribute_element(session):
     assert_same_element(session, bar, value)
 
 
-def test_script_defining_property(session):
+def test_script_defining_property(session, inline):
     session.url = inline("<input>")
     execute_script(session, """
         const input = document.querySelector("input");
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
index 9f0911d56dc..4510617da5a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def find_element(session, using, value):
@@ -48,7 +47,7 @@ def test_invalid_selector_argument(session, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//a")])
-def test_find_element(session, using, value):
+def test_find_element(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<a href=# id=linkText>full link text</a>")
 
@@ -64,7 +63,7 @@ def test_find_element(session, using, value):
     ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
     ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
 ])
-def test_find_element_link_text(session, document, value):
+def test_find_element_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline(document)
 
@@ -81,7 +80,7 @@ def test_find_element_link_text(session, document, value):
     ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
     ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
 ])
-def test_find_element_partial_link_text(session, document, value):
+def test_find_element_partial_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline(document)
 
@@ -102,7 +101,7 @@ def test_no_element(session, using, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//*[name()='a']")])
-def test_xhtml_namespace(session, using, value):
+def test_xhtml_namespace(session, inline, using, value):
     session.url = inline("""<a href="#" id="linkText">full link text</a>""",
                          doctype="xhtml")
     expected = session.execute_script("return document.links[0]")
@@ -116,7 +115,7 @@ def test_xhtml_namespace(session, using, value):
                          [("css selector", ":root"),
                           ("tag name", "html"),
                           ("xpath", "/html")])
-def test_htmldocument(session, using, value):
+def test_htmldocument(session, inline, using, value):
     session.url = inline("")
     response = find_element(session, using, value)
     assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element/user_prompts.py
index 613466b62b5..ada8e8ebee3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_element/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element/user_prompts.py
@@ -8,7 +8,6 @@ from tests.support.asserts import (
     assert_success,
     assert_dialog_handled,
 )
-from tests.support.inline import inline
 
 
 def find_element(session, using, value):
@@ -18,7 +17,7 @@ def find_element(session, using, value):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<p>bar</p>")
         element = session.find.css("p", all=False)
@@ -36,7 +35,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<p>bar</p>")
 
@@ -51,7 +50,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<p>bar</p>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
index aa648117976..879de3713f9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def find_element(session, element_id, using, value):
@@ -14,7 +13,7 @@ def find_element(session, element_id, using, value):
         {"using": using, "value": value})
 
 
-def test_null_parameter_value(session, http):
+def test_null_parameter_value(session, http, inline):
     session.url = inline("<div><a href=# id=linkText>full link text</a></div>")
     element = session.find.css("div", all=False)
 
@@ -54,7 +53,7 @@ def test_invalid_selector_argument(session, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//a")])
-def test_find_element(session, using, value):
+def test_find_element(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<div><a href=# id=linkText>full link text</a></div>")
     element = session.find.css("div", all=False)
@@ -70,7 +69,7 @@ def test_find_element(session, using, value):
     ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
     ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
 ])
-def test_find_element_link_text(session, document, value):
+def test_find_element_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<div>{0}</div>".format(document))
     element = session.find.css("div", all=False)
@@ -88,7 +87,7 @@ def test_find_element_link_text(session, document, value):
     ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
     ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
 ])
-def test_find_element_partial_link_text(session, document, value):
+def test_find_element_partial_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<div>{0}</div>".format(document))
     element = session.find.css("div", all=False)
@@ -98,7 +97,7 @@ def test_find_element_partial_link_text(session, document, value):
 
 
 @pytest.mark.parametrize("using,value", [("css selector", "#wontExist")])
-def test_no_element(session, using, value):
+def test_no_element(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<div></div>")
     element = session.find.css("div", all=False)
@@ -112,7 +111,7 @@ def test_no_element(session, using, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//*[name()='a']")])
-def test_xhtml_namespace(session, using, value):
+def test_xhtml_namespace(session, inline, using, value):
     session.url = inline("""<p><a href="#" id="linkText">full link text</a></p>""",
                          doctype="xhtml")
     from_element = session.execute_script("""return document.querySelector("p")""")
@@ -123,7 +122,7 @@ def test_xhtml_namespace(session, using, value):
     assert_same_element(session, value, expected)
 
 
-def test_parent_htmldocument(session):
+def test_parent_htmldocument(session, inline):
     session.url = inline("")
     from_element = session.execute_script("""return document.querySelector("body")""")
     expected = session.execute_script("return document.documentElement")
@@ -133,7 +132,7 @@ def test_parent_htmldocument(session):
     assert_same_element(session, value, expected)
 
 
-def test_parent_of_document_node_errors(session):
+def test_parent_of_document_node_errors(session, inline):
     session.url = inline("")
     from_element = session.execute_script("return document.documentElement")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/user_prompts.py
index 3fdaf4e47ed..0537a786189 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/user_prompts.py
@@ -8,7 +8,6 @@ from tests.support.asserts import (
     assert_success,
     assert_dialog_handled,
 )
-from tests.support.inline import inline
 
 
 def find_element(session, element_id, using, value):
@@ -20,7 +19,7 @@ def find_element(session, element_id, using, value):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
@@ -39,7 +38,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
@@ -55,7 +54,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
index c1381a0e82a..47f00973938 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def find_elements(session, using, value):
@@ -48,7 +47,7 @@ def test_invalid_selector_argument(session, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//a")])
-def test_find_elements(session, using, value):
+def test_find_elements(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<a href=# id=linkText>full link text</a>")
 
@@ -65,7 +64,7 @@ def test_find_elements(session, using, value):
     ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
     ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
 ])
-def test_find_elements_link_text(session, document, value):
+def test_find_elements_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<a href=#>not wanted</a><br/>{0}".format(document))
     expected = session.execute_script("return document.links[1];")
@@ -88,7 +87,7 @@ def test_find_elements_link_text(session, document, value):
     ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
     ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
 ])
-def test_find_elements_partial_link_text(session, document, value):
+def test_find_elements_partial_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<a href=#>not wanted</a><br/>{0}".format(document))
     expected = session.execute_script("return document.links[1];")
@@ -116,7 +115,7 @@ def test_no_element(session, using, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//*[name()='a']")])
-def test_xhtml_namespace(session, using, value):
+def test_xhtml_namespace(session, inline, using, value):
     session.url = inline("""<a href="#" id="linkText">full link text</a>""",
                          doctype="xhtml")
     expected = session.execute_script("return document.links[0];")
@@ -134,7 +133,7 @@ def test_xhtml_namespace(session, using, value):
                          [("css selector", ":root"),
                           ("tag name", "html"),
                           ("xpath", "/html")])
-def test_htmldocument(session, using, value):
+def test_htmldocument(session, inline, using, value):
     session.url = inline("")
     response = find_elements(session, using, value)
     value = assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/user_prompts.py
index 01eb8ff3c86..f9a45e52751 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_elements/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/user_prompts.py
@@ -8,7 +8,6 @@ from tests.support.asserts import (
     assert_success,
     assert_dialog_handled,
 )
-from tests.support.inline import inline
 
 
 def find_elements(session, using, value):
@@ -18,7 +17,7 @@ def find_elements(session, using, value):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<p>bar</p>")
         element = session.find.css("p", all=False)
@@ -38,7 +37,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<p>bar</p>")
 
@@ -53,7 +52,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<p>bar</p>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
index 5c267ba6479..ae6f976e9f9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline
 
 
 def find_elements(session, element_id, using, value):
@@ -14,7 +13,7 @@ def find_elements(session, element_id, using, value):
         {"using": using, "value": value})
 
 
-def test_null_parameter_value(session, http):
+def test_null_parameter_value(session, http, inline):
     session.url = inline("<div><a href=# id=linkText>full link text</a></div>")
     element = session.find.css("div", all=False)
 
@@ -54,7 +53,7 @@ def test_invalid_selector_argument(session, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//a")])
-def test_find_elements(session, using, value):
+def test_find_elements(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<div><a href=# id=linkText>full link text</a></div>")
     element = session.find.css("div", all=False)
@@ -70,7 +69,7 @@ def test_find_elements(session, using, value):
     ("<a href=#>LINK TEXT</a>", "LINK TEXT"),
     ("<a href=# style='text-transform: uppercase'>link text</a>", "LINK TEXT"),
 ])
-def test_find_elements_link_text(session, document, value):
+def test_find_elements_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<div><a href=#>not wanted</a><br/>{0}</div>".format(document))
     element = session.find.css("div", all=False)
@@ -94,7 +93,7 @@ def test_find_elements_link_text(session, document, value):
     ("<a href=#>PARTIAL LINK TEXT</a>", "LINK"),
     ("<a href=# style='text-transform: uppercase'>partial link text</a>", "LINK"),
 ])
-def test_find_elements_partial_link_text(session, document, value):
+def test_find_elements_partial_link_text(session, inline, document, value):
     # Step 8 - 9
     session.url = inline("<div><a href=#>not wanted</a><br/>{0}</div>".format(document))
     element = session.find.css("div", all=False)
@@ -110,7 +109,7 @@ def test_find_elements_partial_link_text(session, document, value):
 
 
 @pytest.mark.parametrize("using,value", [("css selector", "#wontExist")])
-def test_no_element(session, using, value):
+def test_no_element(session, inline, using, value):
     # Step 8 - 9
     session.url = inline("<div></div>")
     element = session.find.css("div", all=False)
@@ -124,7 +123,7 @@ def test_no_element(session, using, value):
                           ("partial link text", "link text"),
                           ("tag name", "a"),
                           ("xpath", "//*[name()='a']")])
-def test_xhtml_namespace(session, using, value):
+def test_xhtml_namespace(session, inline, using, value):
     session.url = inline("""<p><a href="#" id="linkText">full link text</a></p>""",
                          doctype="xhtml")
     from_element = session.execute_script("""return document.querySelector("p")""")
@@ -139,7 +138,7 @@ def test_xhtml_namespace(session, using, value):
     assert_same_element(session, found_element, expected)
 
 
-def test_parent_htmldocument(session):
+def test_parent_htmldocument(session, inline):
     session.url = inline("")
     from_element = session.execute_script("""return document.querySelector("body")""")
     expected = session.execute_script("return document.documentElement")
@@ -153,7 +152,7 @@ def test_parent_htmldocument(session):
     assert_same_element(session, found_element, expected)
 
 
-def test_parent_of_document_node_errors(session):
+def test_parent_of_document_node_errors(session, inline):
     session.url = inline("")
     from_element = session.execute_script("return document.documentElement")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/user_prompts.py
index ca7bc7735d0..467bec09a1b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/user_prompts.py
@@ -8,7 +8,6 @@ from tests.support.asserts import (
     assert_success,
     assert_dialog_handled,
 )
-from tests.support.inline import inline
 
 
 def find_elements(session, element_id, using, value):
@@ -20,7 +19,7 @@ def find_elements(session, element_id, using, value):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
@@ -41,7 +40,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
@@ -57,7 +56,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<div><p>bar</p><div>")
         outer_element = session.find.css("div", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/forward/forward.py b/tests/wpt/web-platform-tests/webdriver/tests/forward/forward.py
index d71bbd11021..d77ad2c61b5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/forward/forward.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/forward/forward.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def forward(session):
@@ -7,7 +6,7 @@ def forward(session):
         "POST", "session/{session_id}/forward".format(**vars(session)))
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<div>")
     session.url = inline("<p>")
     session.back()
@@ -27,7 +26,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_success(response)
 
 
-def test_no_browsing_history(session):
+def test_no_browsing_history(session, inline):
     url = inline("<div id=foo>")
 
     session.url = url
@@ -40,7 +39,7 @@ def test_no_browsing_history(session):
     assert element.property("id") == "foo"
 
 
-def test_data_urls(session):
+def test_data_urls(session, inline):
     test_pages = [
         inline("<p id=1>"),
         inline("<p id=2>"),
@@ -57,7 +56,7 @@ def test_data_urls(session):
     assert session.url == test_pages[1]
 
 
-def test_dismissed_beforeunload(session):
+def test_dismissed_beforeunload(session, inline):
     url_beforeunload = inline("""
       <input type="text">
       <script>
@@ -105,7 +104,7 @@ def test_fragments(session, url):
     assert session.url == test_pages[2]
 
 
-def test_history_pushstate(session, url):
+def test_history_pushstate(session, inline):
     pushstate_page = inline("""
       <script>
         function pushState() {
@@ -132,7 +131,7 @@ def test_history_pushstate(session, url):
     assert session.execute_script("return history.state;") == {"foo": "bar"}
 
 
-def test_removed_iframe(session, url):
+def test_removed_iframe(session, url, inline):
     page = inline("<p>foo")
 
     session.url = url("/webdriver/tests/support/html/frames_no_bfcache.html")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/forward/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/forward/user_prompts.py
index e5eea8f4457..3eeaf6e71cd 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/forward/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/forward/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def forward(session):
@@ -12,7 +11,7 @@ def forward(session):
 
 
 @pytest.fixture
-def pages(session):
+def pages(session, inline):
     pages = [
         inline("<p id=1>"),
         inline("<p id=2>"),
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py
index 7f821f3a40d..1085ad82f18 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_is_active_element, assert_success
-from tests.support.inline import inline
 
 
 def read_global(session, name):
@@ -21,7 +20,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_success_document(session):
+def test_success_document(session, inline):
     session.url = inline("""
         <body>
             <h1>Heading</h1>
@@ -36,7 +35,7 @@ def test_success_document(session):
     assert_is_active_element(session, element)
 
 
-def test_sucess_input(session):
+def test_sucess_input(session, inline):
     session.url = inline("""
         <body>
             <h1>Heading</h1>
@@ -50,7 +49,7 @@ def test_sucess_input(session):
     assert_is_active_element(session, element)
 
 
-def test_sucess_input_non_interactable(session):
+def test_sucess_input_non_interactable(session, inline):
     session.url = inline("""
         <body>
             <h1>Heading</h1>
@@ -64,7 +63,7 @@ def test_sucess_input_non_interactable(session):
     assert_is_active_element(session, element)
 
 
-def test_success_explicit_focus(session):
+def test_success_explicit_focus(session, inline):
     session.url = inline("""
         <body>
             <h1>Heading</h1>
@@ -105,7 +104,7 @@ def test_success_explicit_focus(session):
     assert_is_active_element(session, element)
 
 
-def test_success_iframe_content(session):
+def test_success_iframe_content(session, inline):
     session.url = inline("<body></body>")
     session.execute_script("""
         let iframe = document.createElement('iframe');
@@ -120,7 +119,7 @@ def test_success_iframe_content(session):
     assert_is_active_element(session, element)
 
 
-def test_missing_document_element(session):
+def test_missing_document_element(session, inline):
     session.url = inline("<body></body>")
     session.execute_script("""
         if (document.body.remove) {
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/user_prompts.py
index 7fa7be1dde9..1ff77697b70 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/user_prompts.py
@@ -8,7 +8,6 @@ from tests.support.asserts import (
     assert_is_active_element,
     assert_success
 )
-from tests.support.inline import inline
 
 
 def get_active_element(session):
@@ -17,7 +16,7 @@ def get_active_element(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
 
@@ -34,7 +33,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input type=text>")
 
@@ -49,7 +48,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input type=text>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
index b64678653e0..abf23c570b8 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
@@ -3,7 +3,6 @@ from six import text_type
 from webdriver.error import NoSuchAlertException
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
@@ -27,7 +26,7 @@ def test_no_user_prompt(session):
     assert_error(response, "no such alert")
 
 
-def test_get_alert_text(session):
+def test_get_alert_text(session, inline):
     session.url = inline("<script>window.alert('Hello');</script>")
     response = get_alert_text(session)
     assert_success(response)
@@ -38,7 +37,7 @@ def test_get_alert_text(session):
     assert alert_text == "Hello"
 
 
-def test_get_confirm_text(session):
+def test_get_confirm_text(session, inline):
     session.url = inline("<script>window.confirm('Hello');</script>")
     response = get_alert_text(session)
     assert_success(response)
@@ -49,7 +48,7 @@ def test_get_confirm_text(session):
     assert confirm_text == "Hello"
 
 
-def test_get_prompt_text(session):
+def test_get_prompt_text(session, inline):
     session.url = inline("<script>window.prompt('Enter Your Name: ', 'Federer');</script>")
     response = get_alert_text(session)
     assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
index 0383a8aba9e..fa2ff6a6595 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
@@ -1,11 +1,13 @@
+import pytest
 from six import text_type
 
 from tests.support import platform_name
-from tests.support.inline import inline
 from tests.support.asserts import assert_error, assert_success
 
-doc = inline("<p>frame")
-alert_doc = inline("<script>window.alert()</script>")
+
+@pytest.fixture
+def doc(inline):
+    return inline("<p>frame")
 
 
 def get_current_url(session):
@@ -18,14 +20,14 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, doc):
     session.url = doc
 
     response = get_current_url(session)
     assert_success(response, doc)
 
 
-def test_get_current_url_matches_location(session):
+def test_get_current_url_matches_location(session, doc):
     session.url = doc
 
     response = get_current_url(session)
@@ -76,7 +78,7 @@ def test_set_malformed_url(session):
     assert_error(response, "invalid argument")
 
 
-def test_get_current_url_after_modified_location(session):
+def test_get_current_url_after_modified_location(session, doc):
     session.url = doc
 
     response = get_current_url(session)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
index 944e61b583f..80a960ce8a1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_success
-from tests.support.inline import iframe, inline
 
 
 """
@@ -15,9 +14,20 @@ also enforce process isolation based on site origin.
 This is known to sometimes cause problems for WebDriver implementations.
 """
 
-frame_doc = inline("<p>frame")
-one_frame_doc = inline("<iframe src='%s'></iframe>" % frame_doc)
-nested_frames_doc = inline("<iframe src='%s'></iframe>" % one_frame_doc)
+
+@pytest.fixture
+def frame_doc(inline):
+    return inline("<p>frame")
+
+
+@pytest.fixture
+def one_frame_doc(inline, frame_doc):
+    return inline("<iframe src='%s'></iframe>" % frame_doc)
+
+
+@pytest.fixture
+def nested_frames_doc(inline, one_frame_doc):
+    return inline("<iframe src='%s'></iframe>" % one_frame_doc)
 
 
 def get_current_url(session):
@@ -25,7 +35,7 @@ def get_current_url(session):
         "GET", "session/{session_id}/url".format(**vars(session)))
 
 
-def test_iframe(session):
+def test_iframe(session, one_frame_doc):
     top_level_doc = one_frame_doc
     session.url = top_level_doc
 
@@ -37,7 +47,7 @@ def test_iframe(session):
     assert_success(response, top_level_doc)
 
 
-def test_nested_iframe(session):
+def test_nested_iframe(session, nested_frames_doc):
     session.url = nested_frames_doc
     top_level_doc = session.url
 
@@ -53,7 +63,7 @@ def test_nested_iframe(session):
 
 
 @pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
-def test_origin(session, domain, url):
+def test_origin(session, inline, iframe, domain):
     top_level_doc = inline(iframe("<p>frame", domain=domain))
 
     session.url = top_level_doc
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py
index f0e95d12f14..d657c188241 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_current_url(session):
@@ -11,7 +10,7 @@ def get_current_url(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<p id=1>")
         expected_url = session.url
@@ -27,7 +26,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<p id=1>")
 
@@ -42,7 +41,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<p id=1>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
index f67a6c3d7c0..661dccd39b1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_element_attribute(session, element, attr):
@@ -34,7 +33,7 @@ def test_element_not_found(session):
     assert_error(result, "no such element")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input id=foo>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -42,7 +41,7 @@ def test_element_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_normal(session):
+def test_normal(session, inline):
     # 13.2 Step 5
     session.url = inline("<input type=checkbox>")
     element = session.find.css("input", all=False)
@@ -79,7 +78,7 @@ def test_normal(session):
     ("track", ["default"]),
     ("video", ["autoplay", "controls", "loop", "muted"])
 ])
-def test_boolean_attribute(session, tag, attrs):
+def test_boolean_attribute(session, inline, tag, attrs):
     for attr in attrs:
         session.url = inline("<{0} {1}>".format(tag, attr))
         element = session.find.css(tag, all=False)
@@ -87,7 +86,7 @@ def test_boolean_attribute(session, tag, attrs):
         assert_success(result, "true")
 
 
-def test_global_boolean_attributes(session):
+def test_global_boolean_attributes(session, inline):
     session.url = inline("<p hidden>foo")
     element = session.find.css("p", all=False)
     result = get_element_attribute(session, element.id, "hidden")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/user_prompts.py
index 5ee7929afdf..009cb1e5fa1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_element_attribute(session, element, attr):
@@ -15,7 +14,7 @@ def get_element_attribute(session, element, attr):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -31,7 +30,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -47,7 +46,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
index 25fae26a69c..369ca9c699f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_element_css_value(session, element_id, prop):
@@ -24,6 +23,7 @@ def test_no_top_browsing_context(session, closed_window):
     response = get_element_css_value(session, element.id, "display")
     assert_error(response, "no such element")
 
+
 def test_no_browsing_context(session, closed_frame):
     response = get_element_css_value(session, "foo", "bar")
     assert_error(response, "no such window")
@@ -34,7 +34,7 @@ def test_element_not_found(session):
     assert_error(result, "no such element")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -43,7 +43,7 @@ def test_element_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_property_name_value(session):
+def test_property_name_value(session, inline):
     session.url = inline("""<input style="display: block">""")
     element = session.find.css("input", all=False)
 
@@ -51,7 +51,7 @@ def test_property_name_value(session):
     assert_success(result, "block")
 
 
-def test_property_name_not_existent(session):
+def test_property_name_not_existent(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/user_prompts.py
index 529b6ae9183..b1f9a3fb0a0 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_element_css_value(session, element_id, prop):
@@ -18,7 +17,7 @@ def get_element_css_value(session, element_id, prop):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("""<input style="display: block">""")
         element = session.find.css("input", all=False)
@@ -34,7 +33,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("""<input style="display: block">""")
         element = session.find.css("input", all=False)
@@ -50,7 +49,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("""<input style="display: block">""")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
index 27b4bea5f17..ea3db1e406b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_element_property(session, element_id, prop):
@@ -34,7 +33,7 @@ def test_element_not_found(session):
     assert_error(response, "no such element")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input id=foobar>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -43,7 +42,7 @@ def test_element_stale(session):
     assert_error(response, "stale element reference")
 
 
-def test_property_non_existent(session):
+def test_property_non_existent(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -52,7 +51,7 @@ def test_property_non_existent(session):
     assert session.execute_script("return arguments[0].foo", args=(element,)) is None
 
 
-def test_content_attribute(session):
+def test_content_attribute(session, inline):
     session.url = inline("<input value=foobar>")
     element = session.find.css("input", all=False)
 
@@ -60,7 +59,7 @@ def test_content_attribute(session):
     assert_success(response, "foobar")
 
 
-def test_idl_attribute(session):
+def test_idl_attribute(session, inline):
     session.url = inline("<input value=foo>")
     element = session.find.css("input", all=False)
     session.execute_script("""arguments[0].value = "bar";""", args=(element,))
@@ -77,7 +76,7 @@ def test_idl_attribute(session):
     ("null", None),
     ("undefined", None),
 ])
-def test_primitives(session, js_primitive, py_primitive):
+def test_primitives(session, inline, js_primitive, py_primitive):
     session.url = inline("""
         <input>
 
@@ -100,7 +99,7 @@ def test_primitives(session, js_primitive, py_primitive):
     ("null", None),
     ("undefined", None),
 ])
-def test_primitives_set_by_execute_script(session, js_primitive, py_primitive):
+def test_primitives_set_by_execute_script(session, inline, js_primitive, py_primitive):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     session.execute_script("arguments[0].foobar = {}".format(js_primitive), args=(element,))
@@ -109,7 +108,7 @@ def test_primitives_set_by_execute_script(session, js_primitive, py_primitive):
     assert_success(response, py_primitive)
 
 
-def test_mutated_element(session):
+def test_mutated_element(session, inline):
     session.url = inline("<input type=checkbox>")
     element = session.find.css("input", all=False)
     element.click()
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py
index 16a098536fd..e5e76947863 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_element_property(session, element_id, name):
@@ -13,7 +12,7 @@ def get_element_property(session, element_id, name):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -29,7 +28,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -45,7 +44,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
index d461c01c312..9ab4db4c604 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
@@ -1,6 +1,5 @@
 from tests.support.asserts import assert_error, assert_success
 from tests.support.helpers import element_rect
-from tests.support.inline import inline
 
 
 def get_element_rect(session, element_id):
@@ -35,7 +34,7 @@ def test_element_not_found(session):
     assert_error(result, "no such element")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -44,7 +43,7 @@ def test_element_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_basic(session):
+def test_basic(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/user_prompts.py
index c51866cb875..20131603381 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/user_prompts.py
@@ -4,7 +4,6 @@ import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
 from tests.support.helpers import element_rect
-from tests.support.inline import inline
 
 
 def get_element_rect(session, element_id):
@@ -18,7 +17,7 @@ def get_element_rect(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input>")
         element = session.find.css("input", all=False)
@@ -34,7 +33,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input>")
         element = session.find.css("input", all=False)
@@ -50,7 +49,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input>")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
index 4ca818f76a5..cfc63bd788d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_element_tag_name(session, element_id):
@@ -31,7 +30,7 @@ def test_element_not_found(session):
     assert_error(result, "no such element")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input id=foo>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -40,7 +39,7 @@ def test_element_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_get_element_tag_name(session):
+def test_get_element_tag_name(session, inline):
     session.url = inline("<input id=foo>")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py
index 12a7d448421..89697d0ad6a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_element_tag_name(session, element_id):
@@ -12,7 +11,7 @@ def get_element_tag_name(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -28,7 +27,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
@@ -44,7 +43,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input id=foo>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
index 642bc1d2c62..72dc0cf735e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_element_text(session, element_id):
@@ -26,14 +25,14 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_getting_text_of_a_non_existant_element_is_an_error(session):
+def test_getting_text_of_a_non_existant_element_is_an_error(session, inline):
     session.url = inline("""<body>Hello world</body>""")
 
     result = get_element_text(session, "foo")
     assert_error(result, "no such element")
 
 
-def test_read_element_text(session):
+def test_read_element_text(session, inline):
     session.url = inline("Before f<span id='id'>oo</span> after")
     element = session.find.css("#id", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/user_prompts.py
index 1ee5cde4da5..9f0bb386cdf 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_element_text(session, element_id):
@@ -14,7 +13,7 @@ def get_element_text(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<p id=foo>bar</p>")
         element = session.find.css("#foo", all=False)
@@ -30,7 +29,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<p id=foo>bar</p>")
         element = session.find.css("#foo", all=False)
@@ -46,7 +45,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<p id=foo>bar</p>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py
index 102c18f0275..ccc355a1953 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py
@@ -6,7 +6,6 @@ from six import integer_types, text_type
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.helpers import clear_all_cookies
-from tests.support.inline import inline
 
 
 def get_named_cookie(session, name):
@@ -87,7 +86,7 @@ def test_get_named_cookie(session, url):
         cookie["expiry"]).strftime(utc_string_format) == a_day_from_now
 
 
-def test_duplicated_cookie(session, url, server_config):
+def test_duplicated_cookie(session, url, server_config, inline):
     new_cookie = {
         "name": "hello",
         "value": "world",
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/source.py b/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/source.py
index 5484ccbf2ee..cc4e208835c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/source.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/source.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_page_source(session):
@@ -17,7 +16,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_source_matches_outer_html(session):
+def test_source_matches_outer_html(session, inline):
     session.url = inline("<html><head><title>Cheese</title><body>Peas")
 
     expected = session.execute_script("return document.documentElement.outerHTML")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/user_prompts.py
index 3b0cdff97dd..13cb31595e6 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_page_source/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def get_page_source(session):
@@ -12,7 +11,7 @@ def get_page_source(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<div/>")
         expected = session.execute_script("return document.documentElement.outerHTML")
@@ -28,7 +27,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<div/>")
 
@@ -43,7 +42,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<div/>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
index 34405774ba0..a173094839a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
@@ -1,7 +1,6 @@
 from six import text_type
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_title(session):
@@ -22,28 +21,28 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, inline):
     session.url = inline("<title>Foo</title>")
 
     response = get_title(session)
     assert_success(response, "Foo")
 
 
-def test_with_duplicated_title(session):
+def test_with_duplicated_title(session, inline):
     session.url = inline("<title>First</title><title>Second</title>")
 
     result = get_title(session)
     assert_success(result, "First")
 
 
-def test_without_title(session):
+def test_without_title(session, inline):
     session.url = inline("<h2>Hello</h2>")
 
     result = get_title(session)
     assert_success(result, "")
 
 
-def test_after_modification(session):
+def test_after_modification(session, inline):
     session.url = inline("<title>Initial</title><h2>Hello</h2>")
     session.execute_script("document.title = 'Updated'")
 
@@ -51,7 +50,7 @@ def test_after_modification(session):
     assert_success(result, "Updated")
 
 
-def test_strip_and_collapse(session):
+def test_strip_and_collapse(session, inline):
     document = "<title>   a b\tc\nd\t \n e\t\n </title><h2>Hello</h2>"
     session.url = inline(document)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
index 5991bf35906..9c5ab0b595d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_success
-from tests.support.inline import iframe, inline
 
 
 """
@@ -15,9 +14,20 @@ also enforce process isolation based on site origin.
 This is known to sometimes cause problems for WebDriver implementations.
 """
 
-frame_doc = inline("<title>cheese</title><p>frame")
-one_frame_doc = inline("<title>bar</title><iframe src='%s'></iframe>" % frame_doc)
-nested_frames_doc = inline("<title>foo</title><iframe src='%s'></iframe>" % one_frame_doc)
+
+@pytest.fixture
+def frame_doc(inline):
+    return inline("<title>cheese</title><p>frame")
+
+
+@pytest.fixture
+def one_frame_doc(inline, frame_doc):
+    return inline("<title>bar</title><iframe src='%s'></iframe>" % frame_doc)
+
+
+@pytest.fixture
+def nested_frames_doc(inline, one_frame_doc):
+    return inline("<title>foo</title><iframe src='%s'></iframe>" % one_frame_doc)
 
 
 def get_title(session):
@@ -25,14 +35,14 @@ def get_title(session):
         "GET", "session/{session_id}/title".format(**vars(session)))
 
 
-def test_no_iframe(session):
+def test_no_iframe(session, inline):
     session.url = inline("<title>Foobar</title><h2>Hello</h2>")
 
     result = get_title(session)
     assert_success(result, "Foobar")
 
 
-def test_iframe(session):
+def test_iframe(session, one_frame_doc):
     session.url = one_frame_doc
 
     frame = session.find.css("iframe", all=False)
@@ -43,7 +53,7 @@ def test_iframe(session):
     assert_success(response, "bar")
 
 
-def test_nested_iframe(session):
+def test_nested_iframe(session, nested_frames_doc):
     session.url = nested_frames_doc
 
     outer_frame = session.find.css("iframe", all=False)
@@ -58,7 +68,7 @@ def test_nested_iframe(session):
 
 
 @pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
-def test_origin(session, domain, url):
+def test_origin(session, inline, iframe, domain):
     session.url = inline("<title>foo</title>{}".format(
         iframe("<title>bar</title><p>frame", domain=domain)))
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py
index 76d65c088a0..0fd51e46f32 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 
 
 def get_title(session):
@@ -12,7 +11,7 @@ def get_title(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<title>Foo</title>")
         expected_title = session.title
@@ -28,7 +27,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<title>Foo</title>")
 
@@ -43,7 +42,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<title>Foo</title>")
 
@@ -117,7 +116,7 @@ def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
 # trigger the creation of a dialog at all. Therefore, this test should only be
 # run in contexts that support the dialog (a condition that may not be
 # determined automatically).
-# def test_title_with_non_simple_dialog(session):
+# def test_title_with_non_simple_dialog(session, inline):
 #    document = "<title>With non-simple dialog</title><h2>Hello</h2>"
 #    spawn = """
 #        var done = arguments[0];
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py
index 793650feef4..f7592a30e06 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py
@@ -1,8 +1,4 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
-
-
-alert_doc = inline("<script>window.alert()</script>")
 
 
 def get_window_rect(session):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
index 64058ebd577..4a5a92ba5e9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
@@ -1,7 +1,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def is_element_enabled(session, element_id):
@@ -31,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_element_stale(session):
+def test_element_stale(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -41,7 +40,7 @@ def test_element_stale(session):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_form_control_disabled(session, element):
+def test_form_control_disabled(session, inline, element):
     session.url = inline("<{} disabled/>".format(element))
     element = session.find.css(element, all=False)
 
@@ -50,7 +49,7 @@ def test_form_control_disabled(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_form_control_enabled(session, element):
+def test_form_control_enabled(session, inline, element):
     session.url = inline("<{}/>".format(element))
     element = session.find.css(element, all=False)
 
@@ -59,7 +58,7 @@ def test_form_control_enabled(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_fieldset_disabled_descendant(session, element):
+def test_fieldset_disabled_descendant(session, inline, element):
     session.url = inline("<fieldset disabled><{}/></fieldset>".format(element))
     element = session.find.css(element, all=False)
 
@@ -68,7 +67,7 @@ def test_fieldset_disabled_descendant(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_fieldset_enabled_descendant(session, element):
+def test_fieldset_enabled_descendant(session, inline, element):
     session.url = inline("<fieldset><{}/></fieldset>".format(element))
     element = session.find.css(element, all=False)
 
@@ -77,7 +76,7 @@ def test_fieldset_enabled_descendant(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_fieldset_disabled_descendant_legend(session, element):
+def test_fieldset_disabled_descendant_legend(session, inline, element):
     session.url = inline("<fieldset disabled><legend><{}/></legend></fieldset>".format(element))
     element = session.find.css(element, all=False)
 
@@ -86,7 +85,7 @@ def test_fieldset_disabled_descendant_legend(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_fieldset_enabled_descendant_legend(session, element):
+def test_fieldset_enabled_descendant_legend(session, inline, element):
     session.url = inline("<fieldset><legend><{}/></legend></fieldset>".format(element))
     element = session.find.css(element, all=False)
 
@@ -95,7 +94,7 @@ def test_fieldset_enabled_descendant_legend(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_xhtml_form_control_disabled(session, element):
+def test_xhtml_form_control_disabled(session, inline, element):
     session.url = inline("""<{} disabled="disabled"/>""".format(element),
                          doctype="xhtml")
     element = session.find.css(element, all=False)
@@ -105,7 +104,7 @@ def test_xhtml_form_control_disabled(session, element):
 
 
 @pytest.mark.parametrize("element", ["button", "input", "select", "textarea"])
-def test_xhtml_form_control_enabled(session, element):
+def test_xhtml_form_control_enabled(session, inline, element):
     session.url = inline("""<{}/>""".format(element), doctype="xhtml")
     element = session.find.css(element, all=False)
 
@@ -113,7 +112,7 @@ def test_xhtml_form_control_enabled(session, element):
     assert_success(result, True)
 
 
-def test_xml_always_not_enabled(session):
+def test_xml_always_not_enabled(session, inline):
     session.url = inline("""<note></note>""", doctype="xml")
     element = session.find.css("note", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/user_prompts.py
index bd8bc81bdfc..5dd7d582bd3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.inline import inline
 
 
 def is_element_enabled(session, element_id):
@@ -17,7 +16,7 @@ def is_element_enabled(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input id=foo disabled>")
         element = session.find.css("#foo", all=False)
@@ -33,7 +32,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input id=foo disabled>")
         element = session.find.css("#foo", all=False)
@@ -49,7 +48,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input id=foo disabled>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
index b09927c7a12..6c8e8155cab 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
@@ -1,12 +1,18 @@
+import pytest
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
-check_doc = inline("""
+@pytest.fixture
+def check_doc(inline):
+    return inline("""
     <input id=checked type=checkbox checked>
     <input id=notChecked type=checkbox>
     """)
-option_doc = inline("""
+
+
+@pytest.fixture
+def option_doc(inline):
+    return inline("""
     <select>
       <option id=notSelected>r-
       <option id=selected selected>r+
@@ -39,7 +45,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_error(response, "no such window")
 
 
-def test_element_stale(session):
+def test_element_stale(session, check_doc):
     session.url = check_doc
     element = session.find.css("#checked", all=False)
     session.refresh()
@@ -48,7 +54,7 @@ def test_element_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_element_checked(session):
+def test_element_checked(session, check_doc):
     session.url = check_doc
     element = session.find.css("#checked", all=False)
 
@@ -56,7 +62,7 @@ def test_element_checked(session):
     assert_success(result, True)
 
 
-def test_checkbox_not_selected(session):
+def test_checkbox_not_selected(session, check_doc):
     session.url = check_doc
     element = session.find.css("#notChecked", all=False)
 
@@ -64,7 +70,7 @@ def test_checkbox_not_selected(session):
     assert_success(result, False)
 
 
-def test_element_selected(session):
+def test_element_selected(session, option_doc):
     session.url = option_doc
     element = session.find.css("#selected", all=False)
 
@@ -72,7 +78,7 @@ def test_element_selected(session):
     assert_success(result, True)
 
 
-def test_element_not_selected(session):
+def test_element_not_selected(session, option_doc):
     session.url = option_doc
     element = session.find.css("#notSelected", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py
index 674f80c5c75..96da2c08bd7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.inline import inline
 
 
 def is_element_selected(session, element_id):
@@ -14,7 +13,7 @@ def is_element_selected(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input id=foo type=checkbox checked>")
         element = session.find.css("#foo", all=False)
@@ -31,7 +30,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input id=foo type=checkbox checked>")
         element = session.find.css("#foo", all=False)
@@ -47,7 +46,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input id=foo type=checkbox checked>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
index b577ecdf96d..c0ba49d475d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
@@ -6,7 +6,6 @@ from tests.support import platform_name
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def navigate_to(session, url):
@@ -21,7 +20,7 @@ def test_null_parameter_value(session, http):
         assert_error(Response.from_http(response), "invalid argument")
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     response = navigate_to(session, inline("<div/>"))
     value = assert_success(response)
     assert value is None
@@ -32,7 +31,7 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, inline):
     doc = inline("<p>foo")
 
     response = navigate_to(session, doc)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/user_prompts.py
index 6a94c11bf1d..682bc40f4fe 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.inline import inline
 
 
 def navigate_to(session, url):
@@ -13,7 +12,7 @@ def navigate_to(session, url):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         url = inline("<div/>")
 
@@ -30,7 +29,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         url = inline("<div/>")
 
@@ -47,7 +46,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         url = inline("<div/>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
index 9300b04c45f..270e4b51b88 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
 
 from . import opener, window_name
 
@@ -32,7 +31,7 @@ def test_keeps_current_window_handle(session):
     assert session.window_handle == original_handle
 
 
-def test_opens_about_blank_in_new_tab(session):
+def test_opens_about_blank_in_new_tab(session, inline):
     url = inline("<p>foo")
     session.url = url
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
index b34854cc2f3..d3c22450270 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
@@ -1,5 +1,4 @@
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
 
 from . import opener, window_name
 
@@ -32,7 +31,7 @@ def test_keeps_current_window_handle(session):
     assert session.window_handle == original_handle
 
 
-def test_opens_about_blank_in_new_window(session):
+def test_opens_about_blank_in_new_window(session, inline):
     url = inline("<p>foo")
     session.url = url
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
index 1cb824fc8ec..9579a57aa72 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
@@ -7,15 +7,9 @@ from webdriver.error import NoSuchWindowException
 from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
 from tests.perform_actions.support.refine import filter_dict, get_events
 from tests.support.asserts import assert_move_to_coordinates
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
-def link_doc(dest):
-    content = "<a href=\"{}\" id=\"link\">destination</a>".format(dest)
-    return inline(content)
-
-
 def test_null_response_value(session, mouse_chain):
     value = mouse_chain.click().perform()
     assert value is None
@@ -95,9 +89,9 @@ def test_click_element_center(session, test_actions_page, mouse_chain):
             assert e["target"] == "outer"
 
 
-def test_click_navigation(session, url):
+def test_click_navigation(session, url, inline):
     destination = url("/webdriver/tests/actions/support/test_actions_wdspec.html")
-    start = link_doc(destination)
+    start = inline("<a href=\"{}\" id=\"link\">destination</a>".format(destination))
 
     def click(link):
         mouse_chain = session.actions.sequence(
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_origin.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_origin.py
index 4c9dc879e99..c4e5db7a001 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_origin.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_origin.py
@@ -3,23 +3,25 @@ import pytest
 from webdriver import MoveTargetOutOfBoundsException
 
 from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
-from tests.support.inline import inline
 
 
-def origin_doc(inner_style, outer_style=""):
-    return inline("""
-      <div id="outer" style="{1}"
-           onmousemove="window.coords = {{x: event.clientX, y: event.clientY}}">
-        <div id="inner" style="{0}"></div>
-      </div>
-    """.format(inner_style, outer_style))
+@pytest.fixture
+def origin_doc(inline):
+    def origin_doc(inner_style, outer_style=""):
+        return inline("""
+          <div id="outer" style="{1}"
+               onmousemove="window.coords = {{x: event.clientX, y: event.clientY}}">
+            <div id="inner" style="{0}"></div>
+          </div>
+        """.format(inner_style, outer_style))
+    return origin_doc
 
 
 def get_click_coordinates(session):
     return session.execute_script("return window.coords;")
 
 
-def test_viewport_inside(session, mouse_chain):
+def test_viewport_inside(session, mouse_chain, origin_doc):
     point = {"x": 50, "y": 50}
 
     session.url = origin_doc("width: 100px; height: 50px; background: green;")
@@ -39,7 +41,7 @@ def test_viewport_outside(session, mouse_chain):
             .perform()
 
 
-def test_pointer_inside(session, mouse_chain):
+def test_pointer_inside(session, mouse_chain, origin_doc):
     start_point = {"x": 50, "y": 50}
     offset = {"x": 10, "y": 5}
 
@@ -61,7 +63,7 @@ def test_pointer_outside(session, mouse_chain):
             .perform()
 
 
-def test_element_center_point(session, mouse_chain):
+def test_element_center_point(session, mouse_chain, origin_doc):
     session.url = origin_doc("width: 100px; height: 50px; background: green;")
     elem = session.find.css("#inner", all=False)
     center = get_inview_center(elem.rect, get_viewport_rect(session))
@@ -75,7 +77,7 @@ def test_element_center_point(session, mouse_chain):
     assert click_coords["y"] == pytest.approx(center["y"], abs = 1.0)
 
 
-def test_element_center_point_with_offset(session, mouse_chain):
+def test_element_center_point_with_offset(session, mouse_chain, origin_doc):
     session.url = origin_doc("width: 100px; height: 50px; background: green;")
     elem = session.find.css("#inner", all=False)
     center = get_inview_center(elem.rect, get_viewport_rect(session))
@@ -89,7 +91,7 @@ def test_element_center_point_with_offset(session, mouse_chain):
     assert click_coords["y"] == pytest.approx(center["y"] + 15, abs = 1.0)
 
 
-def test_element_in_view_center_point_partly_visible(session, mouse_chain):
+def test_element_in_view_center_point_partly_visible(session, mouse_chain, origin_doc):
     session.url = origin_doc("""width: 100px; height: 50px; background: green;
                                 position: relative; left: -50px; top: -25px;""")
     elem = session.find.css("#inner", all=False)
@@ -104,7 +106,7 @@ def test_element_in_view_center_point_partly_visible(session, mouse_chain):
     assert click_coords["y"] == pytest.approx(center["y"], abs = 1.0)
 
 
-def test_element_larger_than_viewport(session, mouse_chain):
+def test_element_larger_than_viewport(session, mouse_chain, origin_doc):
     session.url = origin_doc("width: 300vw; height: 300vh; background: green;")
     elem = session.find.css("#inner", all=False)
     center = get_inview_center(elem.rect, get_viewport_rect(session))
@@ -118,7 +120,7 @@ def test_element_larger_than_viewport(session, mouse_chain):
     assert click_coords["y"] == pytest.approx(center["y"], abs = 1.0)
 
 
-def test_element_outside_of_view_port(session, mouse_chain):
+def test_element_outside_of_view_port(session, mouse_chain, origin_doc):
     session.url = origin_doc("""width: 100px; height: 50px; background: green;
                                 position: relative; left: -200px; top: -100px;""")
     elem = session.find.css("#inner", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
index 81d51be1a7e..3bf41bab849 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
@@ -1,13 +1,12 @@
 from tests.perform_actions.support.refine import filter_dict, get_events
 from tests.support.asserts import assert_move_to_coordinates
-from tests.support.inline import inline
 
 lots_of_text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor "\
                "incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "\
                "exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
 
 
-def test_tripleclick_at_coordinates(session, mouse_chain):
+def test_tripleclick_at_coordinates(session, mouse_chain, inline):
     """
         This test does a triple click on a coordinate. On desktop platforms
         this will select a paragraph. On mobile this will not have the same
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
index 341e069f7bb..e043056dd12 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
@@ -5,7 +5,6 @@ import pytest
 from six import ensure_binary
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 
 
 def do_print(session, options):
@@ -31,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
     assert_pdf(pdf)
 
 
-def test_html_document(session):
+def test_html_document(session, inline):
     session.url = inline("Test")
 
     response = do_print(session, {
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
index a3f7a10ac37..2022796774b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
@@ -6,12 +6,11 @@ import pytest
 from six import ensure_binary
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
-from tests.support.inline import inline
 from .printcmd import do_print, assert_pdf
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input/>")
 
@@ -29,7 +28,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input/>")
 
@@ -44,7 +43,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input/>")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/refresh/refresh.py b/tests/wpt/web-platform-tests/webdriver/tests/refresh/refresh.py
index eef413017e5..33595d0ff71 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/refresh/refresh.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/refresh/refresh.py
@@ -2,7 +2,6 @@ import pytest
 
 from webdriver.error import NoSuchElementException, StaleElementReferenceException
 
-from tests.support.inline import inline
 from tests.support.asserts import assert_error, assert_success
 
 
@@ -11,7 +10,7 @@ def refresh(session):
         "POST", "session/{session_id}/refresh".format(**vars(session)))
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline):
     session.url = inline("<div>")
 
     response = refresh(session)
@@ -24,7 +23,7 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, inline):
     url = inline("<div id=foo>")
 
     session.url = url
@@ -40,7 +39,7 @@ def test_no_browsing_context(session, closed_frame):
     assert session.find.css("#foo", all=False)
 
 
-def test_basic(session):
+def test_basic(session, inline):
     url = inline("<div id=foo>")
 
     session.url = url
@@ -56,7 +55,7 @@ def test_basic(session):
     assert session.find.css("#foo", all=False)
 
 
-def test_dismissed_beforeunload(session):
+def test_dismissed_beforeunload(session, inline):
     url_beforeunload = inline("""
       <input type="text">
       <script>
@@ -79,7 +78,7 @@ def test_dismissed_beforeunload(session):
     session.find.css("input", all=False)
 
 
-def test_history_pushstate(session, url):
+def test_history_pushstate(session, inline):
     pushstate_page = inline("""
       <script>
         function pushState() {
@@ -111,7 +110,7 @@ def test_history_pushstate(session, url):
         element.property("id")
 
 
-def test_refresh_switches_to_parent_browsing_context(session, create_frame):
+def test_refresh_switches_to_parent_browsing_context(session, create_frame, inline):
     session.url = inline("<div id=foo>")
 
     session.switch_frame(create_frame())
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/refresh/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/refresh/user_prompts.py
index b8ef418e115..7e944b53b09 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/refresh/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/refresh/user_prompts.py
@@ -4,7 +4,6 @@ import pytest
 
 from webdriver.error import StaleElementReferenceException
 
-from tests.support.inline import inline
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
 
 
@@ -14,7 +13,7 @@ def refresh(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<div id=foo>")
         element = session.find.css("#foo", all=False)
@@ -33,7 +32,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<div id=foo>")
         element = session.find.css("#foo", all=False)
@@ -51,7 +50,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<div id=foo>")
         element = session.find.css("#foo", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
index 5da67590da3..d5846ad56b3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
@@ -4,12 +4,11 @@ from webdriver.error import NoSuchAlertException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline
 from tests.support.sync import Poll
 
 
 @pytest.fixture
-def page(session):
+def page(session, inline):
     session.url = inline("""
         <script>window.result = window.prompt('Enter Your Name: ', 'Name');</script>
     """)
@@ -55,7 +54,7 @@ def test_no_user_prompt(session):
 
 
 @pytest.mark.parametrize("dialog_type", ["alert", "confirm"])
-def test_alert_element_not_interactable(session, dialog_type):
+def test_alert_element_not_interactable(session, inline, dialog_type):
     session.url = inline("<script>window.{}('Hello');</script>".format(dialog_type))
 
     response = send_alert_text(session, "Federer")
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 3eb5ffd26fa..78a8a981e35 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -11,7 +11,7 @@ from six.moves.urllib.parse import urlunsplit
 
 from tests.support import defaults
 from tests.support.helpers import cleanup_session
-from tests.support.inline import inline
+from tests.support.inline import build_inline
 from tests.support.http_request import HTTPRequest
 from tests.support.sync import Poll
 
@@ -160,14 +160,13 @@ def current_session():
 
 @pytest.fixture
 def url(server_config):
-    def inner(path, protocol="http", domain="", subdomain="", query="", fragment=""):
+    def url(path, protocol="http", domain="", subdomain="", query="", fragment=""):
         domain = server_config["domains"][domain][subdomain]
         port = server_config["ports"][protocol][0]
         host = "{0}:{1}".format(domain, port)
         return urlunsplit((protocol, host, path, query, fragment))
 
-    inner.__name__ = "url"
-    return inner
+    return url
 
 
 @pytest.fixture
@@ -239,7 +238,7 @@ def closed_frame(session, url):
 
 
 @pytest.fixture
-def closed_window(session):
+def closed_window(session, inline):
     original_handle = session.window_handle
     new_handle = session.new_window()
 
@@ -253,3 +252,40 @@ def closed_window(session):
     yield (original_handle, element)
 
     session.window_handle = original_handle
+
+
+@pytest.fixture
+def inline(url):
+    """Takes a source extract and produces well-formed documents.
+
+    Based on the desired document type, the extract is embedded with
+    predefined boilerplate in order to produce well-formed documents.
+    The media type and character set may also be individually configured.
+
+    This helper function originally used data URLs, but since these
+    are not universally supported (or indeed standardised!) across
+    browsers, it now delegates the serving of the document to wptserve.
+    This file also acts as a wptserve handler (see the main function
+    below) which configures the HTTP response using query parameters.
+
+    This function returns a URL to the wptserve handler, which in turn
+    will serve an HTTP response with the requested source extract
+    inlined in a well-formed document, and the Content-Type header
+    optionally configured using the desired media type and character set.
+
+    Any additional keyword arguments are passed on to the build_url
+    function, which comes from the url fixture.
+    """
+    def inline(src, **kwargs):
+        return build_inline(url, src, **kwargs)
+
+    return inline
+
+
+@pytest.fixture
+def iframe(inline):
+    """Inlines document extract as the source document of an <iframe>."""
+    def iframe(src, **kwargs):
+        return "<iframe src='{}'></iframe>".format(inline(src, **kwargs))
+
+    return iframe
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py b/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
index d23ca75d1c8..39e926dd09a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
@@ -24,31 +24,8 @@ MIME_TYPES = {
     "xml": "text/xml",
 }
 
-def inline(src, doctype="html", mime=None, charset=None, **kwargs):
-    """
-    Takes a source extract and produces well-formed documents.
-
-    Based on the desired document type, the extract is embedded with
-    predefined boilerplate in order to produce well-formed documents.
-    The media type and character set may also be individually configured.
-
-    This helper function originally used data URLs, but since these
-    are not universally supported (or indeed standardised!) across
-    browsers, it now delegates the serving of the document to wptserve.
-    This file also acts as a wptserve handler (see the main function
-    below) which configures the HTTP response using query parameters.
-
-    This function returns a URL to the wptserve handler, which in turn
-    will serve an HTTP response with the requested source extract
-    inlined in a well-formed document, and the Content-Type header
-    optionally configured using the desired media type and character set.
-
-    Any additional keyword arguments are passed on to the build_url
-    function.
-    """
-    from .fixtures import server_config, url
-    build_url = url(server_config())
 
+def build_inline(build_url, src, doctype="html", mime=None, charset=None, **kwargs):
     if mime is None:
         mime = MIME_TYPES[doctype]
     if charset is None:
@@ -62,11 +39,6 @@ def inline(src, doctype="html", mime=None, charset=None, **kwargs):
         **kwargs)
 
 
-def iframe(src, **kwargs):
-    """Inlines document extract as the source document of an <iframe>."""
-    return "<iframe src='{}'></iframe>".format(inline(src, **kwargs))
-
-
 def main(request, response):
     doc = request.GET.first(b"doc", None)
     mime = request.GET.first(b"mime", None)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/cross_origin.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/cross_origin.py
index 905f1eb56dc..ec345c1cfc3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/cross_origin.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/cross_origin.py
@@ -4,7 +4,6 @@ import webdriver.protocol as protocol
 
 from tests.support.asserts import assert_success
 from tests.support.helpers import document_location
-from tests.support.inline import iframe, inline
 
 
 """
@@ -27,7 +26,7 @@ def switch_to_frame(session, frame):
         session=session)
 
 
-def test_cross_origin_iframe(session, server_config):
+def test_cross_origin_iframe(session, server_config, inline, iframe):
     session.url = inline(iframe("", domain="alt"))
     frame_element = session.find.css("iframe", all=False)
 
@@ -38,7 +37,7 @@ def test_cross_origin_iframe(session, server_config):
     assert parse_result.netloc != server_config["browser_host"]
 
 
-def test_nested_cross_origin_iframe(session, server_config):
+def test_nested_cross_origin_iframe(session, server_config, inline, iframe):
     frame2 = iframe("", domain="alt", subdomain="www")
     frame1 = iframe(frame2)
     top_doc = inline(frame1, domain="alt")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
index 33ea967f801..07994bed349 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch.py
@@ -6,7 +6,6 @@ from webdriver import StaleElementReferenceException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
-from tests.support.inline import inline, iframe
 
 
 def switch_to_frame(session, frame):
@@ -17,18 +16,13 @@ def switch_to_frame(session, frame):
         session=session)
 
 
-def frameset(*docs):
-    frames = list(map(lambda doc: "<frame src='{}'></frame>".format(inline(doc)), docs))
-    return "<frameset rows='{}'>\n{}</frameset>".format(len(frames) * "*,", "\n".join(frames))
-
-
 def test_null_parameter_value(session, http):
     path = "/session/{session_id}/frame".format(**vars(session))
     with http.post(path, None) as response:
         assert_error(Response.from_http(response), "invalid argument")
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
     frame = session.find.css("iframe", all=False)
 
@@ -81,7 +75,7 @@ def test_frame_id_invalid_types(session, value):
     assert_error(response, "invalid argument")
 
 
-def test_frame_id_null(session):
+def test_frame_id_null(session, inline, iframe):
     session.url = inline(iframe("{}<div>foo".format(iframe("<p>bar"))))
 
     frame1 = session.find.css("iframe", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
index 77529544679..c8858e77ff1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_number.py
@@ -3,7 +3,6 @@ import pytest
 import webdriver.protocol as protocol
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline, iframe
 
 
 def switch_to_frame(session, frame):
@@ -21,7 +20,7 @@ def test_frame_id_number_out_of_bounds(session, value):
 
 
 @pytest.mark.parametrize("index", [1, 65535])
-def test_frame_id_number_index_out_of_bounds(session, index):
+def test_frame_id_number_index_out_of_bounds(session, inline, iframe, index):
     session.url = inline(iframe("<p>foo"))
 
     response = switch_to_frame(session, index)
@@ -29,7 +28,7 @@ def test_frame_id_number_index_out_of_bounds(session, index):
 
 
 @pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_number_index(session, index, value):
+def test_frame_id_number_index(session, inline, iframe, index, value):
     session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
 
     response = switch_to_frame(session, index)
@@ -39,7 +38,7 @@ def test_frame_id_number_index(session, index, value):
     assert element.text == value
 
 
-def test_frame_id_number_index_nested(session):
+def test_frame_id_number_index_nested(session, inline, iframe):
     session.url = inline(iframe("{}<p>foo".format(iframe("<p>bar"))))
 
     expected_text = ["foo", "bar"]
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py
index 89480b66b3a..7677a5215b9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_frame/switch_webelement.py
@@ -3,7 +3,6 @@ import pytest
 import webdriver.protocol as protocol
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline, iframe
 
 
 def switch_to_frame(session, frame):
@@ -14,14 +13,14 @@ def switch_to_frame(session, frame):
         session=session)
 
 
-def frameset(*docs):
+def frameset(inline, *docs):
     frames = list(map(lambda doc: "<frame src='{}'></frame>".format(inline(doc)), docs))
     return "<frameset rows='{}'>\n{}</frameset>".format(len(frames) * "*,", "\n".join(frames))
 
 
 @pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_webelement_frame(session, index, value):
-    session.url = inline(frameset("<p>foo", "<p>bar"))
+def test_frame_id_webelement_frame(session, inline, index, value):
+    session.url = inline(frameset(inline, "<p>foo", "<p>bar"))
     frames = session.find.css("frame")
     assert len(frames) == 2
 
@@ -33,7 +32,7 @@ def test_frame_id_webelement_frame(session, index, value):
 
 
 @pytest.mark.parametrize("index, value", [[0, "foo"], [1, "bar"]])
-def test_frame_id_webelement_iframe(session, index, value):
+def test_frame_id_webelement_iframe(session, inline, iframe, index, value):
     session.url = inline("{}{}".format(iframe("<p>foo"), iframe("<p>bar")))
     frames = session.find.css("iframe")
     assert len(frames) == 2
@@ -45,7 +44,7 @@ def test_frame_id_webelement_iframe(session, index, value):
     assert element.text == value
 
 
-def test_frame_id_webelement_nested(session):
+def test_frame_id_webelement_nested(session, inline, iframe):
     session.url = inline(iframe("{}<p>foo".format(iframe("<p>bar"))))
 
     expected_text = ["foo", "bar"]
@@ -58,7 +57,7 @@ def test_frame_id_webelement_nested(session):
         assert element.text == expected_text[i]
 
 
-def test_frame_id_webelement_no_element_reference(session):
+def test_frame_id_webelement_no_element_reference(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
     frame = session.find.css("iframe", all=False)
     frame.id = "bar"
@@ -67,7 +66,7 @@ def test_frame_id_webelement_no_element_reference(session):
     assert_error(response, "no such element")
 
 
-def test_frame_id_webelement_stale_reference(session):
+def test_frame_id_webelement_stale_reference(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
     frame = session.find.css("iframe", all=False)
 
@@ -77,7 +76,7 @@ def test_frame_id_webelement_stale_reference(session):
     assert_error(response, "stale element reference")
 
 
-def test_frame_id_webelement_no_frame_element(session):
+def test_frame_id_webelement_no_frame_element(session, inline):
     session.url = inline("<p>foo")
     no_frame = session.find.css("p", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
index d23dc522a13..e05e11953c9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
@@ -3,7 +3,6 @@ import pytest
 from webdriver import StaleElementReferenceException
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import inline, iframe
 
 
 def switch_to_parent_frame(session):
@@ -11,7 +10,7 @@ def switch_to_parent_frame(session):
         "POST", "session/{session_id}/frame/parent".format(**vars(session)))
 
 
-def test_null_response_value(session):
+def test_null_response_value(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
     frame_element = session.find.css("iframe", all=False)
     session.switch_frame(frame_element)
@@ -63,7 +62,7 @@ def test_no_browsing_context_when_already_top_level(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_switch_from_iframe(session):
+def test_switch_from_iframe(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
     frame_element = session.find.css("iframe", all=False)
     session.switch_frame(frame_element)
@@ -76,7 +75,7 @@ def test_switch_from_iframe(session):
         stale_element.text
 
 
-def test_switch_from_top_level(session):
+def test_switch_from_top_level(session, inline):
     session.url = inline("<p>foo")
     element = session.find.css("p", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_window/switch.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_window/switch.py
index 88a1a244b2d..f480784fb5f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_window/switch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_window/switch.py
@@ -4,7 +4,6 @@ from webdriver.error import NoSuchElementException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.inline import iframe, inline
 
 
 def switch_to_window(session, handle):
@@ -57,7 +56,7 @@ def test_no_browsing_context(session, url):
     assert session.window_handle == new_handle
 
 
-def test_switch_to_window_sets_top_level_context(session):
+def test_switch_to_window_sets_top_level_context(session, inline, iframe):
     session.url = inline(iframe("<p>foo"))
 
     frame = session.find.css("iframe", all=False)
@@ -69,7 +68,7 @@ def test_switch_to_window_sets_top_level_context(session):
 
     session.find.css("iframe", all=False)
 
-def test_element_not_found_after_tab_switch(session):
+def test_element_not_found_after_tab_switch(session, inline):
     session.url = inline("<p id='a'>foo")
     paragraph = session.find.css("p", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/iframe.py
index 83f55deff75..e7f1b0c8053 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/iframe.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/iframe.py
@@ -2,7 +2,6 @@ import pytest
 
 from tests.support.asserts import assert_success
 from tests.support.image import png_dimensions
-from tests.support.inline import iframe, inline
 
 from . import element_dimensions
 
@@ -68,7 +67,7 @@ def take_element_screenshot(session, element_id):
     )
 
 
-def test_frame_element(session):
+def test_frame_element(session, inline, iframe):
     # Create a reference element which looks exactly like the frame's content
     session.url = inline("{0}{1}".format(REFERENCE_STYLE, REFERENCE_CONTENT))
 
@@ -97,7 +96,7 @@ def test_frame_element(session):
 
 
 @pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
-def test_source_origin(session, url, domain):
+def test_source_origin(session, inline, iframe, domain):
     # Create a reference element which looks exactly like the iframe
     session.url = inline("{0}{1}".format(REFERENCE_STYLE, REFERENCE_CONTENT))
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
index 6ff6396edb2..4d3bfb0e5c6 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
@@ -1,6 +1,5 @@
 from tests.support.asserts import assert_error, assert_success
 from tests.support.image import png_dimensions
-from tests.support.inline import inline
 
 from . import element_dimensions
 
@@ -20,7 +19,7 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
@@ -30,7 +29,7 @@ def test_no_browsing_context(session, closed_frame):
     assert png_dimensions(screenshot) == element_dimensions(session, element)
 
 
-def test_stale(session):
+def test_stale(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
     session.refresh()
@@ -39,7 +38,7 @@ def test_stale(session):
     assert_error(result, "stale element reference")
 
 
-def test_format_and_dimensions(session):
+def test_format_and_dimensions(session, inline):
     session.url = inline("<input>")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/user_prompts.py
index 5d1b497ff2c..39fefe9325a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_png, assert_success
-from tests.support.inline import inline
 
 
 def take_element_screenshot(session, element_id):
@@ -17,7 +16,7 @@ def take_element_screenshot(session, element_id):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input/>")
         element = session.find.css("input", all=False)
@@ -35,7 +34,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input/>")
         element = session.find.css("input", all=False)
@@ -51,7 +50,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input/>")
         element = session.find.css("input", all=False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/iframe.py
index 601c039d56d..81881c1dae7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/iframe.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/iframe.py
@@ -2,9 +2,8 @@ import pytest
 
 from tests.support.asserts import assert_success
 from tests.support.image import png_dimensions
-from tests.support.inline import iframe, inline
 
-from . import element_dimensions, viewport_dimensions
+from . import viewport_dimensions
 
 DEFAULT_CONTENT = "<div id='content'>Lorem ipsum dolor sit amet.</div>"
 
@@ -63,7 +62,7 @@ def take_screenshot(session):
         "GET", "session/{session_id}/screenshot".format(**vars(session)))
 
 
-def test_always_captures_top_browsing_context(session):
+def test_always_captures_top_browsing_context(session, inline, iframe):
     iframe_content = "{0}{1}".format(INNER_IFRAME_STYLE, DEFAULT_CONTENT)
     session.url = inline("""{0}{1}""".format(OUTER_IFRAME_STYLE, iframe(iframe_content)))
 
@@ -82,7 +81,7 @@ def test_always_captures_top_browsing_context(session):
 
 
 @pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
-def test_source_origin(session, domain):
+def test_source_origin(session, inline, iframe, domain):
     session.url = inline("{0}{1}".format(REFERENCE_STYLE, REFERENCE_CONTENT))
 
     response = take_screenshot(session)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/screenshot.py b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/screenshot.py
index d6130919167..9e71a633c70 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/screenshot.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/screenshot.py
@@ -1,6 +1,5 @@
 from tests.support.asserts import assert_error, assert_png, assert_success
 from tests.support.image import png_dimensions
-from tests.support.inline import inline
 
 from . import viewport_dimensions
 
@@ -15,7 +14,7 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
+def test_no_browsing_context(session, closed_frame, inline):
     session.url = inline("<input>")
 
     response = take_screenshot(session)
@@ -25,7 +24,7 @@ def test_no_browsing_context(session, closed_frame):
     assert png_dimensions(value) == viewport_dimensions(session)
 
 
-def test_format_and_dimensions(session):
+def test_format_and_dimensions(session, inline):
     session.url = inline("<input>")
 
     response = take_screenshot(session)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/user_prompts.py
index ad9e3695148..7d57f8f2716 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_screenshot/user_prompts.py
@@ -3,7 +3,6 @@
 import pytest
 
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_png, assert_success
-from tests.support.inline import inline
 
 
 def take_screenshot(session):
@@ -12,7 +11,7 @@ def take_screenshot(session):
 
 
 @pytest.fixture
-def check_user_prompt_closed_without_exception(session, create_dialog):
+def check_user_prompt_closed_without_exception(session, create_dialog, inline):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
         session.url = inline("<input/>")
 
@@ -29,7 +28,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_closed_with_exception(session, create_dialog):
+def check_user_prompt_closed_with_exception(session, create_dialog, inline):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
         session.url = inline("<input/>")
 
@@ -44,7 +43,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 
 
 @pytest.fixture
-def check_user_prompt_not_closed_but_exception(session, create_dialog):
+def check_user_prompt_not_closed_but_exception(session, create_dialog, inline):
     def check_user_prompt_not_closed_but_exception(dialog_type):
         session.url = inline("<input/>")
 
diff --git a/tests/wpt/web-platform-tests/websockets/constants.js b/tests/wpt/web-platform-tests/websockets/constants.js
index cb17767f48c..1f19b5307f3 100644
--- a/tests/wpt/web-platform-tests/websockets/constants.js
+++ b/tests/wpt/web-platform-tests/websockets/constants.js
@@ -2,10 +2,13 @@
 
 var PORT = "{{ports[ws][0]}}";
 var PORT_SSL = "{{ports[wss][0]}}";
+var PORT_H2 = "{{ports[h2][0]}}";
 
 var SCHEME_DOMAIN_PORT;
 if (location.search == '?wss') {
   SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_SSL;
+} else if (location.search == '?wpt_flags=h2') {
+  SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_H2;
 } else {
   SCHEME_DOMAIN_PORT = 'ws://{{host}}:' + PORT;
 }
diff --git a/tests/wpt/web-platform-tests/worklets/META.yml b/tests/wpt/web-platform-tests/worklets/META.yml
index 5c92c43c538..b037fe099b1 100644
--- a/tests/wpt/web-platform-tests/worklets/META.yml
+++ b/tests/wpt/web-platform-tests/worklets/META.yml
@@ -1,3 +1,4 @@
-spec: https://drafts.css-houdini.org/worklets/
+spec: https://html.spec.whatwg.org/multipage/worklets.html
 suggested_reviewers:
   - bfgeek
+  - domenic
diff --git a/tests/wpt/web-platform-tests/worklets/README.md b/tests/wpt/web-platform-tests/worklets/README.md
index 027b23216d5..b06ea33cd92 100644
--- a/tests/wpt/web-platform-tests/worklets/README.md
+++ b/tests/wpt/web-platform-tests/worklets/README.md
@@ -1 +1 @@
-These are the tests for the [Worklets Level 1 spec](https://drafts.css-houdini.org/worklets/).
+These are the tests for the [Worklets](https://html.spec.whatwg.org/multipage/worklets.html) section of the HTML Standard.
diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py b/tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py
index e18319e3de8..43b376e6e87 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py
@@ -10,6 +10,6 @@ def main(request, response):
         response.headers.set(b'WWW-Authenticate', b'Basic realm="test"')
         content = b'User name/password wrong or not given: '
 
-    content += b"%s\n%s" % (request.auth.username,
-                            request.auth.password)
+    content += b"%s\n%s" % (request.auth.username or b'',
+                            request.auth.password or b'')
     return content