From d0eccdba1ab972c96f835686b359b544e00075c4 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Thu, 18 Oct 2018 21:30:10 -0400
Subject: [PATCH] Update web-platform-tests to revision
 824f0c1df556305042b8aa8073c32e9ef86c3efa

---
 .../FileAPI/url/url-with-fetch.any.js.ini     |   3 +
 tests/wpt/metadata/MANIFEST.json              | 642 ++++++++++++++++--
 ...-property-interpolation-001.https.html.ini |   2 +
 ...-property-interpolation-002.https.html.ini |   2 +
 ...-property-interpolation-003.https.html.ini |   2 +
 ...-property-interpolation-004.https.html.ini |   2 +
 ...-property-interpolation-005.https.html.ini |   2 +
 ...-property-interpolation-006.https.html.ini |   2 +
 ...-property-interpolation-007.https.html.ini |   2 +
 ...-property-interpolation-008.https.html.ini |   2 +
 ...-property-interpolation-009.https.html.ini |   2 +
 ...-property-interpolation-010.https.html.ini |   2 +
 ...egistered-property-stylemap.https.html.ini |   2 +
 ...gistered-property-value-001.https.html.ini |   2 +
 ...gistered-property-value-002.https.html.ini |   2 +
 ...gistered-property-value-003.https.html.ini |   2 +
 ...gistered-property-value-004.https.html.ini |   2 +
 ...gistered-property-value-005.https.html.ini |   2 +
 ...gistered-property-value-006.https.html.ini |   2 +
 ...gistered-property-value-007.https.html.ini |   2 +
 ...gistered-property-value-008.https.html.ini |   2 +
 ...gistered-property-value-009.https.html.ini |   2 +
 ...gistered-property-value-010.https.html.ini |   2 +
 ...gistered-property-value-011.https.html.ini |   2 +
 ...gistered-property-value-012.https.html.ini |   2 +
 ...gistered-property-value-013.https.html.ini |   2 +
 ...gistered-property-value-014.https.html.ini |   2 +
 ...gistered-property-value-015.https.html.ini |   2 +
 ...gistered-property-value-016.https.html.ini |   2 +
 ...gistered-property-value-017.https.html.ini |   2 +
 ...gistered-property-value-018.https.html.ini |   2 +
 .../traverse_the_history_5.html.ini           |   4 -
 .../getter.html.ini                           |   9 +
 .../viewport-change.html.ini                  |  20 +-
 .../parsing/DOMContentLoaded-defer.html.ini   |   4 +
 ...lout-exception-vs-return-xml.window.js.ini |   3 +
 .../unitless-length/limited-quirks.html.ini   | 283 ++++++++
 .../quirks/unitless-length/quirks.html.ini    | 283 ++++++++
 .../metadata/url/urlencoded-parser.any.js.ini |  17 +-
 .../wasm/webapi/idlharness.any.js.ini         |  39 ++
 .../realtimeanalyser-fft-scaling.html.ini     |   1 +
 .../background-fetch/abort.https.window.js    |  25 +-
 .../background-fetch/fetch.https.window.js    |  12 +-
 .../service_workers/sw-abort.js               |  23 +
 .../background-fetch/service_workers/sw.js    |  13 +-
 .../css/css-exclusions/inheritance.html       |  22 +
 ...ered-property-interpolation-001.https.html |  25 +
 ...ered-property-interpolation-002.https.html |  25 +
 ...ered-property-interpolation-003.https.html |  25 +
 ...ered-property-interpolation-004.https.html |  25 +
 ...ered-property-interpolation-005.https.html |  35 +
 ...ered-property-interpolation-006.https.html |  25 +
 ...ered-property-interpolation-007.https.html |  25 +
 ...ered-property-interpolation-008.https.html |  25 +
 ...ered-property-interpolation-009.https.html |  25 +
 ...ered-property-interpolation-010.https.html |  33 +
 .../registered-property-stylemap.https.html   |  57 ++
 .../registered-property-type.https.html       | 174 -----
 .../registered-property-value-001.https.html  |  27 +
 .../registered-property-value-002.https.html  |  31 +
 .../registered-property-value-003.https.html  |  28 +
 .../registered-property-value-004.https.html  |  29 +
 .../registered-property-value-005.https.html  |  29 +
 .../registered-property-value-006.https.html  |  29 +
 .../registered-property-value-007.https.html  |  40 ++
 .../registered-property-value-008.https.html  |  29 +
 .../registered-property-value-009.https.html  |  49 ++
 .../registered-property-value-010.https.html  |  41 ++
 .../registered-property-value-011.https.html  |  29 +
 .../registered-property-value-012.https.html  |  29 +
 .../registered-property-value-013.https.html  |  29 +
 .../registered-property-value-014.https.html  |  29 +
 .../registered-property-value-015.https.html  |  29 +
 .../registered-property-value-016.https.html  |  29 +
 .../registered-property-value-017.https.html  |  29 +
 .../registered-property-value-018.https.html  |  49 ++
 .../css/css-paint-api/resources/utils.js      |  59 ++
 .../register-property-syntax-parsing.html     |   4 +
 .../registered-property-computation.html      |  12 +
 .../typedom.tentative.html                    |   8 +-
 .../css/css-regions/inheritance.html          |  23 +
 .../shadow-host-removal-invalidation.html     |  21 +
 .../css/css-scroll-anchoring/inheritance.html |  21 +
 .../text-indent-percentage-002-ref.html       |   5 +-
 .../text-indent-percentage-002.html           |   1 +
 .../text-indent-percentage-003.html           |   1 +
 .../text-indent-percentage-004.html           |   1 +
 .../will-change-inherit-dynamic.html          |  21 +
 .../fetch/data-urls/resources/data-urls.json  |   2 +-
 .../getter-tests.js                           |   9 +
 .../activation-after-registration.https.html  |  17 +-
 .../appcache-ordering-main.https.html         |  12 +-
 .../service-worker/client-id.https.html       |  23 +-
 ...ients-matchall-exact-controller.https.html |  13 +-
 ...s-matchall-include-uncontrolled.https.html |  14 +-
 .../clients-matchall.https.html               |  23 +-
 .../controller-on-disconnect.https.html       |  26 +-
 .../controller-on-load.https.html             |  29 +-
 ...xtendable-event-async-waituntil.https.html |  40 +-
 .../extendable-event-waituntil.https.html     | 115 ++--
 .../service-worker/fetch-cors-xhr.https.html  |  22 +-
 .../fetch-event-referrer-policy.https.html    |  12 +-
 .../fetch-frame-resource.https.html           |  72 +-
 .../fetch-header-visibility.https.html        |  12 +-
 .../fetch-request-css-base-url.https.html     |  10 +-
 .../fetch-request-css-images.https.html       | 162 +++--
 .../fetch-request-html-imports.https.html     |  13 +-
 ...ch-request-no-freshness-headers.https.html |  20 +-
 .../fetch-response-xhr.https.html             |  21 +-
 .../fetch-waits-for-activate.https.html       |  11 +-
 .../service-worker/getregistration.https.html |  28 +-
 .../invalid-blobtype.https.html               |  24 +-
 .../service-worker/invalid-header.https.html  |  23 +-
 .../iso-latin1-header.https.html              |  20 +-
 ...sage-from-waiting-serviceworker.https.html |   9 +-
 .../service-worker/referer.https.html         |  22 +-
 .../registration-events.https.html            |  35 +-
 .../service-worker/state.https.html           |  29 +-
 .../uncontrolled-page.https.html              |  14 +-
 .../unregister-then-register.https.html       |  60 +-
 .../service-worker/update-recovery.https.html |  12 +-
 .../service-worker/websocket.https.html       |  31 +-
 .../tools/webdriver/webdriver/client.py       |   7 -
 .../tools/wpt/requirements.txt                |   2 +-
 .../tools/wptrunner/requirements_sauce.txt    |   2 +-
 .../wptrunner/wptrunner/browsers/firefox.py   |  10 +-
 .../wptrunner/wptrunner/wptcommandline.py     |   6 +-
 .../tools/wptrunner/wptrunner/wptrunner.py    |   2 +-
 .../wasm/webapi/idlharness.any.js             |  10 +
 .../element_send_keys/interactability.py      |  12 +-
 .../webrtc/RTCRtpTransceiver.https.html       |  35 +
 131 files changed, 3087 insertions(+), 705 deletions(-)
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-001.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-002.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-003.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-004.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-005.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-006.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-007.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-008.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-009.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-010.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-stylemap.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-001.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-002.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-003.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-004.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-005.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-006.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-007.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-008.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-009.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-010.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-011.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-012.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-013.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-014.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-015.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-016.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-017.https.html.ini
 create mode 100644 tests/wpt/metadata/css/css-paint-api/registered-property-value-018.https.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
 create mode 100644 tests/wpt/metadata/quirks/unitless-length/quirks.html.ini
 create mode 100644 tests/wpt/metadata/wasm/webapi/idlharness.any.js.ini
 create mode 100644 tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-type.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-regions/inheritance.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html
 create mode 100644 tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js

diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 6a3af4e2ece..3a3d15b8406 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -37,3 +37,6 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
+  [Revoke blob URL after calling fetch, fetch should succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index fb50280b0fd..ff26064544b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -129141,9 +129141,345 @@
      {}
     ]
    ],
-   "css/css-paint-api/registered-property-type.https.html": [
+   "css/css-paint-api/registered-property-interpolation-001.https.html": [
     [
-     "/css/css-paint-api/registered-property-type.https.html",
+     "/css/css-paint-api/registered-property-interpolation-001.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-002.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-002.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-003.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-003.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-004.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-004.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-005.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-005.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-006.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-006.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-007.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-007.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-008.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-008.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-009.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-009.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-interpolation-010.https.html": [
+    [
+     "/css/css-paint-api/registered-property-interpolation-010.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-stylemap.https.html": [
+    [
+     "/css/css-paint-api/registered-property-stylemap.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-001.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-001.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-002.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-002.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-003.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-003.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-004.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-004.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-005.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-005.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-006.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-006.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-007.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-007.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-008.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-008.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-009.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-009.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-010.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-010.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-011.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-011.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-012.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-012.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-013.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-013.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-014.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-014.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-015.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-015.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-016.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-016.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-017.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-017.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-paint-api/registered-property-value-018.https.html": [
+    [
+     "/css/css-paint-api/registered-property-value-018.https.html",
      [
       [
        "/css/css-paint-api/parse-input-arguments-ref.html",
@@ -199976,6 +200312,11 @@
      {}
     ]
    ],
+   "background-fetch/service_workers/sw-abort.js": [
+    [
+     {}
+    ]
+   ],
    "background-fetch/service_workers/sw-helpers.js": [
     [
      {}
@@ -262536,6 +262877,11 @@
      {}
     ]
    ],
+   "css/css-paint-api/resources/utils.js": [
+    [
+     {}
+    ]
+   ],
    "css/css-paint-api/style-background-image-ref.html": [
     [
      {}
@@ -334913,6 +335259,12 @@
      {}
     ]
    ],
+   "css/css-exclusions/inheritance.html": [
+    [
+     "/css/css-exclusions/inheritance.html",
+     {}
+    ]
+   ],
    "css/css-exclusions/wrap-flow-001.html": [
     [
      "/css/css-exclusions/wrap-flow-001.html",
@@ -337951,6 +338303,12 @@
      {}
     ]
    ],
+   "css/css-regions/inheritance.html": [
+    [
+     "/css/css-regions/inheritance.html",
+     {}
+    ]
+   ],
    "css/css-regions/stacking-context/javascript-stacking-context-001.html": [
     [
      "/css/css-regions/stacking-context/javascript-stacking-context-001.html",
@@ -338041,6 +338399,12 @@
      {}
     ]
    ],
+   "css/css-scoping/shadow-host-removal-invalidation.html": [
+    [
+     "/css/css-scoping/shadow-host-removal-invalidation.html",
+     {}
+    ]
+   ],
    "css/css-scoping/shadow-multiple-links.html": [
     [
      "/css/css-scoping/shadow-multiple-links.html",
@@ -338155,6 +338519,12 @@
      {}
     ]
    ],
+   "css/css-scroll-anchoring/inheritance.html": [
+    [
+     "/css/css-scroll-anchoring/inheritance.html",
+     {}
+    ]
+   ],
    "css/css-scroll-anchoring/inline-block.html": [
     [
      "/css/css-scroll-anchoring/inline-block.html",
@@ -343527,6 +343897,12 @@
      {}
     ]
    ],
+   "css/css-will-change/will-change-inherit-dynamic.html": [
+    [
+     "/css/css-will-change/will-change-inherit-dynamic.html",
+     {}
+    ]
+   ],
    "css/css-writing-modes/inheritance.html": [
     [
      "/css/css-writing-modes/inheritance.html",
@@ -403997,6 +404373,16 @@
      {}
     ]
    ],
+   "wasm/webapi/idlharness.any.js": [
+    [
+     "/wasm/webapi/idlharness.any.html",
+     {}
+    ],
+    [
+     "/wasm/webapi/idlharness.any.worker.html",
+     {}
+    ]
+   ],
    "web-animations/animation-model/animation-types/accumulation-per-property.html": [
     [
      "/web-animations/animation-model/animation-types/accumulation-per-property.html",
@@ -444359,7 +444745,7 @@
    "support"
   ],
   "background-fetch/abort.https.window.js": [
-   "db01bf94b85fe9aeb05c63ec02186bbb40ec8206",
+   "b699406a1442b048a9f241c2115f8e1d88e93509",
    "testharness"
   ],
   "background-fetch/content-security-policy.https.window.js": [
@@ -444367,7 +444753,7 @@
    "testharness"
   ],
   "background-fetch/fetch.https.window.js": [
-   "9ed7e94da3bf7fc6cba5690813848ed269bfe8eb",
+   "c5fa18725a5dc37e847dd80b47dff67daf0775dd",
    "testharness"
   ],
   "background-fetch/get-ids.https.window.js": [
@@ -444398,6 +444784,10 @@
    "dbe041941d093e3c91472c410d506d40a466fe45",
    "support"
   ],
+  "background-fetch/service_workers/sw-abort.js": [
+   "c61377758dff76b068f5c2d1fb2484783dd0ca8b",
+   "support"
+  ],
   "background-fetch/service_workers/sw-helpers.js": [
    "e4c772135dba2610fc8a17119cf73b42aaba6746",
    "support"
@@ -444407,7 +444797,7 @@
    "support"
   ],
   "background-fetch/service_workers/sw.js": [
-   "2e3fbfff1a83e2d1f4aa40e738fa305a6eba513c",
+   "1c4fb10f05260f23b693aa25d3bcf4624bfdaaa0",
    "support"
   ],
   "background-fetch/update-ui.https.window.js": [
@@ -536566,6 +536956,10 @@
    "c4e98018794e63fea59451c230a3363659834d7b",
    "reftest"
   ],
+  "css/css-exclusions/inheritance.html": [
+   "b083ed8a5007f7c4caa1e31e3572d7a0f27d12b5",
+   "testharness"
+  ],
   "css/css-exclusions/resources/helper.js": [
    "6cd9ffddc4089463fd7ceb60cb13854c5908a42d",
    "support"
@@ -553790,14 +554184,130 @@
    "086bc7b27ee79caab2c2e433da4ff00ba1bace9b",
    "support"
   ],
-  "css/css-paint-api/registered-property-type.https.html": [
-   "8f02008333c9ed50091fb6605c5d4432ff0a87b4",
+  "css/css-paint-api/registered-property-interpolation-001.https.html": [
+   "c6e93029f101625de917394b314aecc3138ce1ec",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-002.https.html": [
+   "cfa9a618a1f10146fd61f357d6be3367e07b2cb6",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-003.https.html": [
+   "314d0c082efca3073dc2d69e37f010e01f6d83b2",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-004.https.html": [
+   "1596a934b396a0f7b7d0c4daa3580f172eaaf2c8",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-005.https.html": [
+   "807a0509289f3bea13ad8021f6e06c33c1552736",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-006.https.html": [
+   "45859a514a339231bf515546e494f1de5ce127bb",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-007.https.html": [
+   "b3f4f1f1bba24ccdc265fb6e6c8f1a375ee8803e",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-008.https.html": [
+   "45eb90960812cb1adb2537beb3068b90e5dbfd8e",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-009.https.html": [
+   "e45881244b2a211d2f5e5d9dfe867c13b55fac3d",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-interpolation-010.https.html": [
+   "d4d1b038e24d45e5f6941e3f7a7eb1facefe58f0",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-stylemap.https.html": [
+   "2305afb37df44abf4b9807bbe08c1ce0f7a1631c",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-001.https.html": [
+   "f915dacb168a6252ace394cbe64426614b4fae16",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-002.https.html": [
+   "7d62b0b2f65d3c7169ac0ccd338eb16ca9566e1a",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-003.https.html": [
+   "b22f18dde7c1281dea657bd89321a305e955b89d",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-004.https.html": [
+   "d67603f9fe8e0cd0969836d5c0748c304fdc6375",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-005.https.html": [
+   "71cda9a3766f50aee0995f9bd37cb410c1919b95",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-006.https.html": [
+   "aa03edf25f77907ef38b2320b51b535cf40985dd",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-007.https.html": [
+   "61256cd11cff21c31b95aeb31e8807d84b804b88",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-008.https.html": [
+   "06a18bd022cb7fc0dd47163ba5fdfeec6aab0b6d",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-009.https.html": [
+   "795770f9a2eea785b086ef8ba5b3a895c0402a4a",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-010.https.html": [
+   "53aef81e8e85c5aba8d88dbbee69689807735ffd",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-011.https.html": [
+   "d5dc351f7fafcfe7636b426fb3cc262128826ed5",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-012.https.html": [
+   "827877a51c4dd60c69056acfc0235a53a01fd91d",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-013.https.html": [
+   "e37cd556f80c4c02bdbcf5dc7905189b9e7265c3",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-014.https.html": [
+   "f42160fabe108b1d2238f5514d535be14c943d92",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-015.https.html": [
+   "5b00b53c2a09a98dd762deb5f550ff26882c939b",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-016.https.html": [
+   "1ec2e1b5ab031a4c5842c190a081a7c4de14091f",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-017.https.html": [
+   "1ec2e1b5ab031a4c5842c190a081a7c4de14091f",
+   "reftest"
+  ],
+  "css/css-paint-api/registered-property-value-018.https.html": [
+   "6be2cb8a228e34c0771c9e59b69409edf402feee",
    "reftest"
   ],
   "css/css-paint-api/resources/html5.png": [
    "e34419263f954e010b3eeb419820d40bdf7b71c5",
    "support"
   ],
+  "css/css-paint-api/resources/utils.js": [
+   "7efe85f260303050c73d58715f8dd768adb4e9d1",
+   "support"
+  ],
   "css/css-paint-api/style-background-image-ref.html": [
    "2fe4d0c9c024c22002f77e9e320624483f0086b7",
    "support"
@@ -554199,7 +554709,7 @@
    "testharness"
   ],
   "css/css-properties-values-api/register-property-syntax-parsing.html": [
-   "15a4ab6040ee2438c07282a4de1e9bedb2c86712",
+   "c0bebb07da6aa3e560b7f6ca9afbcc3db974f2a8",
    "testharness"
   ],
   "css/css-properties-values-api/register-property.html": [
@@ -554211,7 +554721,7 @@
    "testharness"
   ],
   "css/css-properties-values-api/registered-property-computation.html": [
-   "cbcc0bea64d47a296adff0759cb91509ecb5beb4",
+   "1651295cba45af823a4c5c2b7074dc361308847b",
    "testharness"
   ],
   "css/css-properties-values-api/registered-property-cssom.html": [
@@ -554251,7 +554761,7 @@
    "support"
   ],
   "css/css-properties-values-api/typedom.tentative.html": [
-   "0255b8f7a2d29ea20d4d9abd7212c4284e631935",
+   "0da972067b75db030c1b793a044dff654bd1ce55",
    "testharness"
   ],
   "css/css-properties-values-api/unit-cycles.html": [
@@ -555302,6 +555812,10 @@
    "3d6f55c8073a2387745b9093eb0d5b9f3f96dc22",
    "testharness"
   ],
+  "css/css-regions/inheritance.html": [
+   "865a1b6b1c13e15ad12fd4cd378b0f32b486354b",
+   "testharness"
+  ],
   "css/css-regions/interactivity/full-screen/fullscreen-region-content-001.html": [
    "ecd99200f43e05b126192a711939e69fe78fbec5",
    "manual"
@@ -556778,6 +557292,10 @@
    "1d84907e5fc0deb164bd38ab6b9979977a003fc6",
    "reftest"
   ],
+  "css/css-scoping/shadow-host-removal-invalidation.html": [
+   "6daa635fa623a42a9900a946280a6f997a737ada",
+   "testharness"
+  ],
   "css/css-scoping/shadow-host-with-before-after.html": [
    "87e1554f154d82c6252e752caa830954c119310c",
    "reftest"
@@ -556906,6 +557424,10 @@
    "99686bdee440ab511acc55d7cb5c7a5ce97b07ad",
    "testharness"
   ],
+  "css/css-scroll-anchoring/inheritance.html": [
+   "035d4ffd2e2c8955d4e8f80af3aff5db9285c8ae",
+   "testharness"
+  ],
   "css/css-scroll-anchoring/inline-block.html": [
    "fa7655bcd8afce189368ac412e094f98ccebbdca",
    "testharness"
@@ -562567,7 +563089,7 @@
    "support"
   ],
   "css/css-text/text-indent/reference/text-indent-percentage-002-ref.html": [
-   "5b3bc918d15f1737cd8e1518a8503425a4ee1d72",
+   "eebe7dacb49719046aece324396b4abeca2f5f8e",
    "support"
   ],
   "css/css-text/text-indent/text-indent-percentage-001.xht": [
@@ -562575,15 +563097,15 @@
    "reftest"
   ],
   "css/css-text/text-indent/text-indent-percentage-002.html": [
-   "65969260c5ee8467016545ba084bf4f7f886d6db",
+   "1c0a33ba94219dc7398fd59480d08cb77c725d64",
    "reftest"
   ],
   "css/css-text/text-indent/text-indent-percentage-003.html": [
-   "f81390da873dc27beb17533269b0464bfa5eff69",
+   "9f41e5b080d97f3c614393eb30c22c384ddb820d",
    "reftest"
   ],
   "css/css-text/text-indent/text-indent-percentage-004.html": [
-   "73f4c219558bf13fff6fc72ea208d0e52eb502f9",
+   "4d1dff10be583f1e15e0b2b2648cd9362ab77691",
    "reftest"
   ],
   "css/css-text/text-justify/reference/text-justify-ref-001.html": [
@@ -574658,6 +575180,10 @@
    "8d265f24986c7af2b08a26741bbfa56f321bfbb3",
    "support"
   ],
+  "css/css-will-change/will-change-inherit-dynamic.html": [
+   "b01844aea5c66eb2f4d0e7698ab9032d8ddb1079",
+   "testharness"
+  ],
   "css/css-will-change/will-change-will-change-1.html": [
    "812dc814a095841d8bd2c5dc23c8552922213e75",
    "reftest"
@@ -601519,7 +602045,7 @@
    "support"
   ],
   "fetch/data-urls/resources/data-urls.json": [
-   "4311f59330bf154ecedbb7fbc505792fce2f41d0",
+   "be1d1e74cf5f5105619a574c3caa7f2c0a39e7f6",
    "support"
   ],
   "fetch/http-cache/304-update.html": [
@@ -606787,7 +607313,7 @@
    "testharness"
   ],
   "html/dom/elements/the-innertext-idl-attribute/getter-tests.js": [
-   "976d6d6bcef690e65636e4afa2f96d88a475bd7d",
+   "5139ec97b05ce6d3cd9b84a20770065e9f81adb0",
    "support"
   ],
   "html/dom/elements/the-innertext-idl-attribute/getter.html": [
@@ -647279,7 +647805,7 @@
    "testharness"
   ],
   "service-workers/service-worker/activation-after-registration.https.html": [
-   "ff0990df6ba99be79b069c2cc70ad70c920ba4e0",
+   "29f97e3e3f4c0cda2321776cbf48fed92d1c90a1",
    "testharness"
   ],
   "service-workers/service-worker/activation.https.html": [
@@ -647291,7 +647817,7 @@
    "testharness"
   ],
   "service-workers/service-worker/appcache-ordering-main.https.html": [
-   "609d67e4504c9488780369c15e1b96fc0bd20394",
+   "921dae015cb55cf805ad960e902bbb22890f80bc",
    "testharness"
   ],
   "service-workers/service-worker/claim-affect-other-registration.https.html": [
@@ -647323,7 +647849,7 @@
    "testharness"
   ],
   "service-workers/service-worker/client-id.https.html": [
-   "a53c10c969191904b42147bb5871ee797b08b362",
+   "b93b34189999fe37d89d27fba1d4400994b276cb",
    "testharness"
   ],
   "service-workers/service-worker/client-navigate.https.html": [
@@ -647347,11 +647873,11 @@
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-exact-controller.https.html": [
-   "ee60c4a6077d799c2557e096322281a726df9d8b",
+   "a61c8af70196ac230c4b7085862e1bff8433fe38",
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-include-uncontrolled.https.html": [
-   "50bd817f56887ed287ac14c108f8f3d7cb4ee632",
+   "210cbb042125b4032997c8ef35f7b2c091a1e4b9",
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-on-evaluation.https.html": [
@@ -647363,15 +647889,15 @@
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall.https.html": [
-   "36269b4d98e2b72f55518268c1bcfd14abb21299",
+   "ce44f1924d54952afe442b19bd0b46c5f92951d5",
    "testharness"
   ],
   "service-workers/service-worker/controller-on-disconnect.https.html": [
-   "920d190e3b20147cf183f89664ff7ed84a4ec3de",
+   "f23dfe71bac505f1cc396bcab191dbee7a6461f4",
    "testharness"
   ],
   "service-workers/service-worker/controller-on-load.https.html": [
-   "49f9879626b0c5957c75e64c34215c8e5cccb534",
+   "e4c5e5f81f8139e1c788f068f716cdbb367fb83e",
    "testharness"
   ],
   "service-workers/service-worker/controller-on-reload.https.html": [
@@ -647395,11 +647921,11 @@
    "testharness"
   ],
   "service-workers/service-worker/extendable-event-async-waituntil.https.html": [
-   "be4efbbc34222f7087753c75920aee1eced998b0",
+   "cb4ed30a37fdfd07fd8b34181f073c6de2e165b9",
    "testharness"
   ],
   "service-workers/service-worker/extendable-event-waituntil.https.html": [
-   "8e790d0ef5ad6d851534362de5647d96699a65f7",
+   "33b4eac5c185e911023094f210ce4db9b6dddadb",
    "testharness"
   ],
   "service-workers/service-worker/fetch-audio-tainting.https.html": [
@@ -647431,7 +647957,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-cors-xhr.https.html": [
-   "521c01c594f2489b945d6749eb6fb8000ea2b91c",
+   "397cb81d5462c6a1db7b67c08ad9a5739147745b",
    "testharness"
   ],
   "service-workers/service-worker/fetch-csp.https.html": [
@@ -647471,7 +647997,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-event-referrer-policy.https.html": [
-   "73ae123ae4e73b46cd63b3bb199b3d8758264fc5",
+   "804fd9b4204c4224cb15267e279d74e8770ef7c9",
    "testharness"
   ],
   "service-workers/service-worker/fetch-event-respond-with-argument.https.html": [
@@ -647523,11 +648049,11 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-frame-resource.https.html": [
-   "2168e3e0d45851cc6f0599a9e0323e9a96e564e2",
+   "a33309f34f9872da537921a11dfc961ac142b0f8",
    "testharness"
   ],
   "service-workers/service-worker/fetch-header-visibility.https.html": [
-   "1ceb164653b9635999675cc87ea114796efead9d",
+   "1f4813c4f8e6d93a024b433db4cb45499b68425f",
    "testharness"
   ],
   "service-workers/service-worker/fetch-mixed-content-to-inscope.https.html": [
@@ -647539,7 +648065,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-css-base-url.https.html": [
-   "7c665203045786fdf25668103c7e09e4cef2ed25",
+   "7feccfb98c56fa29eae0c204791ec90e67e5dd5c",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-css-cross-origin.https.html": [
@@ -647547,7 +648073,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-css-images.https.html": [
-   "6f323cac8d11d33812848beb1ece651cf494bbbc",
+   "958de1af85f4ee6ba58b47de38971f9ff2aa2ba0",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-fallback.https.html": [
@@ -647555,11 +648081,11 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-html-imports.https.html": [
-   "b2f56da9f01724aa0ba044538cc7731620ab7f91",
+   "7a39fa85284addeb8b8d1144efda74bdfa0134fe",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-no-freshness-headers.https.html": [
-   "829b0cf2594b58929ad25d04e5900664bb92d11e",
+   "03b7d357610a904ed264b691054b6025f7fa2414",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-redirect.https.html": [
@@ -647587,15 +648113,15 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-response-xhr.https.html": [
-   "74173e8b9bdcc77c5f85832f85a5c44856b78565",
+   "891eb029422b7bf1cd575270cfa4616bb80da0bc",
    "testharness"
   ],
   "service-workers/service-worker/fetch-waits-for-activate.https.html": [
-   "2c9d4a59dc18dc125abc2f279ef8e6510ddb3483",
+   "889c5ec7bbb9367715118f78ae81a994856ad99f",
    "testharness"
   ],
   "service-workers/service-worker/getregistration.https.html": [
-   "c86fda50d52e270c7f8a21f03891fa632d02ffb8",
+   "72a2c25379cd0c04d605a8d42bebfd7cb4e5d44e",
    "testharness"
   ],
   "service-workers/service-worker/getregistrations.https.html": [
@@ -647647,15 +648173,15 @@
    "testharness"
   ],
   "service-workers/service-worker/invalid-blobtype.https.html": [
-   "b994859c1c6e32f3fc2a8430ef3bdec823429222",
+   "1c5920fb039101b18fc3c39e53f7cbb9b5e1ebfc",
    "testharness"
   ],
   "service-workers/service-worker/invalid-header.https.html": [
-   "0256a3a4c1582bd50523db5750bb2659b8158a1c",
+   "1bc976979046c127ad3d2f4282ce297e997b903d",
    "testharness"
   ],
   "service-workers/service-worker/iso-latin1-header.https.html": [
-   "ad0ab59c7756e7d9d08efb0353628045651a590c",
+   "c27a5f48a5b9e9384a5c9129d0288761b0df9cd7",
    "testharness"
   ],
   "service-workers/service-worker/local-url-inherit-controller.https.html": [
@@ -647847,7 +648373,7 @@
    "testharness"
   ],
   "service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html": [
-   "6d0a5d3274d414bfca03390540c29490c6638878",
+   "117def9eb2a6c132d4d3f44b1cb07adcb9eeef60",
    "testharness"
   ],
   "service-workers/service-worker/postmessage-msgport-to-client.https.html": [
@@ -647871,7 +648397,7 @@
    "testharness"
   ],
   "service-workers/service-worker/referer.https.html": [
-   "43fccbad56cf4504e9e9dda9742c1c869bb0a559",
+   "0957e4c5330168b08236ff7c431706a1d92cc1a4",
    "testharness"
   ],
   "service-workers/service-worker/referrer-policy-header.https.html": [
@@ -647903,7 +648429,7 @@
    "testharness"
   ],
   "service-workers/service-worker/registration-events.https.html": [
-   "972ce7410b9922edb7052ea5be740f8ef4892f19",
+   "5bcfd66846bce5b93bf09d05b65c2e352b51ffab",
    "testharness"
   ],
   "service-workers/service-worker/registration-iframe.https.html": [
@@ -649143,7 +649669,7 @@
    "testharness"
   ],
   "service-workers/service-worker/state.https.html": [
-   "3810362e05330569f97b7612cae1c93f8135cf38",
+   "7358e58ff14a74e04514eb9432151576cf62b905",
    "testharness"
   ],
   "service-workers/service-worker/svg-target-reftest.https.html": [
@@ -649155,7 +649681,7 @@
    "testharness"
   ],
   "service-workers/service-worker/uncontrolled-page.https.html": [
-   "a9523a54cdce27ccddb5860121101cdd1bdb50cc",
+   "e22ca8f0a91adf9fbcf64c77cd3d1d4df27956f3",
    "testharness"
   ],
   "service-workers/service-worker/unregister-controller.https.html": [
@@ -649167,7 +649693,7 @@
    "testharness"
   ],
   "service-workers/service-worker/unregister-then-register.https.html": [
-   "6c0a0aecf3f562a56edf7ff65acb9fcd675cdfa6",
+   "303b2be2b7d1dca0d69d84ae561a582421061622",
    "testharness"
   ],
   "service-workers/service-worker/unregister.https.html": [
@@ -649195,7 +649721,7 @@
    "testharness"
   ],
   "service-workers/service-worker/update-recovery.https.html": [
-   "3b3d955b142bff67c3d2c2a2d1742888c661c69d",
+   "17608d2ef790e2ea97a43f56b86a28ef0e647604",
    "testharness"
   ],
   "service-workers/service-worker/update-result.https.html": [
@@ -649215,7 +649741,7 @@
    "testharness"
   ],
   "service-workers/service-worker/websocket.https.html": [
-   "b9c526d50fb99abbafcb2b8d4f00c2267b25c474",
+   "cbfed456a9dc6bdfdbd19789912101ab1117b1ef",
    "testharness"
   ],
   "service-workers/service-worker/webvtt-cross-origin.https.html": [
@@ -659531,7 +660057,7 @@
    "support"
   ],
   "tools/webdriver/webdriver/client.py": [
-   "34d1a90dde2d91e70a6c1b1bb1db6b2e07127d70",
+   "c5cb9caa5b2c278171d246700c656f147f24daf8",
    "support"
   ],
   "tools/webdriver/webdriver/error.py": [
@@ -659571,7 +660097,7 @@
    "support"
   ],
   "tools/wpt/requirements.txt": [
-   "46c4b13a3bf3b045fc477272f9b555ef90971e73",
+   "c20f36f24647f26ad00e4508afaa798e1b6be0b1",
    "support"
   ],
   "tools/wpt/run.py": [
@@ -659695,7 +660221,7 @@
    "support"
   ],
   "tools/wptrunner/requirements_sauce.txt": [
-   "07c525a67fd6de50b8639627a750bbfd1a106b9d",
+   "2673b93ea9ac58fd9d53a163091ec7bac19bad76",
    "support"
   ],
   "tools/wptrunner/requirements_servo.txt": [
@@ -659859,7 +660385,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/firefox.py": [
-   "db7ac044908910f07fafc400a832ef9e694ef1d3",
+   "6f3b7e898fa71f7cfa35f55d68a04b3c9c092cd2",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/ie.py": [
@@ -660155,7 +660681,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [
-   "56f2c36769ba05eeb6123a48dfd9d77ab70647ce",
+   "d6d905a24a5a99f238c911996ad2b87dc3e8f228",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
@@ -660215,7 +660741,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptrunner.py": [
-   "7ac7b709436c3b9b5fb9580a845e24eaeda71a32",
+   "0a5b1352e212fcb702f1824293a774ea48d78ef1",
    "support"
   ],
   "tools/wptrunner/wptrunner/wpttest.py": [
@@ -663002,6 +663528,10 @@
    "78069c03c9ff44c4b32621f38691d8238c1972e1",
    "testharness"
   ],
+  "wasm/webapi/idlharness.any.js": [
+   "0c4669e6caa7b2b7a9c0a89f13cc11605a9067c4",
+   "testharness"
+  ],
   "web-animations/META.yml": [
    "bf92f7a7516302641aabcefe3c482ba6889c2c23",
    "support"
@@ -664799,7 +665329,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/interactability.py": [
-   "3a809aac6939b54b76cc2badec176abb216dcdd8",
+   "4145f8b1e32df7c237cd2713559b470989f58cf0",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/scroll_into_view.py": [
@@ -666359,7 +666889,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpTransceiver.https.html": [
-   "f3b67632f2da94c8a01f95c829ffe129231835e0",
+   "c638e64b8ba3983dd9a12a5c5e2d240bef270b23",
    "testharness"
   ],
   "webrtc/RTCSctpTransport-constructor.html": [
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-001.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-001.https.html.ini
new file mode 100644
index 00000000000..0473c83a01c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-001.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-001.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-002.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-002.https.html.ini
new file mode 100644
index 00000000000..beaca3b60c1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-002.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-002.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-003.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-003.https.html.ini
new file mode 100644
index 00000000000..06bbdb6798f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-003.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-003.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-004.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-004.https.html.ini
new file mode 100644
index 00000000000..2cc1bb59edf
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-004.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-004.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-005.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-005.https.html.ini
new file mode 100644
index 00000000000..5a469573789
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-005.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-005.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-006.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-006.https.html.ini
new file mode 100644
index 00000000000..7a9adf66db4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-006.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-006.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-007.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-007.https.html.ini
new file mode 100644
index 00000000000..72bab7604ca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-007.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-007.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-008.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-008.https.html.ini
new file mode 100644
index 00000000000..efd6afe90d3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-008.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-008.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-009.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-009.https.html.ini
new file mode 100644
index 00000000000..1208604290d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-009.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-009.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-010.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-010.https.html.ini
new file mode 100644
index 00000000000..5661b5726a0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-interpolation-010.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-interpolation-010.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-stylemap.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-stylemap.https.html.ini
new file mode 100644
index 00000000000..ef9b919f303
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-stylemap.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-stylemap.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-001.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-001.https.html.ini
new file mode 100644
index 00000000000..f6cbcfb5e05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-001.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-001.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-002.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-002.https.html.ini
new file mode 100644
index 00000000000..89066043049
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-002.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-002.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-003.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-003.https.html.ini
new file mode 100644
index 00000000000..b891bb4ef73
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-003.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-003.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-004.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-004.https.html.ini
new file mode 100644
index 00000000000..93cbe529b33
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-004.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-004.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-005.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-005.https.html.ini
new file mode 100644
index 00000000000..013ed614a7c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-005.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-005.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-006.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-006.https.html.ini
new file mode 100644
index 00000000000..d236979f97c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-006.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-006.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-007.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-007.https.html.ini
new file mode 100644
index 00000000000..d62e0dd54fd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-007.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-007.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-008.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-008.https.html.ini
new file mode 100644
index 00000000000..466947d9d5e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-008.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-008.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-009.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-009.https.html.ini
new file mode 100644
index 00000000000..99b353e4f76
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-009.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-009.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-010.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-010.https.html.ini
new file mode 100644
index 00000000000..2d863234b25
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-010.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-010.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-011.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-011.https.html.ini
new file mode 100644
index 00000000000..db7324461ad
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-011.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-011.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-012.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-012.https.html.ini
new file mode 100644
index 00000000000..235ff2347f3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-012.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-012.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-013.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-013.https.html.ini
new file mode 100644
index 00000000000..fc0700afe81
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-013.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-013.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-014.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-014.https.html.ini
new file mode 100644
index 00000000000..27eccb7619b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-014.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-014.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-015.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-015.https.html.ini
new file mode 100644
index 00000000000..a2311cd8e2d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-015.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-015.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-016.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-016.https.html.ini
new file mode 100644
index 00000000000..804a4bda636
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-016.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-016.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-017.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-017.https.html.ini
new file mode 100644
index 00000000000..21603c2f12a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-017.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-017.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/registered-property-value-018.https.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-property-value-018.https.html.ini
new file mode 100644
index 00000000000..239fa1c8c51
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/registered-property-value-018.https.html.ini
@@ -0,0 +1,2 @@
+[registered-property-value-018.https.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/elements/the-innertext-idl-attribute/getter.html.ini b/tests/wpt/metadata/html/dom/elements/the-innertext-idl-attribute/getter.html.ini
index b87d4cead69..d67860013a4 100644
--- a/tests/wpt/metadata/html/dom/elements/the-innertext-idl-attribute/getter.html.ini
+++ b/tests/wpt/metadata/html/dom/elements/the-innertext-idl-attribute/getter.html.ini
@@ -257,3 +257,12 @@
   [<audio> contents ok for element not being rendered ("<audio style='display:block'><source id='target' class='poke' style='display:block'>")]
     expected: FAIL
 
+  [text-transform handles Turkish casing ("<div><div lang='tr' style='text-transform:uppercase'>i ı")]
+    expected: FAIL
+
+  [Whitespace around <img> should not be collapsed ("<div>abc <img> def")]
+    expected: FAIL
+
+  [Whitespace around <img> should not be collapsed ("<div>abc <img width=1 height=1> def")]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index bed3bccce25..0f1a214d0ee 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -5,7 +5,7 @@
     expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
-    expected: TIMEOUT
+    expected: FAIL
 
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
     expected: TIMEOUT
@@ -13,3 +13,21 @@
   [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
     expected: FAIL
 
+  [picture: source (max-width:500px) broken image, img valid image, resize to narrow]
+    expected: FAIL
+
+  [img (srcset 1 cand) valid image, resize to wide]
+    expected: FAIL
+
+  [picture: same URL in source (max-width:500px) and img, resize to wide]
+    expected: FAIL
+
+  [img (srcset 1 cand) valid image, resize to narrow]
+    expected: FAIL
+
+  [picture: source (max-width:500px) valid image, img broken image, resize to wide]
+    expected: FAIL
+
+  [picture: same URL in source (max-width:500px) and img, resize to narrow]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
index 25f0d603b3d..2314441517b 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
@@ -9,3 +9,6 @@
   [document.open should throw an InvalidStateError with XML document even when the ignore-opens-during-unload counter is greater than 0 (during pagehide event)]
     expected: FAIL
 
+  [document.open should throw an InvalidStateError with XML document even when there is an active parser executing script]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
new file mode 100644
index 00000000000..c7e9c7434f5
--- /dev/null
+++ b/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
@@ -0,0 +1,283 @@
+[limited-quirks.html]
+  [top: -\\31 .5]
+    expected: FAIL
+
+  [bottom: -1A]
+    expected: FAIL
+
+  [bottom: -1a]
+    expected: FAIL
+
+  [top: @1]
+    expected: FAIL
+
+  [top: "1a"]
+    expected: FAIL
+
+  [top: @a]
+    expected: FAIL
+
+  [bottom: "1"]
+    expected: FAIL
+
+  [bottom: -/**/1]
+    expected: FAIL
+
+  [top: +/**/1]
+    expected: FAIL
+
+  [bottom: @1a]
+    expected: FAIL
+
+  [top: 1\\31 ]
+    expected: FAIL
+
+  [top: url('1')]
+    expected: FAIL
+
+  [bottom: -\\31 ]
+    expected: FAIL
+
+  [top: calc(1)]
+    expected: FAIL
+
+  [top: \\31 ]
+    expected: FAIL
+
+  [bottom: +1\\31 ]
+    expected: FAIL
+
+  [bottom: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: #0001]
+    expected: FAIL
+
+  [top: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: 1a]
+    expected: FAIL
+
+  [bottom: A]
+    expected: FAIL
+
+  [bottom: #01]
+    expected: FAIL
+
+  [top: +\\31 .5]
+    expected: FAIL
+
+  [bottom: #1]
+    expected: FAIL
+
+  [top: -/**/1]
+    expected: FAIL
+
+  [bottom: +\\31 .5]
+    expected: FAIL
+
+  [bottom: \\31 ]
+    expected: FAIL
+
+  [bottom: calc(1)]
+    expected: FAIL
+
+  [top: #001]
+    expected: FAIL
+
+  [top: +\\31 ]
+    expected: FAIL
+
+  [bottom: +\\31 ]
+    expected: FAIL
+
+  [top: +1.5]
+    expected: FAIL
+
+  [top: +1\\31 ]
+    expected: FAIL
+
+  [bottom: @a]
+    expected: FAIL
+
+  [bottom: @1]
+    expected: FAIL
+
+  [top: #1]
+    expected: FAIL
+
+  [top: 1a]
+    expected: FAIL
+
+  [bottom: +1a]
+    expected: FAIL
+
+  [bottom: +1A]
+    expected: FAIL
+
+  [bottom: "a"]
+    expected: FAIL
+
+  [top: #00001]
+    expected: FAIL
+
+  [bottom: -1\\31 .5]
+    expected: FAIL
+
+  [top: "1"]
+    expected: FAIL
+
+  [bottom: 1.5]
+    expected: FAIL
+
+  [bottom: -\\31 .5]
+    expected: FAIL
+
+  [bottom: url('1')]
+    expected: FAIL
+
+  [bottom: -1.5]
+    expected: FAIL
+
+  [top: \\31 .5]
+    expected: FAIL
+
+  [bottom: "1a"]
+    expected: FAIL
+
+  [bottom: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: +1\\31 .5]
+    expected: FAIL
+
+  [bottom: 1\\31 ]
+    expected: FAIL
+
+  [bottom: +/**/1]
+    expected: FAIL
+
+  [bottom: #00001]
+    expected: FAIL
+
+  [top: url(1)]
+    expected: FAIL
+
+  [bottom: #001]
+    expected: FAIL
+
+  [top: +1\\31 .5]
+    expected: FAIL
+
+  [top: -1a]
+    expected: FAIL
+
+  [top: -1A]
+    expected: FAIL
+
+  [bottom: url(1)]
+    expected: FAIL
+
+  [top: a]
+    expected: FAIL
+
+  [top: A]
+    expected: FAIL
+
+  [top: #000001]
+    expected: FAIL
+
+  [top: 1]
+    expected: FAIL
+
+  [top: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: a]
+    expected: FAIL
+
+  [bottom: 1]
+    expected: FAIL
+
+  [bottom: +1]
+    expected: FAIL
+
+  [bottom: #000001]
+    expected: FAIL
+
+  [bottom: +a]
+    expected: FAIL
+
+  [bottom: +A]
+    expected: FAIL
+
+  [top: 1.5]
+    expected: FAIL
+
+  [top: +A]
+    expected: FAIL
+
+  [top: +a]
+    expected: FAIL
+
+  [top: +1]
+    expected: FAIL
+
+  [top: -1.5]
+    expected: FAIL
+
+  [top: -1\\31 .5]
+    expected: FAIL
+
+  [top: +1a]
+    expected: FAIL
+
+  [top: +1A]
+    expected: FAIL
+
+  [top: @1a]
+    expected: FAIL
+
+  [bottom: \\31 .5]
+    expected: FAIL
+
+  [top: "a"]
+    expected: FAIL
+
+  [top: #01]
+    expected: FAIL
+
+  [bottom: +1.5]
+    expected: FAIL
+
+  [bottom: -A]
+    expected: FAIL
+
+  [bottom: -a]
+    expected: FAIL
+
+  [bottom: -1\\31 ]
+    expected: FAIL
+
+  [top: #0001]
+    expected: FAIL
+
+  [bottom: -1]
+    expected: FAIL
+
+  [top: -\\31 ]
+    expected: FAIL
+
+  [top: -A]
+    expected: FAIL
+
+  [top: -a]
+    expected: FAIL
+
+  [top: -1]
+    expected: FAIL
+
+  [top: -1\\31 ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini
new file mode 100644
index 00000000000..2ed601c6ff4
--- /dev/null
+++ b/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini
@@ -0,0 +1,283 @@
+[quirks.html]
+  [top: -\\31 .5]
+    expected: FAIL
+
+  [bottom: -1A]
+    expected: FAIL
+
+  [bottom: -1a]
+    expected: FAIL
+
+  [top: @1]
+    expected: FAIL
+
+  [top: "1a"]
+    expected: FAIL
+
+  [top: @a]
+    expected: FAIL
+
+  [bottom: "1"]
+    expected: FAIL
+
+  [bottom: -/**/1]
+    expected: FAIL
+
+  [top: +/**/1]
+    expected: FAIL
+
+  [bottom: @1a]
+    expected: FAIL
+
+  [top: 1\\31 ]
+    expected: FAIL
+
+  [top: url('1')]
+    expected: FAIL
+
+  [bottom: -\\31 ]
+    expected: FAIL
+
+  [top: calc(1)]
+    expected: FAIL
+
+  [top: \\31 ]
+    expected: FAIL
+
+  [bottom: +1\\31 ]
+    expected: FAIL
+
+  [bottom: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: #0001]
+    expected: FAIL
+
+  [top: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: 1a]
+    expected: FAIL
+
+  [bottom: A]
+    expected: FAIL
+
+  [bottom: #01]
+    expected: FAIL
+
+  [top: +\\31 .5]
+    expected: FAIL
+
+  [bottom: #1]
+    expected: FAIL
+
+  [top: -/**/1]
+    expected: FAIL
+
+  [bottom: +\\31 .5]
+    expected: FAIL
+
+  [bottom: \\31 ]
+    expected: FAIL
+
+  [bottom: calc(1)]
+    expected: FAIL
+
+  [top: #001]
+    expected: FAIL
+
+  [top: +\\31 ]
+    expected: FAIL
+
+  [bottom: +\\31 ]
+    expected: FAIL
+
+  [top: +1.5]
+    expected: FAIL
+
+  [top: +1\\31 ]
+    expected: FAIL
+
+  [bottom: @a]
+    expected: FAIL
+
+  [bottom: @1]
+    expected: FAIL
+
+  [top: #1]
+    expected: FAIL
+
+  [top: 1a]
+    expected: FAIL
+
+  [bottom: +1a]
+    expected: FAIL
+
+  [bottom: +1A]
+    expected: FAIL
+
+  [bottom: "a"]
+    expected: FAIL
+
+  [top: #00001]
+    expected: FAIL
+
+  [bottom: -1\\31 .5]
+    expected: FAIL
+
+  [top: "1"]
+    expected: FAIL
+
+  [bottom: 1.5]
+    expected: FAIL
+
+  [bottom: -\\31 .5]
+    expected: FAIL
+
+  [bottom: url('1')]
+    expected: FAIL
+
+  [bottom: -1.5]
+    expected: FAIL
+
+  [top: \\31 .5]
+    expected: FAIL
+
+  [bottom: "1a"]
+    expected: FAIL
+
+  [bottom: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: +1\\31 .5]
+    expected: FAIL
+
+  [bottom: 1\\31 ]
+    expected: FAIL
+
+  [bottom: +/**/1]
+    expected: FAIL
+
+  [bottom: #00001]
+    expected: FAIL
+
+  [top: url(1)]
+    expected: FAIL
+
+  [bottom: #001]
+    expected: FAIL
+
+  [top: +1\\31 .5]
+    expected: FAIL
+
+  [top: -1a]
+    expected: FAIL
+
+  [top: -1A]
+    expected: FAIL
+
+  [bottom: url(1)]
+    expected: FAIL
+
+  [top: a]
+    expected: FAIL
+
+  [top: A]
+    expected: FAIL
+
+  [top: #000001]
+    expected: FAIL
+
+  [top: 1]
+    expected: FAIL
+
+  [top: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: a]
+    expected: FAIL
+
+  [bottom: 1]
+    expected: FAIL
+
+  [bottom: +1]
+    expected: FAIL
+
+  [bottom: #000001]
+    expected: FAIL
+
+  [bottom: +a]
+    expected: FAIL
+
+  [bottom: +A]
+    expected: FAIL
+
+  [top: 1.5]
+    expected: FAIL
+
+  [top: +A]
+    expected: FAIL
+
+  [top: +a]
+    expected: FAIL
+
+  [top: +1]
+    expected: FAIL
+
+  [top: -1.5]
+    expected: FAIL
+
+  [top: -1\\31 .5]
+    expected: FAIL
+
+  [top: +1a]
+    expected: FAIL
+
+  [top: +1A]
+    expected: FAIL
+
+  [top: @1a]
+    expected: FAIL
+
+  [bottom: \\31 .5]
+    expected: FAIL
+
+  [top: "a"]
+    expected: FAIL
+
+  [top: #01]
+    expected: FAIL
+
+  [bottom: +1.5]
+    expected: FAIL
+
+  [bottom: -A]
+    expected: FAIL
+
+  [bottom: -a]
+    expected: FAIL
+
+  [bottom: -1\\31 ]
+    expected: FAIL
+
+  [top: #0001]
+    expected: FAIL
+
+  [bottom: -1]
+    expected: FAIL
+
+  [top: -\\31 ]
+    expected: FAIL
+
+  [top: -A]
+    expected: FAIL
+
+  [top: -a]
+    expected: FAIL
+
+  [top: -1]
+    expected: FAIL
+
+  [top: -1\\31 ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
index fc5f2d2c42b..b60d25dd60a 100644
--- a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
+++ b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
@@ -1,13 +1,4 @@
 [urlencoded-parser.any.html]
-  [request.formData() with input: a&b&c]
-    expected: FAIL
-
-  [request.formData() with input: _charset_=windows-1252&test=%C2x]
-    expected: FAIL
-
-  [response.formData() with input: a=b&c=d&]
-    expected: FAIL
-
   [response.formData() with input: _charset_=windows-1252&test=%C2x]
     expected: FAIL
 
@@ -17,6 +8,9 @@
   [response.formData() with input: a=b&c=d]
     expected: FAIL
 
+  [response.formData() with input: &&&a=b&&&&c=d&]
+    expected: FAIL
+
 
 [urlencoded-parser.any.worker.html]
   [request.formData() with input: a=b&c=d]
@@ -28,12 +22,9 @@
   [request.formData() with input: a&b&c]
     expected: FAIL
 
-  [request.formData() with input: &&&a=b&&&&c=d&]
-    expected: FAIL
-
   [request.formData() with input: _charset_=windows-1252&test=%C2x]
     expected: FAIL
 
-  [response.formData() with input: a=b&c=d]
+  [response.formData() with input: a&b&c]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/wasm/webapi/idlharness.any.js.ini b/tests/wpt/metadata/wasm/webapi/idlharness.any.js.ini
new file mode 100644
index 00000000000..cb08bb48507
--- /dev/null
+++ b/tests/wpt/metadata/wasm/webapi/idlharness.any.js.ini
@@ -0,0 +1,39 @@
+[idlharness.any.html]
+  [WebAssembly namespace: operation validate(BufferSource)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation compileStreaming([object Object\])]
+    expected: FAIL
+
+  [WebAssembly namespace: operation compile(BufferSource)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiateStreaming([object Object\], object)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiate(BufferSource, object)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiate(Module, object)]
+    expected: FAIL
+
+
+[idlharness.any.worker.html]
+  [WebAssembly namespace: operation validate(BufferSource)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation compileStreaming([object Object\])]
+    expected: FAIL
+
+  [WebAssembly namespace: operation compile(BufferSource)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiateStreaming([object Object\], object)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiate(BufferSource, object)]
+    expected: FAIL
+
+  [WebAssembly namespace: operation instantiate(Module, object)]
+    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/web-platform-tests/background-fetch/abort.https.window.js b/tests/wpt/web-platform-tests/background-fetch/abort.https.window.js
index db01bf94b85..b699406a144 100644
--- a/tests/wpt/web-platform-tests/background-fetch/abort.https.window.js
+++ b/tests/wpt/web-platform-tests/background-fetch/abort.https.window.js
@@ -45,15 +45,30 @@ backgroundFetchTest(async (test, backgroundFetch) => {
 
       assert_equals(type, 'backgroundfetchabort');
 
+      assert_equals(results.length, 2);
+
+      const completedResult = results[0] || results[1];
       // The abort might have gone through before the first result was persisted.
-      if (results.length === 1) {
-        assert_true(results[0].url.includes('resources/feature-name.txt'));
-        assert_equals(results[0].status, 200);
-        assert_equals(results[0].text, expectedResultText);
+      if (completedResult) {
+        assert_true(completedResult.url.includes('resources/feature-name.txt'));
+        assert_equals(completedResult.status, 200);
+        assert_equals(completedResult.text, expectedResultText);
       }
 
       resolve();
     };
   });
 
-}, 'Calling BackgroundFetchRegistration.abort sets the correct fields and responses are still available');
\ No newline at end of file
+}, 'Calling BackgroundFetchRegistration.abort sets the correct fields and responses are still available');
+
+backgroundFetchTest(async (test, backgroundFetch) => {
+  const registration = await backgroundFetch.fetch(
+      uniqueId(), '/serviceworker/resources/slow-response.php');
+  assert_true(await registration.abort());
+
+  const {results} = await getMessageFromServiceWorker();
+  assert_equals(results.length, 1);
+  assert_false(results[0].response);
+  assert_equals(results[0].name, 'AbortError');
+
+}, 'An aborted fetch throws a DOM exception when accessing an incomplete record', 'sw-abort.js');
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js b/tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js
index 9ed7e94da3b..c5fa18725a5 100644
--- a/tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js
+++ b/tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js
@@ -265,8 +265,8 @@ backgroundFetchTest(async (test, backgroundFetch) => {
 
 backgroundFetchTest(async (test, backgroundFetch) => {
   const registration = await backgroundFetch.fetch(
-                         'my-id',
-                         ['https://example.com', 'http://example.com']);
+      'my-id',
+      [location.origin, location.origin.replace('https', 'http')]);
 
   const {type, eventRegistration, results} = await getMessageFromServiceWorker();
 
@@ -274,7 +274,11 @@ backgroundFetchTest(async (test, backgroundFetch) => {
   assert_equals(eventRegistration.failureReason, 'fetch-error');
 
   assert_equals(results.length, 2);
-  assert_true(results[0].url.includes('https://example.com'));
-  assert_equals(results[1].url, '');
+
+  const validResponse = results[0] ? results[0] : results[1];
+  const nullResponse = !results[0] ? results[0] : results[1];
+
+  assert_true(validResponse.url.includes(location.origin));
+  assert_equals(nullResponse, null);
 
 }, 'Fetches with mixed content should fail.');
diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js b/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js
new file mode 100644
index 00000000000..c61377758df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js
@@ -0,0 +1,23 @@
+importScripts('sw-helpers.js');
+
+async function getFetchResult(record) {
+  try {
+    await record.responseReady;
+  } catch (e) {
+    return {
+      response: false,
+      name: e.name,
+    };
+  }
+
+  return {
+    response: true,
+  };
+}
+self.addEventListener('backgroundfetchabort', event => {
+  event.waitUntil(
+    event.registration.matchAll()
+      .then(records =>
+            Promise.all(records.map(record => getFetchResult(record))))
+      .then(results => sendMessageToDocument({results})));
+});
diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js b/tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js
index 2e3fbfff1a8..1c4fb10f052 100644
--- a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js
+++ b/tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js
@@ -2,9 +2,8 @@
 importScripts('sw-helpers.js');
 
 async function getFetchResult(record) {
-  response = await record.responseReady;
-  if (!response)
-    return Promise.resolve(null);
+  const response = await record.responseReady.catch(() => null);
+  if (!response) return null;
 
   return {
     url: response.url,
@@ -13,7 +12,7 @@ async function getFetchResult(record) {
   };
 }
 
-function handleBackgroundFetchUpdateEvent(event) {
+function handleBackgroundFetchEvent(event) {
   event.waitUntil(
     event.registration.matchAll()
       .then(records =>
@@ -25,6 +24,6 @@ function handleBackgroundFetchUpdateEvent(event) {
       }));
 }
 
-self.addEventListener('backgroundfetchsuccess', handleBackgroundFetchUpdateEvent);
-self.addEventListener('backgroundfetchfail', handleBackgroundFetchUpdateEvent);
-self.addEventListener('backgroundfetchabort', handleBackgroundFetchUpdateEvent);
+self.addEventListener('backgroundfetchsuccess', handleBackgroundFetchEvent);
+self.addEventListener('backgroundfetchfail', handleBackgroundFetchEvent);
+self.addEventListener('backgroundfetchabort', handleBackgroundFetchEvent);
diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html b/tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html
new file mode 100644
index 00000000000..b083ed8a500
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance of CSS Exclusions properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-exclusions/#property-index">
+<meta name="assert" content="Properties do not inherit.">
+<meta name="assert" content="Properties have initial values according to the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+assert_not_inherited('wrap-flow', 'auto', 'both');
+assert_not_inherited('wrap-through', 'wrap', 'none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html
new file mode 100644
index 00000000000..c6e93029f10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;angle&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '100deg', to: '200deg',
+        name: '--prop', syntax: '<angle>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 150deg]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html
new file mode 100644
index 00000000000..cfa9a618a1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;color&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: 'rgb(128, 100, 200)', to: 'red',
+        name: '--prop', syntax: '<color>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSStyleValue rgb(192, 50, 100)]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html
new file mode 100644
index 00000000000..314d0c082ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;integer&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '32', to: '64',
+        name: '--prop', syntax: '<integer>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 48]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html
new file mode 100644
index 00000000000..1596a934b39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;length-percentage&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '10px', to: '20%',
+        name: '--prop', syntax: '<length-percentage>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSMathSum calc(5px + 10%)]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html
new file mode 100644
index 00000000000..807a0509289
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;length&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      target.style.setProperty('font-size', '10px');
+
+      registerAndInterpolateProperty({
+        on: target, from: '10px', to: '20px',
+        name: '--prop-1', syntax: '<length>'
+      });
+
+      registerAndInterpolateProperty({
+        on: target, from: '100px', to: '20em',
+        name: '--prop-2', syntax: '<length>'
+      });
+
+      expectWorkletValues(target, {
+        '--prop-1': '[CSSUnitValue 15px]',
+        '--prop-2': '[CSSUnitValue 150px]'
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html
new file mode 100644
index 00000000000..45859a514a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;number&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '8.5', to: '16.5',
+        name: '--prop', syntax: '<number>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 12.5]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html
new file mode 100644
index 00000000000..b3f4f1f1bba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;percentage&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '40%', to: '60%',
+        name: '--prop', syntax: '<percentage>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 50%]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html
new file mode 100644
index 00000000000..45eb9096081
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;resolution&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '100dppx', to: '900dppx',
+        name: '--prop', syntax: '<resolution>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 500dppx]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html
new file mode 100644
index 00000000000..e45881244b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated &lt;time&gt; values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '42s', to: '62s',
+        name: '--prop', syntax: '<time>'
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 52s]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html
new file mode 100644
index 00000000000..d4d1b038e24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Interpolated list values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      registerAndInterpolateProperty({
+        on: target, from: '10px 20px', to: '20px 30px',
+        name: '--prop-1', syntax: '<length>+'
+      });
+
+      registerAndInterpolateProperty({
+        on: target, from: '10px', to: '20px',
+        name: '--prop-2', syntax: '<length>+'
+      });
+
+      expectWorkletValues(target, {
+        '--prop-1': ['[CSSUnitValue 15px]', '[CSSUnitValue 25px]'],
+        '--prop-2': '[CSSUnitValue 15px]'
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html
new file mode 100644
index 00000000000..2305afb37df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Test styleMap functions</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<style>
+  #target {
+    width: 100px;
+    height: 100px;
+    background: paint(style-map);
+  }
+</style>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<length>+',
+        initialValue: '10px 10px 10px 10px',
+        inherits: false
+      });
+
+      const worklet = `
+        registerPaint('style-map', class {
+          static get inputProperties() { return ['--prop']; }
+          paint(ctx, geom, styleMap) {
+            let serialize = (v) => '[' + v.constructor.name + ' ' + v.toString() + ']';
+            let expected = '[CSSUnitValue 10px]';
+            let isExpected = x => serialize(x) === expected;
+
+            let pass = true;
+
+            pass &= styleMap.has('--prop');
+            pass &= isExpected(styleMap.get('--prop'));
+            pass &= styleMap.getAll('--prop').length == 4;
+            pass &= styleMap.getAll('--prop').every(isExpected);
+            pass &= Array.from(styleMap).filter(e => e[0] == '--prop')[0][1].length == 4;
+            pass &= Array.from(styleMap).filter(e => e[0] == '--prop')[0][1].every(isExpected);
+
+            ctx.strokeStyle = pass ? 'green' : 'red';
+            ctx.lineWidth = 4;
+            ctx.strokeRect(0, 0, geom.width, geom.height);
+          }
+        });`
+
+        importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, worklet);
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-type.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-type.https.html
deleted file mode 100644
index 8f02008333c..00000000000
--- a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-type.https.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="/common/worklet-reftest.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-<script id="code" type="text/worklet">
-  // Globals that must be prepended to this script:
-  // - debugLog: A function that logs errors.
-  // - props: Test data.
-
-  registerPaint('geometry', class {
-    static get inputProperties() { return props.map(p => p.name); }
-
-    paint(ctx, geom, styleMap) {
-      ctx.strokeStyle = 'green';
-      for (let prop of props) {
-        // Read values using get, getAll and iterator:
-        let valueFromGet = styleMap.get(prop.name);
-        let valueFromGetAll = styleMap.getAll(prop.name);
-        let valueFromIterator = Array.from(styleMap).filter(e => e[0] == prop.name)[0][1];
-
-        // Serialize 'actual'-values for all three cases:
-        let serialize = v => v.constructor.name + '=' + v.toString()
-        let actualFromGet = serialize(valueFromGet);
-        let actualFromGetAll = valueFromGetAll.map(serialize).join(',');
-        let actualFromIterator = valueFromIterator.map(serialize).join(',');
-
-        // Create 'expected'-values for all three cases:
-        let expectedForGet = prop.expected[0];
-        let expectedForGetAll = prop.expected.join(',');
-        let expectedForIterator = expectedForGetAll;
-
-        let pass = true;
-
-        // Assertions:
-        if (actualFromGet !== expectedForGet) {
-          debugLog(`FAIL: StylePropertyMap.get: actual: ${actualFromGet}  expected: ${expectedForGet}`);
-          pass = false;
-        }
-        if (actualFromGetAll !== expectedForGetAll) {
-          debugLog(`FAIL: StylePropertyMap.getAll: actual: ${actualFromGetAll}  expected: ${expectedForGetAll}`);
-          pass = false;
-        }
-        if (actualFromIterator !== expectedForIterator) {
-          debugLog(`FAIL: StylePropertyMap iterator: actual: ${actualFromIterator}  expected: ${expectedForIterator}`);
-          pass = false;
-        }
-
-        if (!pass)
-          ctx.strokeStyle = 'red';
-        else
-          debugLog('PASS', prop.syntax, actualFromGetAll, expectedForGetAll);
-      }
-      ctx.lineWidth = 4;
-      ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-  });
-</script>
-<script>
-    // A copy of this array (automatically enriched with 'name' and 'expected')
-    // is also available in the worklet.
-    let props = [
-      // Initial values.
-      { syntax: '*', initialValue: 'if(){}' },
-      { syntax: '<angle>', initialValue: '42deg' },
-      { syntax: '<color>', initialValue: '#fefefe' },
-      { syntax: '<custom-ident>', initialValue: 'none' },
-      { syntax: '<image>', initialValue: 'linear-gradient(red, red)' },
-      { syntax: '<image>', initialValue: 'url(http://a.com/a)' },
-      { syntax: '<integer>', initialValue: '42' },
-      { syntax: '<length-percentage>', initialValue: '10%' },
-      { syntax: '<length-percentage>', initialValue: '10px' },
-      { syntax: '<length-percentage>', initialValue: 'calc(10px + 10%)' },
-      { syntax: '<length>', initialValue: '1337px' },
-      { syntax: '<number>', initialValue: '42.5' },
-      { syntax: '<percentage>', initialValue: '42%' },
-      { syntax: '<resolution>', initialValue: '300dpi' },
-      { syntax: '<time>', initialValue: '3600s' },
-      { syntax: '<url>', initialValue: 'url(http://a.com/a)' },
-      { syntax: 'thing', initialValue: 'thing' },
-      { syntax: '<length> | <angle>', initialValue: '1337px' },
-      { syntax: '<angle> | <image>', initialValue: '1turn' },
-      { syntax: '<length>+', initialValue: '1337px' },
-      { syntax: '<length>+', initialValue: '1337px 1338px', count: 2 },
-      { syntax: '<length>#', initialValue: '1337px' },
-      { syntax: '<length>#', initialValue: '1337px, 1338px', count: 2 },
-
-      // Non-initial values:
-      { syntax: '*', initialValue: 'fail', value: 'if(){}' },
-      { syntax: '<angle> | fail', initialValue: 'fail', value: '42deg' },
-      { syntax: '<color> | fail', initialValue: 'fail', value: '#fefefe' },
-      { syntax: '<custom-ident> | fail', initialValue: 'fail', value: 'none' },
-      { syntax: '<image> | fail', initialValue: 'fail', value: 'linear-gradient(red, red)' },
-      { syntax: '<image> | fail', initialValue: 'fail', value: 'url(http://a.com/a)' },
-      { syntax: '<integer> | fail', initialValue: 'fail', value: '42' },
-      { syntax: '<length-percentage> | fail', initialValue: 'fail', value: '10%' },
-      { syntax: '<length-percentage> | fail', initialValue: 'fail', value: '10px' },
-      { syntax: '<length-percentage> | fail', initialValue: 'fail', value: 'calc(10px + 10%)' },
-      { syntax: '<length> | fail', initialValue: 'fail', value: '1337px' },
-      { syntax: '<number> | fail', initialValue: 'fail', value: '42.5' },
-      { syntax: '<percentage> | fail', initialValue: 'fail', value: '42%' },
-      { syntax: '<resolution> | fail', initialValue: 'fail', value: '300dpi' },
-      { syntax: '<time> | fail', initialValue: 'fail', value: '3600s' },
-      { syntax: '<url> | fail', initialValue: 'fail', value: 'url(http://a.com/a)' },
-      { syntax: 'thing | fail', initialValue: 'fail', value: 'thing' },
-      { syntax: '<length>+ | fail', initialValue: 'fail', value: '1337px' },
-      { syntax: '<length>+ | fail', initialValue: 'fail', value: '1337px 1338px', count: 2 },
-      { syntax: '<length># | fail', initialValue: 'fail', value: '1337px' },
-      { syntax: '<length># | fail', initialValue: 'fail', value: '1337px, 1338px', count: 2 },
-    ];
-
-    try {
-      let target = document.getElementById('canvas-geometry');
-      let pid = 1;
-
-      for (let p of props) {
-        p.name = `--prop-${++pid}`;
-
-        CSS.registerProperty({
-          name: p.name,
-          syntax: p.syntax,
-          initialValue: p.initialValue,
-          inherits: (typeof p.inherits !== 'undefined') ? p.inherits : false
-        });
-
-        if (typeof p.value !== 'undefined')
-          target.style.setProperty(p.name, p.value);
-        if (typeof p.count === 'undefined')
-          p.count = 1;
-
-        let getValue = p => (typeof p.value !== 'undefined') ? p.value : p.initialValue;
-        let serialize = v => v.constructor.name + '=' + v.toString();
-
-        let parse = function (p) {
-          if (p.count == 1)
-            return [CSSStyleValue.parse(p.name, getValue(p))];
-          return CSSStyleValue.parseAll(p.name, getValue(p));
-        };
-
-        // Generate expected value. We assume that CSSStyleValue.parse/All
-        // returns the correct CSSStyleValue subclass and value.
-        p.expected = parse(p).map(serialize);
-      }
-
-      // Adding '?debug' to the URL will cause this test to emit
-      // test results to console.log.
-      let debugMode = document.location.href.endsWith('?debug');
-      let code = [
-        `const props = ${JSON.stringify(props)};`,
-        `const debugLog = ${debugMode ? 'console.log' : 'function(){}'};`,
-        document.getElementById('code').textContent
-      ].join('\n');
-
-      importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, code);
-    } catch(e) {
-      document.body.textContent = e;
-      takeScreenshot();
-    }
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html
new file mode 100644
index 00000000000..f915dacb168
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Initial values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<length>',
+        initialValue: '42px',
+        inherits: false
+      });
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 42px]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html
new file mode 100644
index 00000000000..7d62b0b2f65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Inherited values reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="outer">
+  <div id="target"></div>
+</div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<length>',
+        initialValue: '0px',
+        inherits: true
+      });
+
+      outer.style.setProperty('--prop', '13px');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 13px]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html
new file mode 100644
index 00000000000..b22f18dde7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of *-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '*',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'if(){}');
+
+      expectWorkletValue(target, '--prop', '[CSSUnparsedValue if(){}]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html
new file mode 100644
index 00000000000..d67603f9fe8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;angle&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<angle>',
+        initialValue: '0deg',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '100deg');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 100deg]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html
new file mode 100644
index 00000000000..71cda9a3766
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;color&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<color>',
+        initialValue: 'black',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'rgb(1, 2, 3)');
+
+      expectWorkletValue(target, '--prop', '[CSSStyleValue rgb(1, 2, 3)]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html
new file mode 100644
index 00000000000..aa03edf25f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;custom-ident&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<custom-ident>',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'foo');
+
+      expectWorkletValue(target, '--prop', '[CSSKeywordValue foo]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html
new file mode 100644
index 00000000000..61256cd11cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;image&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop-1',
+        syntax: '<image> | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-2',
+        syntax: '<image> | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop-1', 'url("http://a/")');
+      target.style.setProperty('--prop-2', 'linear-gradient(red, red)');
+
+      expectWorkletValues(target, {
+        '--prop-1': ['[CSSImageValue url("http://a/")]'],
+        '--prop-2': ['[CSSStyleValue linear-gradient(red, red)]'],
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html
new file mode 100644
index 00000000000..06a18bd022c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;integer&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<integer>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '5');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 5]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html
new file mode 100644
index 00000000000..795770f9a2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;length-percentage&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop-1',
+        syntax: '<length-percentage>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-2',
+        syntax: '<length-percentage>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-3',
+        syntax: '<length-percentage>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop-1', '10%');
+      target.style.setProperty('--prop-2', '10px');
+      target.style.setProperty('--prop-3', 'calc(10px + 10%)');
+
+      expectWorkletValues(target, {
+        '--prop-1': ['[CSSUnitValue 10%]'],
+        '--prop-2': ['[CSSUnitValue 10px]'],
+        '--prop-3': ['[CSSMathSum calc(10px + 10%)]'],
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html
new file mode 100644
index 00000000000..53aef81e8e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;length&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop-1',
+        syntax: '<length>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-2',
+        syntax: '<length>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      target.style.setProperty('font-size', '20px');
+      target.style.setProperty('--prop-1', '100px');
+      target.style.setProperty('--prop-2', '10em');
+
+      expectWorkletValues(target, {
+        '--prop-1': ['[CSSUnitValue 100px]'],
+        '--prop-2': ['[CSSUnitValue 200px]']
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html
new file mode 100644
index 00000000000..d5dc351f7fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;number&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<number>',
+        initialValue: '0',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '2.5');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 2.5]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html
new file mode 100644
index 00000000000..827877a51c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;percentage&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<percentage>',
+        initialValue: '0%',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '33%');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 33%]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html
new file mode 100644
index 00000000000..e37cd556f80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;resolution&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<resolution>',
+        initialValue: '0dppx',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '300dppx');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 300dppx]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html
new file mode 100644
index 00000000000..f42160fabe1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;time&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<time>',
+        initialValue: '0s',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', '10s');
+
+      expectWorkletValue(target, '--prop', '[CSSUnitValue 10s]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html
new file mode 100644
index 00000000000..5b00b53c2a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of &lt;url&gt;-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: '<url> | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'url("http://a/")');
+
+      expectWorkletValue(target, '--prop', '[CSSStyleValue url("http://a/")]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html
new file mode 100644
index 00000000000..1ec2e1b5ab0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of ident-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: 'foo | bar | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'bar');
+
+      expectWorkletValue(target, '--prop', '[CSSKeywordValue bar]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html
new file mode 100644
index 00000000000..1ec2e1b5ab0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of ident-properties reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop',
+        syntax: 'foo | bar | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop', 'bar');
+
+      expectWorkletValue(target, '--prop', '[CSSKeywordValue bar]');
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html
new file mode 100644
index 00000000000..6be2cb8a228
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Values of lists reach worklet</title>
+<link rel="help" href="https://www.w3.org/TR/css-paint-api-1/#examples">
+<link rel="match" href="parse-input-arguments-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<script src="./resources/utils.js"></script>
+<body>
+<div id="target"></div>
+<script>
+    try {
+      CSS.registerProperty({
+        name: '--prop-1',
+        syntax: '<length>+ | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-2',
+        syntax: '<length># | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      CSS.registerProperty({
+        name: '--prop-3',
+        syntax: '<length># | none',
+        initialValue: 'none',
+        inherits: false
+      });
+
+      target.style.setProperty('--prop-1', '8px 16px');
+      target.style.setProperty('--prop-2', '8px, 16px');
+      target.style.setProperty('--prop-3', '8px');
+
+      expectWorkletValues(target, {
+        '--prop-1': ['[CSSUnitValue 8px]', '[CSSUnitValue 16px]'],
+        '--prop-2': ['[CSSUnitValue 8px]', '[CSSUnitValue 16px]'],
+        '--prop-3': ['[CSSUnitValue 8px]'],
+      });
+    } catch(e) {
+      document.body.textContent = e;
+      takeScreenshot();
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js b/tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js
new file mode 100644
index 00000000000..7efe85f2603
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js
@@ -0,0 +1,59 @@
+
+// Register a property, and interpolate its value to the halfway point.
+function registerAndInterpolateProperty(options) {
+  CSS.registerProperty({
+    name: options.name,
+    syntax: `${options.syntax} | none`,
+    initialValue: 'none',
+    inherits: false
+  });
+  let animation = options.on.animate([
+    { [options.name]: options.from },
+    { [options.name]: options.to }
+  ], 1000);
+  animation.currentTime = 500;
+  animation.pause();
+}
+
+// Apply a paint worklet to 'target' which verifies that the worklet-side value
+// of a set of properties is what we expect.
+//
+// The 'expected' parameter is an object where each key is the name of a
+// property to check, and each corresponding value is an array with the expected
+// (serialized) values for that property.
+function expectWorkletValues(target, expected) {
+  const workletName = 'registered-property-value';
+
+  // Wrap any single values in an array. This makes it possible to omit the
+  // array if there is only one value.
+  const ensureArray = x => x.constructor === Array ? x : [x];
+  expected = Object.entries(expected).map(([k, v]) => [k, ensureArray(v)])
+                                     .map(x => ({[x[0]]: x[1]}))
+                                     .reduce((a, b) => Object.assign(a, b), {});
+
+  target.style.setProperty('width', '100px');
+  target.style.setProperty('height', '100px');
+  target.style.setProperty('background-image', `paint(${workletName})`);
+
+  const worklet = `
+    const expectedData = ${JSON.stringify(expected)};
+    const expectedKeys = Object.keys(expectedData).sort();
+    registerPaint('${workletName}', class {
+      static get inputProperties() { return expectedKeys; }
+      paint(ctx, geom, styleMap) {
+        let serialize = (v) => '[' + v.constructor.name + ' ' + v.toString() + ']';
+        let actual = expectedKeys.map(k => styleMap.getAll(k).map(serialize).join(', ')).join(' | ');
+        let expected = expectedKeys.map(k => expectedData[k].join(', ')).join(' | ');
+        ctx.strokeStyle = (actual === expected) ? 'green' : 'red';
+        ctx.lineWidth = 4;
+        ctx.strokeRect(0, 0, geom.width, geom.height);
+      }
+    });`
+
+  importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, worklet);
+}
+
+// Like expectWorkletValues, but can only test a single property.
+function expectWorkletValue(target, property, expected) {
+  expectWorkletValues(target, { [property]: expected });
+}
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html
index 15a4ab6040e..c0bebb07da6 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html
@@ -55,6 +55,10 @@ assert_valid("<number>", "-109");
 assert_valid("<number>", "2.3e4");
 assert_valid("<integer>", "-109");
 assert_valid("<integer>", "19");
+assert_valid("<integer>", "calc(1)");
+assert_valid("<integer>", "calc(1 + 2)");
+assert_valid("<integer>", "calc(3.1415)");
+assert_valid("<integer>", "calc(3.1415 + 3.1415)");
 
 assert_valid("<angle>", "10deg");
 assert_valid("<angle>", "20.5rad");
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html
index cbcc0bea64d..1651295cba4 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html
@@ -111,5 +111,17 @@ for (let element of [divWithFontSizeSet, divWithFontSizeInherited]) {
         assert_computed_value('<transform-function>', 'translateX(calc(11em + 10%))', 'translateX(calc(110px + 10%))');
         assert_computed_value('<transform-function>+', 'translateX(10%) scale(2)', 'translateX(10%) scale(2)');
     }, "<transform-function> values are computed correctly for " + id);
+
+    test(function() {
+        assert_computed_value('<integer>', '15', '15');
+        assert_computed_value('<integer>', 'calc(15 + 15)', '30');
+        assert_computed_value('<integer>', 'calc(2.4)', '2');
+        assert_computed_value('<integer>', 'calc(2.6)', '3');
+        assert_computed_value('<integer>', 'calc(2.6 + 3.1)', '6');
+    }, "<integer> values are computed correctly for " + id);
+
+    test(function() {
+        assert_computed_value('<integer>+', '15 calc(2.4) calc(2.6)', '15 2 3');
+    }, "<integer>+ values are computed correctly for " + id);
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.tentative.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.tentative.html
index 0255b8f7a2d..0da972067b7 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.tentative.html
@@ -382,8 +382,8 @@ test_style_property_map_set({
 test_style_property_map_set({
     syntax: '<integer>',
     initialValue: '0',
-    shouldAccept: [CSS.number(1), CSS.number(-42), '1', '-42'],
-    shouldReject: [unparsed('42'), CSS.px(100), '50px', [CSS.number(42), '42']],
+    shouldAccept: [CSS.number(1), CSS.number(-42), '1', '-42', 'calc(2.4)'],
+    shouldReject: [unparsed('42'), CSS.px(100), '50px', [CSS.number(42), '42'], 'calc(2px + 1px)'],
 });
 
 test_style_property_map_set({
@@ -482,8 +482,8 @@ test_style_property_map_set({
 test_style_property_map_set({
     syntax: '<integer>+',
     initialValue: '0',
-    shouldAccept: [CSS.number(42), [CSS.number(42), '42'], '42 42'],
-    shouldReject: [[CSS.number(42), keyword('noint')], '42 noint'],
+    shouldAccept: [CSS.number(42), [CSS.number(42), '42'], '42 42', 'calc(2.4) calc(2.6)'],
+    shouldReject: [[CSS.number(42), keyword('noint')], '42 noint', 'calc(2px + 2px)'],
 });
 
 test_style_property_map_set({
diff --git a/tests/wpt/web-platform-tests/css/css-regions/inheritance.html b/tests/wpt/web-platform-tests/css/css-regions/inheritance.html
new file mode 100644
index 00000000000..865a1b6b1c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-regions/inheritance.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance of CSS Regions properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-regions/#property-index">
+<meta name="assert" content="Properties inherit or not according to the spec.">
+<meta name="assert" content="Properties have initial values according to the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+assert_not_inherited('flow-from', 'none', 'foo');
+assert_not_inherited('flow-into', 'none', 'bar');
+assert_not_inherited('region-fragment', 'auto', 'break');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html b/tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html
new file mode 100644
index 00000000000..6daa635fa62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<title>CSS Test: Invalidation of :host selectors</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#host-selector">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1499603">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host" style="color: green"></div>
+<script>
+host.attachShadow({ mode: "open" }).innerHTML = `
+  <style>
+    :host { color: red !important }
+  </style>
+`;
+test(function() {
+  assert_equals(getComputedStyle(host).color, "rgb(255, 0, 0)");
+  host.shadowRoot.querySelector("style").remove();
+  assert_equals(getComputedStyle(host).color, "rgb(0, 128, 0)");
+}, ":host rules are properly invalidated when stylesheets are removed");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html
new file mode 100644
index 00000000000..035d4ffd2e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance of CSS Scroll Anchoring properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/#property-index">
+<meta name="assert" content="overflow-anchor does not inherit.">
+<meta name="assert" content="overflow-anchor has initial value 'none'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+assert_not_inherited('overflow-anchor', 'auto', 'none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html
index 5b3bc918d15..eebe7dacb49 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html
@@ -4,7 +4,10 @@
 <title>CSS Text Test reference</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <style>
-div { padding-left: 50px; }
+div {
+  padding-left: 50px;
+  font-family: Ahem;
+}
 </style>
 
 <p>Test passes if there is a single black X below and no red.
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html
index 65969260c5e..1c0a33ba942 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html
@@ -13,6 +13,7 @@ section, div {
   border-right: 10px solid white;
   margin-right: 10px;
   padding-right: 10px;
+  font-family: Ahem;
 }
 div {
   box-sizing: border-box;
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html
index f81390da873..9f41e5b080d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html
@@ -13,6 +13,7 @@ section, div {
   border-right: 10px solid white;
   margin-right: 10px;
   padding-right: 10px;
+  font-family: Ahem;
 }
 div {
   box-sizing: border-box;
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html
index 73f4c219558..4d1dff10be5 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html
@@ -13,6 +13,7 @@ section, div {
   border-right: 10px solid white;
   margin-right: 10px;
   padding-right: 10px;
+  font-family: Ahem;
 }
 div {
   box-sizing: border-box;
diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html b/tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html
new file mode 100644
index 00000000000..b01844aea5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: will-change: style changes are properly propagated to children if needed</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1499991">
+<link rel="help" href="https://drafts.csswg.org/css-will-change/#will-change">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="outer">
+  <div id="inner" style="will-change: inherit"></div>
+</div>
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(outer).willChange, "auto");
+    assert_equals(getComputedStyle(inner).willChange, "auto");
+    outer.style.willChange = "color";
+    assert_equals(getComputedStyle(outer).willChange, "color");
+    assert_equals(getComputedStyle(inner).willChange, "color");
+  }, "will-change change is properly propagated to children if needed");
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json b/tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json
index 4311f59330b..be1d1e74cf5 100644
--- a/tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json
+++ b/tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json
@@ -116,7 +116,7 @@
    "unknown/unknown",
    [88, 32, 88]],
   ["data:text/plain;a=\",\",X",
-   "text/plain",
+   "text/plain;a=\"\"",
    [34, 44, 88]],
   ["data:text/plain;a=%2C,X",
    "text/plain;a=%2C",
diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-idl-attribute/getter-tests.js b/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-idl-attribute/getter-tests.js
index 976d6d6bcef..5139ec97b05 100644
--- a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-idl-attribute/getter-tests.js
+++ b/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-idl-attribute/getter-tests.js
@@ -58,6 +58,15 @@ testText("<div>abc <span style='display:inline-block'></span> def", "abc  def",
 testText("<div>abc <span style='display:inline-block'> def </span> ghi", "abc def ghi", "Trailing space at end of inline-block should be collapsed");
 testText("<div><input> <div>abc</div>", "abc", "Whitespace between <input> and block should be collapsed");
 testText("<div><span style='inline-block'></span> <div>abc</div>", "abc", "Whitespace between inline-block and block should be collapsed");
+testText("<div>abc <img> def", "abc  def", "Whitespace around <img> should not be collapsed");
+testText("<div>abc <img width=1 height=1> def", "abc  def", "Whitespace around <img> should not be collapsed");
+testText("<div><img> abc", " abc", "Leading whitesapce should not be collapsed");
+testText("<div>abc <img>", "abc ", "Trailing whitesapce should not be collapsed");
+testText("<div>abc <b></b> def", "abc def", "Whitespace around empty span should be collapsed");
+testText("<div>abc <b><i></i></b> def", "abc def", "Whitespace around empty spans should be collapsed");
+testText("<div><canvas></canvas> abc", " abc", "<canvas> should not collapse following space");
+testText("<div>abc <img style='display:block'> def", "abc\ndef", "Replaced element <img> with display:block should be treated as block-level");
+testText("<div>abc <canvas style='display:block'></canvas> def", "abc\ndef", "Replaced element <canvas> with display:block should be treated as block-level");
 
 /**** Soft line breaks ****/
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html
index ff0990df6ba..29f97e3e3f4 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html
@@ -5,25 +5,24 @@
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
-var t = async_test('activation occurs after registration');
-t.step(function() {
+promise_test(function(t) {
     var scope = 'resources/blank.html';
     var registration;
 
-    service_worker_unregister_and_register(
+    return service_worker_unregister_and_register(
         t, 'resources/empty-worker.js', scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           assert_equals(
               r.installing.state,
               'installing',
               'worker should be in the "installing" state upon registration');
           return wait_for_state(t, r.installing, 'activated');
-        })
-      .then(function() {
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
-});
+        });
+}, 'activation occurs after registration');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/appcache-ordering-main.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/appcache-ordering-main.https.html
index 609d67e4504..921dae015cb 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/appcache-ordering-main.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/appcache-ordering-main.https.html
@@ -60,8 +60,8 @@ function is_appcached() {
   });
 }
 
-async_test(function(t) {
-    service_worker_unregister(t, SERVICE_WORKER_SCOPE)
+promise_test(function(t) {
+    return service_worker_unregister(t, SERVICE_WORKER_SCOPE)
       .then(function() {
           return install_appcache();
         })
@@ -74,6 +74,10 @@ async_test(function(t) {
               t, SERVICE_WORKER_SCRIPT, SERVICE_WORKER_SCOPE);
         })
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SERVICE_WORKER_SCOPE);
+            });
+
           return wait_for_state(t, r.installing, 'activated');
         })
       .then(function() {
@@ -82,9 +86,7 @@ async_test(function(t) {
       .then(function(result) {
           assert_false(result, 'but serviceworkers should take priority');
           frames.forEach(function(f) { f.remove(); });
-          service_worker_unregister_and_done(t, SERVICE_WORKER_SCOPE);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'serviceworkers take priority over appcaches');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html
index a53c10c9691..b93b3418999 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html
@@ -4,15 +4,17 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-var test;
 var scope = 'resources/blank.html?client-id';
 var frame1, frame2;
 
-async_test(function(t) {
-    test = t;
-    service_worker_unregister_and_register(
+promise_test(function(t) {
+    return service_worker_unregister_and_register(
         t, 'resources/client-id-worker.js', scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(scope + '#1'); })
@@ -25,11 +27,15 @@ async_test(function(t) {
       .then(function(f) {
           frame2 = f;
           var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(on_message);
-          f.contentWindow.navigator.serviceWorker.controller.postMessage(
-              {port:channel.port2}, [channel.port2]);
+
+          return new Promise(function(resolve, reject) {
+              channel.port1.onmessage = resolve;
+              channel.port1.onmessageerror = reject;
+              f.contentWindow.navigator.serviceWorker.controller.postMessage(
+                  {port:channel.port2}, [channel.port2]);
+            });
         })
-      .catch(unreached_rejection(t));
+      .then(on_message);
   }, 'Client.id returns the client\'s ID.');
 
 function on_message(e) {
@@ -50,6 +56,5 @@ function on_message(e) {
   assert_equals(e.data[1], e.data[3]);
   frame1.remove();
   frame2.remove();
-  service_worker_unregister_and_done(test, scope);
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html
index ee60c4a6077..a61c8af7019 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html
@@ -5,7 +5,6 @@
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 const scope = 'resources/blank.html?clients-matchAll';
-const t = async_test('Test Clients.matchAll() with exact controller');
 let frames = [];
 
 function checkWorkerClients(worker, expected) {
@@ -33,10 +32,12 @@ let expected = [
     ['visible', false, new URL(scope + '#2', location).toString(), 'window', 'nested']
 ];
 
-t.step(_ => {
+promise_test(t => {
     let script = 'resources/clients-matchall-worker.js';
-    service_worker_unregister_and_register(t, script, scope)
+    return service_worker_unregister_and_register(t, script, scope)
       .then(registration => {
+          t.add_cleanup(() => service_worker_unregister(t, scope));
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(_ => with_iframe(scope + '#1') )
@@ -61,8 +62,6 @@ t.step(_ => {
         })
       .then(_ => {
           frames.forEach(f => f.remove() );
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
-  });
+        });
+}, 'Test Clients.matchAll() with exact controller');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
index 50bd817f568..210cbb04212 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
@@ -67,12 +67,16 @@ function test_matchall(frame, expected, query_options) {
 }
 
 // Run clients.matchAll without and with includeUncontrolled=true.
-// (We want to run the two tests sequentially in the same async_test
+// (We want to run the two tests sequentially in the same promise_test
 // so that we can use the same set of iframes without intefering each other.
-async_test(function(t) {
-    service_worker_unregister_and_register(
+promise_test(function(t) {
+    return service_worker_unregister_and_register(
         t, 'resources/clients-matchall-worker.js', scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return create_iframes(scope); })
@@ -85,9 +89,7 @@ async_test(function(t) {
         })
       .then(function() {
           frames.forEach(function(f) { f.remove() });
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Verify matchAll() respect includeUncontrolled');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html
index 36269b4d98e..ce44f1924d5 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html
@@ -5,12 +5,15 @@
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 var scope = 'resources/blank.html?clients-matchAll';
-var t = async_test('Test Clients.matchAll()');
 var frames = [];
-t.step(function() {
-    service_worker_unregister_and_register(
+promise_test(function(t) {
+    return service_worker_unregister_and_register(
         t, 'resources/clients-matchall-worker.js', scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(scope + '#1'); })
@@ -22,12 +25,15 @@ t.step(function() {
       .then(function(frame2) {
           frames.push(frame2);
           var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(onMessage);
-          frame2.contentWindow.navigator.serviceWorker.controller.postMessage(
-              {port:channel.port2}, [channel.port2]);
+
+          return new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
+              frame2.contentWindow.navigator.serviceWorker.controller.postMessage(
+                  {port:channel.port2}, [channel.port2]);
+            });
         })
-      .catch(unreached_rejection(t));
-  });
+      .then(onMessage);
+}, 'Test Clients.matchAll()');
 
 var expected = [
     // visibilityState, focused, url, type, frameType
@@ -40,6 +46,5 @@ function onMessage(e) {
   assert_array_equals(e.data[0], expected[0]);
   assert_array_equals(e.data[1], expected[1]);
   frames.forEach(function(f) { f.remove(); });
-  service_worker_unregister_and_done(t, scope);
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html
index 920d190e3b2..f23dfe71bac 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html
@@ -5,22 +5,25 @@
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
-var t = async_test('controller is cleared on disconnected window');
-t.step(function() {
+promise_test(function(t) {
     var url = 'resources/empty-worker.js';
     var scope = 'resources/blank.html';
     var registration;
     var controller;
     var frame;
-    service_worker_unregister_and_register(t, url, scope)
-      .then(t.step_func(function(swr) {
+    return service_worker_unregister_and_register(t, url, scope)
+      .then(function(swr) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = swr;
           return wait_for_state(t, registration.installing, 'activated');
-        }))
-      .then(t.step_func(function() {
+        })
+      .then(function() {
           return with_iframe(scope)
-        }))
-      .then(t.step_func(function(f) {
+        })
+      .then(function(f) {
           frame = f;
           var w = frame.contentWindow;
           var swc = w.navigator.serviceWorker;
@@ -31,10 +34,7 @@ t.step(function() {
 
           assert_equals(swc.controller, null,
                         'disconnected frame should not be controlled');
-
-          service_worker_unregister_and_done(t, scope);
-        }))
-      .catch(unreached_rejection(t));
-  });
+        });
+}, 'controller is cleared on disconnected window');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html
index 49f9879626b..e4c5e5f81f8 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html
@@ -5,22 +5,25 @@
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
-var t = async_test('controller is set for a controlled document');
-t.step(function() {
+promise_test(function(t) {
     var url = 'resources/empty-worker.js';
     var scope = 'resources/blank.html';
     var registration;
     var controller;
     var frame;
-    service_worker_unregister_and_register(t, url, scope)
-      .then(t.step_func(function(swr) {
+    return service_worker_unregister_and_register(t, url, scope)
+      .then(function(swr) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = swr;
           return wait_for_state(t, registration.installing, 'activated');
-        }))
-      .then(t.step_func(function() {
+        })
+      .then(function() {
           return with_iframe(scope);
-        }))
-      .then(t.step_func(function(f) {
+        })
+      .then(function(f) {
           frame = f;
           var w = frame.contentWindow;
           controller = w.navigator.serviceWorker.controller;
@@ -32,14 +35,12 @@ t.step(function() {
           assert_not_equals(controller, registration.active);
 
           return w.navigator.serviceWorker.getRegistration();
-        }))
-      .then(t.step_func(function(frameRegistration) {
+        })
+      .then(function(frameRegistration) {
           // SW objects from same window should be equal
           assert_equals(frameRegistration.active, controller);
           frame.remove();
-          service_worker_unregister_and_done(t, scope);
-        }))
-      .catch(unreached_rejection(t));
-  });
+        });
+}, 'controller is set for a controlled document');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html
index be4efbbc342..cb4ed30a37f 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html
@@ -22,15 +22,19 @@ function sync_message(worker, message, transfer) {
 function runTest(test, step, testBody) {
   var scope = './resources/' + step;
   var script = 'resources/extendable-event-async-waituntil.js?' + scope;
-  service_worker_unregister_and_register(test, script, scope)
+  return service_worker_unregister_and_register(test, script, scope)
     .then(function(registration) {
+        test.add_cleanup(function() {
+            return service_worker_unregister(test, scope);
+          });
+
         let worker = registration.installing;
         var channel = new MessageChannel();
         var saw_message = new Promise(function(resolve) {
           channel.port1.onmessage = function(e) { resolve(e.data); }
         });
 
-        wait_for_state(test, worker, 'activated')
+        return wait_for_state(test, worker, 'activated')
           .then(function() {
               return sync_message(worker, { step: 'init', port: channel.port2 },
                 [channel.port2]);
@@ -40,9 +44,7 @@ function runTest(test, step, testBody) {
           .then(function(output) {
               assert_equals(output.result, output.expected);
             })
-          .then(function() { return sync_message(worker, { step: 'done' }); })
-          .then(() => { service_worker_unregister_and_done(test, scope); })
-          .catch(unreached_rejection(test));
+          .then(function() { return sync_message(worker, { step: 'done' }); });
       });
 }
 
@@ -50,51 +52,51 @@ function msg_event_test(scope, test) {
   var testBody = function(worker) {
     return sync_message(worker, { step: scope });
   };
-  runTest(test, scope, testBody);
+  return runTest(test, scope, testBody);
 }
 
-async_test(msg_event_test.bind(this, 'no-current-extension-different-task'),
+promise_test(msg_event_test.bind(this, 'no-current-extension-different-task'),
   'Test calling waitUntil in a different task without an existing extension throws');
 
-async_test(msg_event_test.bind(this, 'no-current-extension-different-microtask'),
+promise_test(msg_event_test.bind(this, 'no-current-extension-different-microtask'),
   'Test calling waitUntil in a different microtask without an existing extension throws');
 
-async_test(msg_event_test.bind(this, 'current-extension-different-task'),
+promise_test(msg_event_test.bind(this, 'current-extension-different-task'),
   'Test calling waitUntil in a different task with an existing extension succeeds');
 
-async_test(msg_event_test.bind(this, 'current-extension-expired-same-microtask-turn'),
+promise_test(msg_event_test.bind(this, 'current-extension-expired-same-microtask-turn'),
   'Test calling waitUntil with an existing extension promise handler succeeds');
 
 // The promise handler will queue a new microtask after the check for new
 // extensions was performed.
-async_test(msg_event_test.bind(this, 'current-extension-expired-same-microtask-turn-extra'),
+promise_test(msg_event_test.bind(this, 'current-extension-expired-same-microtask-turn-extra'),
   'Test calling waitUntil at the end of the microtask turn throws');
 
-async_test(msg_event_test.bind(this, 'current-extension-expired-different-task'),
+promise_test(msg_event_test.bind(this, 'current-extension-expired-different-task'),
   'Test calling waitUntil after the current extension expired in a different task fails');
 
-async_test(msg_event_test.bind(this, 'script-extendable-event'),
+promise_test(msg_event_test.bind(this, 'script-extendable-event'),
   'Test calling waitUntil on a script constructed ExtendableEvent throws exception');
 
-async_test(function(t) {
+promise_test(function(t) {
     var testBody = function(worker) {
       return with_iframe('./resources/pending-respondwith-async-waituntil/dummy.html');
     }
-    runTest(t, 'pending-respondwith-async-waituntil', testBody);
+    return runTest(t, 'pending-respondwith-async-waituntil', testBody);
   }, 'Test calling waitUntil asynchronously with pending respondWith promise.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var testBody = function(worker) {
       return with_iframe('./resources/respondwith-microtask-sync-waituntil/dummy.html');
     }
-    runTest(t, 'respondwith-microtask-sync-waituntil', testBody);
+    return runTest(t, 'respondwith-microtask-sync-waituntil', testBody);
   }, 'Test calling waitUntil synchronously inside microtask of respondWith promise.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var testBody = function(worker) {
       return with_iframe('./resources/respondwith-microtask-async-waituntil/dummy.html');
     }
-    runTest(t, 'respondwith-microtask-async-waituntil', testBody);
+    return runTest(t, 'respondwith-microtask-async-waituntil', testBody);
   }, 'Test calling waitUntil asynchronously inside microtask of respondWith promise.');
 
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html
index 8e790d0ef5a..33b4eac5c18 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html
@@ -6,75 +6,85 @@
 <script>
 function runTest(test, scope, onRegister) {
   var script = 'resources/extendable-event-waituntil.js?' + scope;
-  service_worker_unregister_and_register(test, script, scope)
+  return service_worker_unregister_and_register(test, script, scope)
     .then(function(registration) {
-        onRegister(registration.installing);
+        test.add_cleanup(function() {
+            return service_worker_unregister(test, scope);
+          });
+
+        return onRegister(registration.installing);
       });
 }
 
 // Sends a SYN to the worker and asynchronously listens for an ACK; sets
 // |obj.synced| to true once ack'd.
-function syncWorker(test, worker, obj) {
+function syncWorker(worker, obj) {
   var channel = new MessageChannel();
   worker.postMessage({port: channel.port2}, [channel.port2]);
   return new Promise(function(resolve) {
-      channel.port1.onmessage = test.step_func(function(e) {
-          var message = e.data;
-          assert_equals(message, 'SYNC',
-                        'Should receive sync message from worker.');
-          obj.synced = true;
-          channel.port1.postMessage('ACK');
-          resolve();
-        });
+      channel.port1.onmessage = resolve;
+    }).then(function(e) {
+      var message = e.data;
+      assert_equals(message, 'SYNC',
+                    'Should receive sync message from worker.');
+      obj.synced = true;
+      channel.port1.postMessage('ACK');
     });
 }
 
-async_test(function(t) {
+promise_test(function(t) {
     // Passing scope as the test switch for worker script.
     var scope = 'resources/install-fulfilled';
     var onRegister = function(worker) {
         var obj = {};
-        wait_for_state(t, worker, 'installed')
-          .then(function() {
+
+        return Promise.all([
+            syncWorker(worker, obj),
+            wait_for_state(t, worker, 'installed')
+          ]).then(function() {
               assert_true(
                 obj.synced,
                 'state should be "installed" after the waitUntil promise ' +
                     'for "oninstall" is fulfilled.');
               service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
-        syncWorker(t, worker, obj);
+            });
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test install event waitUntil fulfilled');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/install-multiple-fulfilled';
     var onRegister = function(worker) {
         var obj1 = {};
         var obj2 = {};
-        wait_for_state(t, worker, 'installed')
-          .then(function() {
+
+        return Promise.all([
+            syncWorker(worker, obj1),
+            syncWorker(worker, obj2),
+            wait_for_state(t, worker, 'installed')
+          ]).then(function() {
               assert_true(
                 obj1.synced && obj2.synced,
                 'state should be "installed" after all waitUntil promises ' +
                     'for "oninstall" are fulfilled.');
-              service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
-        syncWorker(t, worker, obj1);
-        syncWorker(t, worker, obj2);
+            });
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test ExtendableEvent multiple waitUntil fulfilled.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/install-reject-precedence';
     var onRegister = function(worker) {
         var obj1 = {};
         var obj2 = {};
-        wait_for_state(t, worker, 'redundant')
-          .then(function() {
+
+        return Promise.all([
+            syncWorker(worker, obj1)
+              .then(function() {
+                  syncWorker(worker, obj2);
+                }),
+            wait_for_state(t, worker, 'redundant')
+          ]).then(function() {
               assert_true(
                 obj1.synced,
                 'The "redundant" state was entered after the first "extend ' +
@@ -85,61 +95,46 @@ async_test(function(t) {
                 'The "redundant" state was entered after the third "extend ' +
                   'lifetime promise" resolved.'
               );
-              service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
-
-        syncWorker(t, worker, obj1)
-          .then(function() {
-              syncWorker(t, worker, obj2);
             });
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test ExtendableEvent waitUntil reject precedence.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/activate-fulfilled';
     var onRegister = function(worker) {
         var obj = {};
-        wait_for_state(t, worker, 'activating')
+        return wait_for_state(t, worker, 'activating')
           .then(function() {
-              syncWorker(t, worker, obj);
-              return wait_for_state(t, worker, 'activated');
+              return Promise.all([
+                syncWorker(worker, obj),
+                wait_for_state(t, worker, 'activated')
+              ]);
             })
           .then(function() {
               assert_true(
                 obj.synced,
                 'state should be "activated" after the waitUntil promise ' +
                     'for "onactivate" is fulfilled.');
-              service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
+            });
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test activate event waitUntil fulfilled');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/install-rejected';
     var onRegister = function(worker) {
-        wait_for_state(t, worker, 'redundant')
-          .then(function() {
-              service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
+        return wait_for_state(t, worker, 'redundant');
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test install event waitUntil rejected');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/activate-rejected';
     var onRegister = function(worker) {
-        wait_for_state(t, worker, 'activated')
-          .then(function() {
-              service_worker_unregister_and_done(t, scope);
-            })
-          .catch(unreached_rejection(t));
+        return wait_for_state(t, worker, 'activated');
       };
-    runTest(t, scope, onRegister);
+    return runTest(t, scope, onRegister);
   }, 'Test activate event waitUntil rejected.');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html
index 521c01c594f..397cb81d546 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html
@@ -6,33 +6,39 @@
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/fetch-cors-xhr-iframe.html';
     var SCRIPT = 'resources/fetch-rewrite-worker.js';
     var host_info = get_host_info();
 
-    login_https(t)
+    return login_https(t)
       .then(function() {
           return service_worker_unregister_and_register(t, SCRIPT, SCOPE);
         })
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(frame) {
+          t.add_cleanup(function() {
+              frame.remove();
+            });
+
           return new Promise(function(resolve, reject) {
               var channel = new MessageChannel();
-              channel.port1.onmessage = t.step_func(function(e) {
-                  assert_equals(e.data.results, 'finish');
-                  frame.remove();
-                  service_worker_unregister_and_done(t, SCOPE);
-                });
+              channel.port1.onmessage = resolve;
               frame.contentWindow.postMessage({},
                                               host_info['HTTPS_ORIGIN'],
                                               [channel.port2]);
             });
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify CORS XHR of fetch() in a Service Worker');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html
index 73ae123ae4e..804fd9b4204 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html
@@ -238,11 +238,15 @@ function run_referrer_policy_tests(frame, referrer, href, origin) {
         });
 }
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/simple.html?referrerPolicy';
     var frame;
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() { return with_iframe(scope); })
@@ -263,9 +267,7 @@ async_test(function(t) {
         })
       .then(function() {
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Service Worker responds to fetch event with the referrer policy');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html
index 2168e3e0d45..a33309f34f9 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html
@@ -73,11 +73,15 @@ function getLoadedWindowAsObject(win) {
     });
 }
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/frame-basic';
     var frame;
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -94,16 +98,18 @@ async_test(function(t) {
             'success',
             'Basic type response could be loaded in the iframe.');
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Basic type response could be loaded in the iframe.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/frame-cors';
     var frame;
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -122,16 +128,18 @@ async_test(function(t) {
             'success',
             'CORS type response could be loaded in the iframe.');
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'CORS type response could be loaded in the iframe.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/frame-opaque';
     var frame;
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -148,15 +156,17 @@ async_test(function(t) {
             null,
             'Opaque type response could not be loaded in the iframe.');
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Opaque type response could not be loaded in the iframe.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/window-basic';
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -170,15 +180,17 @@ async_test(function(t) {
             result.jsonpResult,
             'success',
             'Basic type response could be loaded in the new window.');
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Basic type response could be loaded in the new window.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/window-cors';
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -194,15 +206,17 @@ async_test(function(t) {
             result.jsonpResult,
             'success',
             'CORS type response could be loaded in the new window.');
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'CORS type response could be loaded in the new window.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/fetch-frame-resource/window-opaque';
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -216,9 +230,7 @@ async_test(function(t) {
             result,
             null,
             'Opaque type response could not be loaded in the new window.');
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Opaque type response could not be loaded in the new window.');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html
index 1ceb164653b..1f4813c4f8e 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html
@@ -11,10 +11,14 @@
   var host_info = get_host_info();
   var frame;
 
-  async_test(function(t) {
+  promise_test(function(t) {
     var scope = 'resources/fetch-header-visibility-iframe.html';
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+        t.add_cleanup(function() {
+            return service_worker_unregister(t, scope);
+          });
+
         return wait_for_state(t, reg.installing, 'activated');
       })
       .then(function() {
@@ -44,9 +48,7 @@
       })
       .then(function(result) {
         frame.remove();
-        return service_worker_unregister_and_done(t, scope);
-      })
-      .catch(unreached_rejection(t));
+      });
   }, 'Visibility of defaulted headers during interception');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
index 7c665203045..7feccfb98c5 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
@@ -5,7 +5,7 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/fetch-request-css-base-url-iframe.html';
     var SCRIPT = 'resources/fetch-request-css-base-url-worker.js';
     var worker;
@@ -13,6 +13,10 @@ async_test(function(t) {
 
     return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
@@ -48,9 +52,7 @@ async_test(function(t) {
       .then(function(f) {
           return testDonePromise.then(function() {
             f.remove();
-            return service_worker_unregister_and_done(t, SCOPE);
           });
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'CSS\'s base URL must be the request URL even when fetched from other URL.');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
index 6f323cac8d1..958de1af85f 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
@@ -35,20 +35,30 @@ function css_image_set_test(expected_results, frame, url, type,
   return frame.contentWindow.load_css_image_set(url, type);
 }
 
-function create_message_promise(t, expected_results, frame,
-                                worker, test_count, scope) {
+function waitForWorker(worker) {
   return new Promise(function(resolve) {
     var channel = new MessageChannel();
-    channel.port1.onmessage = t.step_func(function(msg) {
+    channel.port1.addEventListener('message', function(msg) {
       if (msg.data.ready) {
-        resolve();
-        return;
+        resolve(channel);
       }
+    });
+    channel.port1.start();
+    worker.postMessage({port: channel.port2}, [channel.port2]);
+  });
+}
+
+function create_message_promise(channel, expected_results, worker, scope) {
+  return new Promise(function(resolve) {
+    channel.port1.addEventListener('message', function(msg) {
       var result = msg.data;
-      var expected = expected_results[result.url];
-      if (!expected) {
+      if (!expected_results[result.url]) {
         return;
       }
+      resolve(result);
+    });
+  }).then(function(result) {
+      var expected = expected_results[result.url];
       assert_equals(
           result.mode, expected.mode,
           'mode of ' + expected.message +  ' must be ' +
@@ -57,120 +67,148 @@ function create_message_promise(t, expected_results, frame,
           result.credentials, expected.credentials,
           'credentials of ' + expected.message +  ' must be ' +
           expected.credentials + '.');
-      --test_count;
       delete expected_results[result.url];
-      if (test_count == 0) {
-        frame.remove();
-        service_worker_unregister_and_done(t, scope);
-      }
     });
-    worker.postMessage(
-      {port: channel.port2}, [channel.port2]);
-  });
 }
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = SCOPE + "?img=backgroundImage";
-    var test_count = 2;
     var expected_results = {};
     var worker;
     var frame;
-    service_worker_unregister_and_register(t, SCRIPT, scope)
+    return service_worker_unregister_and_register(t, SCRIPT, scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
       .then(function() { return with_iframe(scope); })
       .then(function(f) {
+          t.add_cleanup(function() {
+              f.remove();
+            });
           frame = f;
-          return create_message_promise(t, expected_results, frame,
-                                        worker, test_count, scope);
+          return waitForWorker(worker);
         })
-      .then(function() {
-        css_image_test(expected_results, frame, LOCAL_URL + Date.now(),
-                       'backgroundImage', 'no-cors', 'include');
-        css_image_test(expected_results, frame, REMOTE_URL + Date.now(),
-                      'backgroundImage', 'no-cors', 'include');
-      })
-      .catch(unreached_rejection(t));
+      .then(function(channel) {
+          css_image_test(expected_results, frame, LOCAL_URL + Date.now(),
+                         'backgroundImage', 'no-cors', 'include');
+          css_image_test(expected_results, frame, REMOTE_URL + Date.now(),
+                        'backgroundImage', 'no-cors', 'include');
+
+          return Promise.all([
+              create_message_promise(channel, expected_results, worker, scope),
+              create_message_promise(channel, expected_results, worker, scope)
+            ]);
+        });
   }, 'Verify FetchEvent for css image (backgroundImage).');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = SCOPE + "?img=shapeOutside";
-    var test_count = 2;
     var expected_results = {};
     var worker;
     var frame;
-    service_worker_unregister_and_register(t, SCRIPT, scope)
+    return service_worker_unregister_and_register(t, SCRIPT, scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
       .then(function() { return with_iframe(scope); })
       .then(function(f) {
+          t.add_cleanup(function() {
+              f.remove();
+            });
           frame = f;
-          return create_message_promise(t, expected_results, frame,
-                                        worker, test_count, scope);
+          return waitForWorker(worker);
         })
-      .then(function() {
-         css_image_test(expected_results, frame, LOCAL_URL + Date.now(),
-                        'shapeOutside', 'cors', 'same-origin');
-         css_image_test(expected_results, frame, REMOTE_URL + Date.now(),
-                        'shapeOutside', 'cors', 'same-origin');
-      })
-      .catch(unreached_rejection(t));
+      .then(function(channel) {
+          css_image_test(expected_results, frame, LOCAL_URL + Date.now(),
+                         'shapeOutside', 'cors', 'same-origin');
+          css_image_test(expected_results, frame, REMOTE_URL + Date.now(),
+                         'shapeOutside', 'cors', 'same-origin');
+
+          return Promise.all([
+              create_message_promise(channel, expected_results, worker, scope),
+              create_message_promise(channel, expected_results, worker, scope)
+            ]);
+      });
   }, 'Verify FetchEvent for css image (shapeOutside).');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = SCOPE + "?img_set=backgroundImage";
-    var test_count = 2;
     var expected_results = {};
     var worker;
     var frame;
-    service_worker_unregister_and_register(t, SCRIPT, scope)
+    return service_worker_unregister_and_register(t, SCRIPT, scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
       .then(function() { return with_iframe(scope); })
       .then(function(f) {
+          t.add_cleanup(function() {
+              f.remove();;
+            });
           frame = f;
-          return create_message_promise(t, expected_results, frame,
-                                        worker, test_count, scope);
+          return waitForWorker(worker);
         })
-      .then(function() {
-         css_image_set_test(expected_results, frame, LOCAL_URL + Date.now(),
-                           'backgroundImage', 'no-cors', 'include');
-         css_image_set_test(expected_results, frame, REMOTE_URL + Date.now(),
-                           'backgroundImage', 'no-cors', 'include');
-      })
-      .catch(unreached_rejection(t));
+      .then(function(channel) {
+          css_image_set_test(expected_results, frame, LOCAL_URL + Date.now(),
+                            'backgroundImage', 'no-cors', 'include');
+          css_image_set_test(expected_results, frame, REMOTE_URL + Date.now(),
+                            'backgroundImage', 'no-cors', 'include');
+
+          return Promise.all([
+              create_message_promise(channel, expected_results, worker, scope),
+              create_message_promise(channel, expected_results, worker, scope)
+            ]);
+      });
   }, 'Verify FetchEvent for css image-set (backgroundImage).');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = SCOPE + "?img_set=shapeOutside";
-    var test_count = 2;
     var expected_results = {};
     var worker;
     var frame;
-    service_worker_unregister_and_register(t, SCRIPT, scope)
+    return service_worker_unregister_and_register(t, SCRIPT, scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
       .then(function() { return with_iframe(scope); })
       .then(function(f) {
+          t.add_cleanup(function() {
+              f.remove();
+            });
           frame = f;
-          return create_message_promise(t, expected_results, frame,
-                                        worker, test_count, scope);
+          return waitForWorker(worker);
         })
-      .then(function() {
-         css_image_set_test(expected_results, frame, LOCAL_URL + Date.now(),
+      .then(function(channel) {
+          css_image_set_test(expected_results, frame, LOCAL_URL + Date.now(),
+                             'shapeOutside', 'cors', 'same-origin');
+          css_image_set_test(expected_results, frame, REMOTE_URL + Date.now(),
                             'shapeOutside', 'cors', 'same-origin');
-         css_image_set_test(expected_results, frame, REMOTE_URL + Date.now(),
-                           'shapeOutside', 'cors', 'same-origin');
-      })
-      .catch(unreached_rejection(t));
+
+          return Promise.all([
+              create_message_promise(channel, expected_results, worker, scope),
+              create_message_promise(channel, expected_results, worker, scope)
+            ]);
+        });
   }, 'Verify FetchEvent for css image-set (shapeOutside).');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-html-imports.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-html-imports.https.html
index b2f56da9f01..7a39fa85284 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-html-imports.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-html-imports.https.html
@@ -5,12 +5,16 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/fetch-request-html-imports-iframe.html';
     var SCRIPT = 'resources/fetch-request-html-imports-worker.js';
     var host_info = get_host_info();
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
@@ -56,9 +60,6 @@ async_test(function(t) {
               'mode=cors credentials=same-origin',
               'The request mode and credentials for other origin HTMLImport ' +
               'from other origin HTMLImport must be set correctly.');
-
-          service_worker_unregister_and_done(t, SCOPE);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Verify the FetchEvent for HTMLImports');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html
index 829b0cf2594..03b7d357610 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html
@@ -4,12 +4,16 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/fetch-request-no-freshness-headers-iframe.html';
     var SCRIPT = 'resources/fetch-request-no-freshness-headers-worker.js';
     var worker;
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           worker = registration.installing;
           return wait_for_state(t, worker, 'activated');
         })
@@ -38,16 +42,14 @@ async_test(function(t) {
             'if-none-match': true,
             'if-modified-since': true
           };
-          msg.data.requests.forEach(t.step_func(function(request) {
-              request.headers.forEach(t.step_func(function(header) {
+          msg.data.requests.forEach(function(request) {
+              request.headers.forEach(function(header) {
                   assert_false(
                       !!freshness_headers[header[0]],
                       header[0] + ' header must not be set in the ' +
                       'FetchEvent\'s request. (url = ' + request.url + ')');
-                }));
-            }))
-          service_worker_unregister_and_done(t, SCOPE);
-        })
-      .catch(unreached_rejection(t));
+                });
+            })
+        });
   }, 'The headers of FetchEvent shouldn\'t contain freshness headers.');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html
index 74173e8b9bd..891eb029422 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html
@@ -5,7 +5,7 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/fetch-response-xhr-iframe.https.html';
     var SCRIPT = 'resources/fetch-response-xhr-worker.js';
     var host_info = get_host_info();
@@ -16,8 +16,12 @@ async_test(function(t) {
       e.source.postMessage('ACK', host_info['HTTPS_ORIGIN']);
     }
 
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
@@ -26,18 +30,21 @@ async_test(function(t) {
 
           t.add_cleanup(function() {
               frame.remove();
-              service_worker_unregister_and_done(t, SCOPE);
             });
 
           channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(function(e) {
-              assert_equals(e.data.results, 'finish');
-              t.done();
+          var onPortMsg = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
             });
+
           frame.contentWindow.postMessage('START',
                                           host_info['HTTPS_ORIGIN'],
                                           [channel.port2]);
+
+          return onPortMsg;
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify the response of FetchEvent using XMLHttpRequest');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html
index 2c9d4a59dc1..889c5ec7bbb 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html
@@ -13,11 +13,15 @@ var worker = 'resources/fetch-waits-for-activate-worker.js';
 var expected_url = normalizeURL(worker);
 var scope = 'resources/fetch-waits-for-activate/';
 
-async_test(function(t) {
+promise_test(function(t) {
   var registration;
   var frameLoadPromise;
   var frame;
-  service_worker_unregister_and_register(t, worker, scope).then(function(reg) {
+  return service_worker_unregister_and_register(t, worker, scope).then(function(reg) {
+    t.add_cleanup(function() {
+      return service_worker_unregister(t, scope);
+    });
+
     registration = reg;
     return wait_for_state(t, reg.installing, 'activating');
   }).then(function() {
@@ -55,8 +59,7 @@ async_test(function(t) {
     assert_equals(registration.active.state, 'activated',
                   'active worker should be in activated state');
     frame.remove();
-    return service_worker_unregister_and_done(t, scope);
-  }).catch(unreached_rejection(t));
+  });
 }, 'Fetch events should wait for the activate event to complete.');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html
index c86fda50d52..72a2c25379c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html
@@ -14,12 +14,16 @@ async_test(function(t) {
       .catch(unreached_rejection(t));
   }, 'getRegistration');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/getregistration/normal';
     var registration;
-    service_worker_unregister_and_register(t, 'resources/empty-worker.js',
-                                           scope)
+    return service_worker_unregister_and_register(t, 'resources/empty-worker.js',
+                                                  scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return navigator.serviceWorker.getRegistration(scope);
         })
@@ -27,18 +31,20 @@ async_test(function(t) {
           assert_equals(
               value, registration,
               'getRegistration should resolve to the same registration object');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Register then getRegistration');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/getregistration/url-with-fragment';
     var documentURL = scope + '#ref';
     var registration;
-    service_worker_unregister_and_register(t, 'resources/empty-worker.js',
-                                           scope)
+    return service_worker_unregister_and_register(t, 'resources/empty-worker.js',
+                                                  scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return navigator.serviceWorker.getRegistration(documentURL);
         })
@@ -46,9 +52,7 @@ async_test(function(t) {
           assert_equals(
               value, registration,
               'getRegistration should resolve to the same registration object');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Register then getRegistration with a URL having a fragment');
 
 async_test(function(t) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html
index b994859c1c6..1c5920fb039 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html
@@ -5,26 +5,36 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/invalid-blobtype-iframe.https.html';
     var SCRIPT = 'resources/invalid-blobtype-worker.js';
     var host_info = get_host_info();
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(frame) {
-          var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(function(e) {
-              assert_equals(e.data.results, 'finish');
+          t.add_cleanup(function() {
               frame.remove();
-              service_worker_unregister_and_done(t, SCOPE);
             });
+
+          var channel = new MessageChannel();
+          var onMsg = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
+            });
+
           frame.contentWindow.postMessage({},
                                           host_info['HTTPS_ORIGIN'],
                                           [channel.port2]);
+          return onMsg;
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify the response of FetchEvent using XMLHttpRequest');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html
index 0256a3a4c15..1bc97697904 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html
@@ -5,26 +5,35 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/invalid-header-iframe.https.html';
     var SCRIPT = 'resources/invalid-header-worker.js';
     var host_info = get_host_info();
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(frame) {
-          var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(function(e) {
-              assert_equals(e.data.results, 'finish');
+          t.add_cleanup(function() {
               frame.remove();
-              service_worker_unregister_and_done(t, SCOPE);
+            });
+
+          var channel = new MessageChannel();
+          var onMsg = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
             });
           frame.contentWindow.postMessage({},
                                           host_info['HTTPS_ORIGIN'],
                                           [channel.port2]);
+          return onMsg;
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify the response of FetchEvent using XMLHttpRequest');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html
index ad0ab59c775..c27a5f48a5b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html
@@ -5,12 +5,16 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/iso-latin1-header-iframe.html';
     var SCRIPT = 'resources/iso-latin1-header-worker.js';
     var host_info = get_host_info();
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
@@ -19,14 +23,18 @@ async_test(function(t) {
           t.add_cleanup(function() {
               frame.remove();
             });
-          channel.port1.onmessage = t.step_func(function(e) {
-              assert_equals(e.data.results, 'finish');
-              service_worker_unregister_and_done(t, SCOPE);
+
+          var onMsg = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
             });
+
           frame.contentWindow.postMessage({},
                                           host_info['HTTPS_ORIGIN'],
                                           [channel.port2]);
+          return onMsg;
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify the response of FetchEvent using XMLHttpRequest');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html
index 6d0a5d3274d..117def9eb2a 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html
@@ -16,13 +16,15 @@ function echo(worker, data) {
   });
 }
 
-async_test(t => {
+promise_test(t => {
   let script = 'resources/echo-message-to-source-worker.js';
   let scope = 'resources/client-postmessage-from-wait-serviceworker';
   let registration;
   let frame;
-  service_worker_unregister_and_register(t, script, scope)
+  return service_worker_unregister_and_register(t, script, scope)
     .then(swr => {
+      t.add_cleanup(() => service_worker_unregister(t, scope));
+
       registration = swr;
       return wait_for_state(t, registration.installing, 'activated');
     }).then(_ => {
@@ -43,7 +45,6 @@ async_test(t => {
       assert_equals(evt.source, registration.active,
                     'message event source should be correct');
       frame.remove();
-    }).then(_ => service_worker_unregister_and_done(t, scope) )
-    .catch(unreached_rejection(t));
+    });
 }, 'Client.postMessage() from waiting serviceworker.');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html
index 43fccbad56c..0957e4c5330 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html
@@ -5,26 +5,36 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var SCOPE = 'resources/referer-iframe.html';
     var SCRIPT = 'resources/fetch-rewrite-worker.js';
     var host_info = get_host_info();
-    service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+    return service_worker_unregister_and_register(t, SCRIPT, SCOPE)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, SCOPE);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(frame) {
           var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(function(e) {
-              assert_equals(e.data.results, 'finish');
+          t.add_cleanup(function() {
               frame.remove();
-              service_worker_unregister_and_done(t, SCOPE);
             });
+
+          var onMsg = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
+            });
+
           frame.contentWindow.postMessage({},
                                           host_info['HTTPS_ORIGIN'],
                                           [channel.port2]);
+          return onMsg;
         })
-      .catch(unreached_rejection(t));
+      .then(function(e) {
+          assert_equals(e.data.results, 'finish');
+        });
   }, 'Verify the referer');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html
index 972ce7410b9..5bcfd66846b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html
@@ -4,15 +4,17 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-var t = async_test('Registration: events');
-t.step(function() {
+promise_test(function(t) {
     var scope = 'resources/in-scope/';
-    service_worker_unregister_and_register(
+    return service_worker_unregister_and_register(
         t, 'resources/events-worker.js', scope)
-      .then(t.step_func(function(registration) {
-          onRegister(registration.installing);
-        }))
-      .catch(unreached_rejection(t));
+      .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+          });
+
+          return onRegister(registration.installing);
+        });
 
     function sendMessagePort(worker, from) {
         var messageChannel = new MessageChannel();
@@ -21,17 +23,20 @@ t.step(function() {
     }
 
     function onRegister(sw) {
-        sw.onstatechange = t.step_func(function() {
-            if (sw.state !== 'activated')
-                return;
-
-            sendMessagePort(sw, 'registering doc').onmessage = t.step_func(function (e) {
+        return new Promise(function(resolve) {
+            sw.onstatechange = function() {
+                if (sw.state === 'activated')
+                    resolve();
+            };
+        }).then(function() {
+            return new Promise(function(resolve) {
+                sendMessagePort(sw, 'registering doc').onmessage = resolve;
+            });
+        }).then(function(e) {
                 assert_array_equals(e.data.events,
                                     ['install', 'activate'],
                                    'Worker should see install then activate events');
-                service_worker_unregister_and_done(t, scope);
-            });
         });
     }
-});
+}, 'Registration: events');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html
index 3810362e053..7358e58ff14 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html
@@ -4,21 +4,24 @@
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
-(function () {
-    var t = async_test('Service Worker state property and "statechange" event');
+promise_test(function (t) {
     var currentState = 'test-is-starting';
     var scope = 'resources/state/';
 
-    service_worker_unregister_and_register(
+    return service_worker_unregister_and_register(
         t, 'resources/empty-worker.js', scope)
-      .then(t.step_func(function(registration) {
+      .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           var sw = registration.installing;
-          sw.addEventListener('statechange', t.step_func(onStateChange(sw)));
+
           assert_equals(sw.state, 'installing',
                         'the service worker should be in "installing" state.');
           checkStateTransition(sw.state);
-        }))
-      .catch(unreached_rejection(t));
+          return onStateChange(sw);
+        });
 
     function checkStateTransition(newState) {
         switch (currentState) {
@@ -49,7 +52,9 @@
     }
 
     function onStateChange(expectedTarget) {
-        return function(event) {
+      return new Promise(function(resolve) {
+            expectedTarget.addEventListener('statechange', resolve);
+          }).then(function(event) {
             assert_true(event.target instanceof ServiceWorker,
                         'the target of the statechange event should be a ' +
                         'ServiceWorker.');
@@ -61,9 +66,9 @@
 
             checkStateTransition(event.target.state);
 
-            if (event.target.state == 'activated')
-                service_worker_unregister_and_done(t, scope);
-        };
+            if (event.target.state != 'activated')
+                return onStateChange(expectedTarget);
+          });
     }
-}());
+}, 'Service Worker state property and "statechange" event');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html
index a9523a54cdc..e22ca8f0a91 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html
@@ -19,10 +19,14 @@ function fetch_url(url) {
 }
 var worker = 'resources/fail-on-fetch-worker.js';
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/uncontrolled-page/';
-    service_worker_unregister_and_register(t, worker, scope)
+    return service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, reg.installing, 'activated');
         })
       .then(function() {
@@ -30,10 +34,6 @@ async_test(function(t) {
         })
       .then(function(text) {
           assert_equals(text, 'a simple text file\n');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(t.step_func(function(reason) {
-          assert_unreached(reason.message);
-        }));
+        });
   }, 'Fetch events should not go through uncontrolled page.');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html
index 6c0a0aecf3f..303b2be2b7d 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html
@@ -5,12 +5,16 @@
 <script>
 var worker_url = 'resources/empty-worker.js';
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/re-register-resolves-to-new-value';
     var registration;
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
@@ -23,17 +27,19 @@ async_test(function(t) {
       .then(function(new_registration) {
           assert_not_equals(registration, new_registration,
                             'register should resolve to a new value');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Unregister then register resolves to a new value');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/re-register-while-old-registration-in-use';
     var registration;
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
@@ -49,20 +55,22 @@ async_test(function(t) {
       .then(function(new_registration) {
           assert_equals(registration, new_registration,
                         'new registration should resolve to the same registration');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Unregister then register resolves to the original value if the ' +
          'registration is in use.');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/complete-unregistration-followed-by-' +
                 'reloading-controllee-iframe';
     var registration;
     var frame;
     var service_worker;
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
@@ -88,20 +96,22 @@ async_test(function(t) {
       .then(function(r) {
           assert_equals(r, undefined, 'getRegistration should return ' +
                                       'undefined after unregistration');
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
 }, 'Reloading the last controlled iframe after unregistration should ensure ' +
    'the deletion of the registration');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/re-register-does-not-affect-existing-controllee';
     var iframe;
     var registration;
     var controller;
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
@@ -125,18 +135,20 @@ async_test(function(t) {
               controller,
               'the worker from the first registration is the controller');
           iframe.remove();
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Unregister then register does not affect existing controllee');
 
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/scope/resurrection';
     var iframe;
     var registration;
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
@@ -159,8 +171,6 @@ async_test(function(t) {
               frame.contentWindow.navigator.serviceWorker.controller, null,
               'document should have a controller');
           frame.remove();
-          service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Unregister then register resurrects the registration');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html
index 3b3d955b142..17608d2ef79 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html
@@ -5,7 +5,7 @@
 <script src="resources/testharness-helpers.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(function(t) {
     var scope = 'resources/simple.txt';
     var worker_url = 'resources/update-recovery-worker.py';
     var expected_url = normalizeURL(worker_url);
@@ -46,8 +46,12 @@ async_test(function(t) {
       });
     }
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           registration = r;
           return wait_for_state(t, registration.installing, 'activated');
         })
@@ -64,8 +68,6 @@ async_test(function(t) {
           assert_equals(frame.contentWindow.navigator.serviceWorker.controller.scriptURL,
                         expected_url);
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Recover from a bad service worker by updating after a failed navigation.');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html
index b9c526d50fb..cbfed456a9d 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html
@@ -6,7 +6,7 @@
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 
-async_test(function(t) {
+promise_test(function(t) {
     var path = new URL(".", window.location).pathname
     var url = 'resources/websocket.js';
     var scope = 'resources/blank.html?websocket';
@@ -14,8 +14,12 @@ async_test(function(t) {
     var frameURL = host_info['HTTPS_ORIGIN'] + path + scope;
     var frame;
 
-    service_worker_unregister_and_register(t, url, scope)
+    return service_worker_unregister_and_register(t, url, scope)
       .then(function(registration) {
+          t.add_cleanup(function() {
+              return service_worker_unregister(t, scope);
+            });
+
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(frameURL); })
@@ -24,23 +28,18 @@ async_test(function(t) {
           return websocket(t, frame);
         })
       .then(function() {
-          return new Promise(function(resolve, reject) {
-            function onMessage(e) {
-              for (var url in e.data.urls) {
-                assert_equals(url.indexOf(get_websocket_url()), -1,
-                              "Observed an unexpected FetchEvent for the WebSocket handshake");
-              }
-              t.done();
-            }
-            var channel = new MessageChannel();
-            channel.port1.onmessage = t.step_func(onMessage);
+          var channel = new MessageChannel();
+          return new Promise(function(resolve) {
+            channel.port1.onmessage = resolve;
             frame.contentWindow.navigator.serviceWorker.controller.postMessage({port: channel.port2}, [channel.port2]);
           });
         })
-      .then(function() {
+      .then(function(e) {
+          for (var url in e.data.urls) {
+            assert_equals(url.indexOf(get_websocket_url()), -1,
+                          "Observed an unexpected FetchEvent for the WebSocket handshake");
+          }
           frame.remove();
-          return service_worker_unregister_and_done(t, scope);
-        })
-      .catch(unreached_rejection(t));
+        });
   }, 'Verify WebSocket handshake channel does not get intercepted');
 </script>
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index 34d1a90dde2..c5cb9caa5b2 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -376,7 +376,6 @@ class Session(object):
         self.timeouts = None
         self.window = None
         self.find = None
-        self._element_cache = {}
         self.extension = None
         self.extension_cls = extension
 
@@ -669,10 +668,6 @@ class Element(object):
         self.id = id
         self.session = session
 
-        if id in self.session._element_cache:
-            raise ValueError("Element already in cache: %s" % id)
-        self.session._element_cache[self.id] = self
-
     def __repr__(self):
         return "<%s %s>" % (self.__class__.__name__, self.id)
 
@@ -683,8 +678,6 @@ class Element(object):
     @classmethod
     def from_json(cls, json, session):
         uuid = json[Element.identifier]
-        if uuid in session._element_cache:
-            return session._element_cache[uuid]
         return cls(uuid, session)
 
     def send_element_command(self, method, uri, body=None):
diff --git a/tests/wpt/web-platform-tests/tools/wpt/requirements.txt b/tests/wpt/web-platform-tests/tools/wpt/requirements.txt
index 46c4b13a3bf..c20f36f2464 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wpt/requirements.txt
@@ -1 +1 @@
-requests==2.19.1
+requests==2.20.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
index 07c525a67fd..2673b93ea9a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
@@ -1,3 +1,3 @@
 mozprocess == 0.26
 selenium==3.14.1
-requests==2.19.1
+requests==2.20.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index db7ac044908..6f3b7e898fa 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -141,10 +141,18 @@ def env_options():
 
 
 def run_info_extras(**kwargs):
+
+    def get_bool_pref(pref):
+        for key, value in kwargs.get('extra_prefs', []):
+            if pref == key:
+                return value.lower() in ('true', '1')
+        return False
+
     return {"e10s": kwargs["gecko_e10s"],
             "wasm": kwargs.get("wasm", True),
             "verify": kwargs["verify"],
-            "headless": "MOZ_HEADLESS" in os.environ}
+            "headless": "MOZ_HEADLESS" in os.environ,
+            "sw-e10s": get_bool_pref("dom.serviceWorkers.parent_intercept"),}
 
 
 def update_properties():
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 56f2c36769b..d6d905a24a5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -259,7 +259,7 @@ scheme host and port.""")
     gecko_group.add_argument("--stylo-threads", action="store", type=int, default=1,
                              help="Number of parallel threads to use for stylo")
     gecko_group.add_argument("--reftest-internal", dest="reftest_internal", action="store_true",
-                             default=None, help="Enable reftest runner implemented inside Marionette")
+                             default=True, help="Enable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-external", dest="reftest_internal", action="store_false",
                              help="Disable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-screenshot", dest="reftest_screenshot", action="store",
@@ -512,10 +512,6 @@ def check_args(kwargs):
         kwargs['extra_prefs'] = [tuple(prefarg.split('=', 1)) for prefarg in
                                  kwargs['extra_prefs']]
 
-    if kwargs["reftest_internal"] is None:
-        # Default to the internal reftest implementation on Linux and OSX
-        kwargs["reftest_internal"] = sys.platform.startswith("linux") or sys.platform.startswith("darwin")
-
     return kwargs
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index 7ac7b709436..0a5b1352e21 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -150,7 +150,7 @@ def run_tests(config, test_paths, product, **kwargs):
         if kwargs["install_fonts"]:
             env_extras.append(FontInstaller(
                 font_dir=kwargs["font_dir"],
-                ahem=os.path.join(kwargs["tests_root"], "fonts/Ahem.ttf")
+                ahem=os.path.join(test_paths["/"]["tests_path"], "fonts/Ahem.ttf")
             ))
 
         run_info, test_loader = get_loader(test_paths,
diff --git a/tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js b/tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js
new file mode 100644
index 00000000000..0c4669e6caa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js
@@ -0,0 +1,10 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+"use strict";
+
+idl_test(
+  ["wasm-web-api"],
+  ["wasm-js-api"],
+  idl_array => {}
+);
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 3a809aac693..4145f8b1e32 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
@@ -21,11 +21,11 @@ def test_body_is_interactable(session):
     result = session.find.css("input", all=False)
 
     # By default body is the active element
-    assert session.active_element is element
+    assert session.active_element == element
 
     response = element_send_keys(session, element, "foo")
     assert_success(response)
-    assert session.active_element is element
+    assert session.active_element == element
     assert result.property("value") == "foo"
 
 
@@ -41,11 +41,11 @@ def test_document_element_is_interactable(session):
     result = session.find.css("input", all=False)
 
     # By default body is the active element
-    assert session.active_element is body
+    assert session.active_element == body
 
     response = element_send_keys(session, element, "foo")
     assert_success(response)
-    assert session.active_element is element
+    assert session.active_element == element
     assert result.property("value") == "foo"
 
 
@@ -60,11 +60,11 @@ def test_iframe_is_interactable(session):
     frame = session.find.css("iframe", all=False)
 
     # By default the body has the focus
-    assert session.active_element is body
+    assert session.active_element == body
 
     response = element_send_keys(session, frame, "foo")
     assert_success(response)
-    assert session.active_element is frame
+    assert session.active_element == frame
 
     # Any key events are immediately routed to the nested
     # browsing context's active document.
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
index f3b67632f2d..c638e64b8ba 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
@@ -506,6 +506,40 @@
     hasProps(pc.getTransceivers(), []);
   };
 
+  const checkNoMidOffer = async t => {
+    const pc1 = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    t.add_cleanup(() => pc2.close());
+
+    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    t.add_cleanup(() => stopTracks(stream));
+    const track = stream.getAudioTracks()[0];
+    pc1.addTrack(track, stream);
+
+    const offer = await pc1.createOffer();
+    await pc1.setLocalDescription(offer);
+
+    // Remove mid attr
+    offer.sdp = offer.sdp.replace("a=mid:", "a=unknownattr:");
+    await pc2.setRemoteDescription(offer);
+
+    hasPropsAndUniqueMids(pc2.getTransceivers(),
+      [
+        {
+          receiver: {track: {kind: "audio"}},
+          sender: {track: null},
+          direction: "recvonly",
+          currentDirection: null,
+          stopped: false
+        }
+      ]);
+
+    const answer = await pc2.createAnswer();
+    await pc2.setLocalDescription(answer);
+    await pc1.setRemoteDescription(answer);
+  };
+
   const checkAddTransceiverNoTrackDoesntPair = async t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
@@ -2212,6 +2246,7 @@ const tests = [
   checkAddTransceiverWithSetRemoteOfferSending,
   checkAddTransceiverWithSetRemoteOfferNoSend,
   checkAddTransceiverBadKind,
+  checkNoMidOffer,
   checkSetDirection,
   checkCurrentDirection,
   checkSendrecvWithNoSendTrack,