diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index aa699e7077c..2b102667503 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -114014,7 +114014,7 @@
      "css/css-contain/contain-style-counters-004.html",
      [
       [
-       "/css/css-contain/reference/contain-style-counters-003-ref.html",
+       "/css/css-contain/reference/contain-style-counters-004-ref.html",
        "=="
       ]
      ],
@@ -242398,6 +242398,9 @@
    "css/css-contain/reference/contain-style-counters-003-ref.html": [
     []
    ],
+   "css/css-contain/reference/contain-style-counters-004-ref.html": [
+    []
+   ],
    "css/css-contain/reference/contain-subgrid-001.html": [
     []
    ],
@@ -271351,6 +271354,9 @@
    "infrastructure/metadata/infrastructure/server/title.any.js.ini": [
     []
    ],
+   "infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini": [
+    []
+   ],
    "infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini": [
     []
    ],
@@ -276244,9 +276250,6 @@
    "serial/serial-disabled-by-feature-policy.https.sub.html.headers": [
     []
    ],
-   "server-side.md": [
-    []
-   ],
    "server-timing/META.yml": [
     []
    ],
@@ -277849,9 +277852,6 @@
    "service-workers/service-worker/resources/worker-fetching-cross-origin.js": [
     []
    ],
-   "service-workers/service-worker/resources/worker-interception-iframe.https.html": [
-    []
-   ],
    "service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js": [
     []
    ],
@@ -278023,6 +278023,18 @@
    "signed-exchange/resources/sxg-navigation-timing.html": [
     []
    ],
+   "signed-exchange/resources/sxg-subresource-iframe.html": [
+    []
+   ],
+   "signed-exchange/resources/sxg-subresource-script-inner.js": [
+    []
+   ],
+   "signed-exchange/resources/sxg-subresource-script.js": [
+    []
+   ],
+   "signed-exchange/resources/sxg-subresource-sxg-inner.html": [
+    []
+   ],
    "signed-exchange/resources/sxg-util.js": [
     []
    ],
@@ -278116,6 +278128,15 @@
    "signed-exchange/resources/sxg/sxg-referrer-same-origin.sxg": [
     []
    ],
+   "signed-exchange/resources/sxg/sxg-subresource-script.sxg": [
+    []
+   ],
+   "signed-exchange/resources/sxg/sxg-subresource.sxg": [
+    []
+   ],
+   "signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers": [
+    []
+   ],
    "signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg": [
     []
    ],
@@ -302525,11 +302546,32 @@
      }
     ]
    ],
-   "bluetooth/characteristic/characteristicProperties.https.html": [
+   "bluetooth/characteristic/characteristicProperties.https.window.js": [
     [
-     "bluetooth/characteristic/characteristicProperties.https.html",
+     "bluetooth/characteristic/characteristicProperties.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
@@ -302597,43 +302639,148 @@
      }
     ]
    ],
-   "bluetooth/characteristic/notifications/characteristic-is-removed.https.html": [
+   "bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/notifications/characteristic-is-removed.https.html",
+     "bluetooth/characteristic/notifications/characteristic-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/notifications/service-is-removed.https.html": [
+   "bluetooth/characteristic/notifications/service-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/notifications/service-is-removed.https.html",
+     "bluetooth/characteristic/notifications/service-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html": [
+   "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html",
+     "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/characteristic-is-removed.https.html": [
+   "bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/characteristic-is-removed.https.html",
+     "bluetooth/characteristic/readValue/characteristic-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/event-is-fired.https.html": [
+   "bluetooth/characteristic/readValue/event-is-fired.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/event-is-fired.https.html",
+     "bluetooth/characteristic/readValue/event-is-fired.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
@@ -302645,43 +302792,148 @@
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/read-succeeds.https.html": [
+   "bluetooth/characteristic/readValue/read-succeeds.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/read-succeeds.https.html",
+     "bluetooth/characteristic/readValue/read-succeeds.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/read-updates-value.https.html": [
+   "bluetooth/characteristic/readValue/read-updates-value.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/read-updates-value.https.html",
+     "bluetooth/characteristic/readValue/read-updates-value.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/readValue/service-is-removed.https.html": [
+   "bluetooth/characteristic/readValue/service-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/readValue/service-is-removed.https.html",
+     "bluetooth/characteristic/readValue/service-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/service-same-from-2-characteristics.https.html": [
+   "bluetooth/characteristic/service-same-from-2-characteristics.https.window.js": [
     [
-     "bluetooth/characteristic/service-same-from-2-characteristics.https.html",
+     "bluetooth/characteristic/service-same-from-2-characteristics.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/service-same-object.https.html": [
+   "bluetooth/characteristic/service-same-object.https.window.js": [
     [
-     "bluetooth/characteristic/service-same-object.https.html",
+     "bluetooth/characteristic/service-same-object.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
@@ -302693,19 +302945,61 @@
      }
     ]
    ],
-   "bluetooth/characteristic/writeValue/buffer-is-detached.https.html": [
+   "bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js": [
     [
-     "bluetooth/characteristic/writeValue/buffer-is-detached.https.html",
+     "bluetooth/characteristic/writeValue/buffer-is-detached.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/writeValue/characteristic-is-removed.https.html": [
+   "bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/writeValue/characteristic-is-removed.https.html",
+     "bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
@@ -302717,19 +303011,61 @@
      }
     ]
    ],
-   "bluetooth/characteristic/writeValue/service-is-removed.https.html": [
+   "bluetooth/characteristic/writeValue/service-is-removed.https.window.js": [
     [
-     "bluetooth/characteristic/writeValue/service-is-removed.https.html",
+     "bluetooth/characteristic/writeValue/service-is-removed.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
-   "bluetooth/characteristic/writeValue/write-succeeds.https.html": [
+   "bluetooth/characteristic/writeValue/write-succeeds.https.window.js": [
     [
-     "bluetooth/characteristic/writeValue/write-succeeds.https.html",
+     "bluetooth/characteristic/writeValue/write-succeeds.https.window.html",
      {
-      "testdriver": true
+      "script_metadata": [
+       [
+        "script",
+        "/resources/testharness.js"
+       ],
+       [
+        "script",
+        "/resources/testharnessreport.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver.js"
+       ],
+       [
+        "script",
+        "/resources/testdriver-vendor.js"
+       ],
+       [
+        "script",
+        "/bluetooth/resources/bluetooth-helpers.js"
+       ]
+      ]
      }
     ]
    ],
@@ -307752,6 +308088,12 @@
      {}
     ]
    ],
+   "css/CSS2/linebox/inline-children-root-linebox-crash-001.html": [
+    [
+     "css/CSS2/linebox/inline-children-root-linebox-crash-001.html",
+     {}
+    ]
+   ],
    "css/CSS2/linebox/inline-negative-margin-001.html": [
     [
      "css/CSS2/linebox/inline-negative-margin-001.html",
@@ -309096,6 +309438,12 @@
      {}
     ]
    ],
+   "css/css-backgrounds/parsing/box-shadow-computed.html": [
+    [
+     "css/css-backgrounds/parsing/box-shadow-computed.html",
+     {}
+    ]
+   ],
    "css/css-backgrounds/parsing/box-shadow-invalid.html": [
     [
      "css/css-backgrounds/parsing/box-shadow-invalid.html",
@@ -310580,6 +310928,12 @@
      {}
     ]
    ],
+   "css/css-fonts/inheritance.html": [
+    [
+     "css/css-fonts/inheritance.html",
+     {}
+    ]
+   ],
    "css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html": [
     [
      "css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html",
@@ -310604,6 +310958,270 @@
      {}
     ]
    ],
+   "css/css-fonts/parsing/font-family-computed.html": [
+    [
+     "css/css-fonts/parsing/font-family-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-family-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-family-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-family-valid.html": [
+    [
+     "css/css-fonts/parsing/font-family-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-feature-settings-computed.html": [
+    [
+     "css/css-fonts/parsing/font-feature-settings-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-feature-settings-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-feature-settings-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-feature-settings-valid.html": [
+    [
+     "css/css-fonts/parsing/font-feature-settings-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-kerning-computed.html": [
+    [
+     "css/css-fonts/parsing/font-kerning-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-kerning-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-kerning-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-kerning-valid.html": [
+    [
+     "css/css-fonts/parsing/font-kerning-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-adjust-computed.html": [
+    [
+     "css/css-fonts/parsing/font-size-adjust-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-adjust-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-size-adjust-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-adjust-valid.html": [
+    [
+     "css/css-fonts/parsing/font-size-adjust-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-computed.html": [
+    [
+     "css/css-fonts/parsing/font-size-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-size-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-size-valid.html": [
+    [
+     "css/css-fonts/parsing/font-size-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-stretch-computed.html": [
+    [
+     "css/css-fonts/parsing/font-stretch-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-stretch-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-stretch-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-stretch-valid.html": [
+    [
+     "css/css-fonts/parsing/font-stretch-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-style-computed.html": [
+    [
+     "css/css-fonts/parsing/font-style-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-style-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-style-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-style-valid.html": [
+    [
+     "css/css-fonts/parsing/font-style-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-synthesis-computed.html": [
+    [
+     "css/css-fonts/parsing/font-synthesis-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-synthesis-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-synthesis-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-synthesis-valid.html": [
+    [
+     "css/css-fonts/parsing/font-synthesis-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-valid.html": [
+    [
+     "css/css-fonts/parsing/font-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-caps-computed.html": [
+    [
+     "css/css-fonts/parsing/font-variant-caps-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-caps-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-caps-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-caps-valid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-caps-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-east-asian-computed.html": [
+    [
+     "css/css-fonts/parsing/font-variant-east-asian-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-east-asian-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-east-asian-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-east-asian-valid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-east-asian-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-ligatures-computed.html": [
+    [
+     "css/css-fonts/parsing/font-variant-ligatures-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-ligatures-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-ligatures-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-ligatures-valid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-ligatures-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-numeric-computed.html": [
+    [
+     "css/css-fonts/parsing/font-variant-numeric-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-numeric-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-numeric-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-numeric-valid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-numeric-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-position-computed.html": [
+    [
+     "css/css-fonts/parsing/font-variant-position-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-position-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-position-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-variant-position-valid.html": [
+    [
+     "css/css-fonts/parsing/font-variant-position-valid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-weight-computed.html": [
+    [
+     "css/css-fonts/parsing/font-weight-computed.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-weight-invalid.html": [
+    [
+     "css/css-fonts/parsing/font-weight-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/parsing/font-weight-valid.html": [
+    [
+     "css/css-fonts/parsing/font-weight-valid.html",
+     {}
+    ]
+   ],
    "css/css-fonts/test_datafont_same_origin.html": [
     [
      "css/css-fonts/test_datafont_same_origin.html",
@@ -321044,6 +321662,12 @@
      {}
     ]
    ],
+   "css/css-ui/parsing/caret-color-computed.html": [
+    [
+     "css/css-ui/parsing/caret-color-computed.html",
+     {}
+    ]
+   ],
    "css/css-ui/parsing/caret-color-invalid.html": [
     [
      "css/css-ui/parsing/caret-color-invalid.html",
@@ -321074,6 +321698,12 @@
      {}
     ]
    ],
+   "css/css-ui/parsing/outline-color-computed.html": [
+    [
+     "css/css-ui/parsing/outline-color-computed.html",
+     {}
+    ]
+   ],
    "css/css-ui/parsing/outline-color-invalid.html": [
     [
      "css/css-ui/parsing/outline-color-invalid.html",
@@ -327995,6 +328625,12 @@
      {}
     ]
    ],
+   "element-timing/buffered-flag.html": [
+    [
+     "element-timing/buffered-flag.html",
+     {}
+    ]
+   ],
    "element-timing/cross-origin-element.sub.html": [
     [
      "element-timing/cross-origin-element.sub.html",
@@ -328157,6 +328793,12 @@
      {}
     ]
    ],
+   "element-timing/retrievability.html": [
+    [
+     "element-timing/retrievability.html",
+     {}
+    ]
+   ],
    "element-timing/supported-element-type.html": [
     [
      "element-timing/supported-element-type.html",
@@ -357411,6 +358053,14 @@
      {}
     ]
    ],
+   "infrastructure/testdriver/actions/actionsWithKeyPressed.html": [
+    [
+     "infrastructure/testdriver/actions/actionsWithKeyPressed.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "infrastructure/testdriver/actions/elementPosition.html": [
     [
      "infrastructure/testdriver/actions/elementPosition.html",
@@ -373294,6 +373944,26 @@
      }
     ]
    ],
+   "performance-timeline/buffered-flag-after-timeout.any.js": [
+    [
+     "performance-timeline/buffered-flag-after-timeout.any.html",
+     {}
+    ],
+    [
+     "performance-timeline/buffered-flag-after-timeout.any.worker.html",
+     {}
+    ]
+   ],
+   "performance-timeline/buffered-flag-observer.any.js": [
+    [
+     "performance-timeline/buffered-flag-observer.any.html",
+     {}
+    ],
+    [
+     "performance-timeline/buffered-flag-observer.any.worker.html",
+     {}
+    ]
+   ],
    "performance-timeline/case-sensitivity.any.js": [
     [
      "performance-timeline/case-sensitivity.any.html",
@@ -373388,6 +374058,26 @@
      }
     ]
    ],
+   "performance-timeline/multiple-buffered-flag-observers.any.js": [
+    [
+     "performance-timeline/multiple-buffered-flag-observers.any.html",
+     {}
+    ],
+    [
+     "performance-timeline/multiple-buffered-flag-observers.any.worker.html",
+     {}
+    ]
+   ],
+   "performance-timeline/observer-buffered-false.any.js": [
+    [
+     "performance-timeline/observer-buffered-false.any.html",
+     {}
+    ],
+    [
+     "performance-timeline/observer-buffered-false.any.worker.html",
+     {}
+    ]
+   ],
    "performance-timeline/performanceentry-tojson.any.js": [
     [
      "performance-timeline/performanceentry-tojson.any.html",
@@ -388683,6 +389373,12 @@
      {}
     ]
    ],
+   "signed-exchange/subresource/sxg-subresource.tentative.html": [
+    [
+     "signed-exchange/subresource/sxg-subresource.tentative.html",
+     {}
+    ]
+   ],
    "signed-exchange/sxg-data-cert-url.tentative.html": [
     [
      "signed-exchange/sxg-data-cert-url.tentative.html",
@@ -396527,6 +397223,16 @@
      {}
     ]
    ],
+   "user-timing/buffered-flag.any.js": [
+    [
+     "user-timing/buffered-flag.any.html",
+     {}
+    ],
+    [
+     "user-timing/buffered-flag.any.worker.html",
+     {}
+    ]
+   ],
    "user-timing/clearMarks.html": [
     [
      "user-timing/clearMarks.html",
@@ -396827,6 +397533,12 @@
      {}
     ]
    ],
+   "user-timing/structured-serialize-detail.html": [
+    [
+     "user-timing/structured-serialize-detail.html",
+     {}
+    ]
+   ],
    "user-timing/supported-usertiming-types.any.js": [
     [
      "user-timing/supported-usertiming-types.any.html",
@@ -434016,7 +434728,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "92309f9d52e9224dc3c626e4c0e09a2a4c45db72",
+   "f9d4bd58466a272cd3da9961c742b5a4aac4c69e",
    "support"
   ],
   ".codecov.yml": [
@@ -444472,11 +445184,11 @@
    "support"
   ],
   "bluetooth/README.md": [
-   "2d0e9ab7a9b3c6fcda90b40eae3f8d77322daa26",
+   "dcf3d2832c33f72e8dce2356956baac1d83eafed",
    "support"
   ],
-  "bluetooth/characteristic/characteristicProperties.https.html": [
-   "0747af2fc9c65ee34023674b5d5658f0d26c31bd",
+  "bluetooth/characteristic/characteristicProperties.https.window.js": [
+   "abe9f79ce26ed7cc9f5c17cfd2f0e1e70d1d3657",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.html": [
@@ -444511,72 +445223,72 @@
    "c9056dd3b3c937f157b0495ee2964bbf21a59692",
    "testharness"
   ],
-  "bluetooth/characteristic/notifications/characteristic-is-removed.https.html": [
-   "35f5ee974fc07097111b69509050e577d1250d7d",
+  "bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js": [
+   "6b5d3e22a121e64c75e217e73631c7cd6ad86865",
    "testharness"
   ],
-  "bluetooth/characteristic/notifications/service-is-removed.https.html": [
-   "bf389ce5286b176325184f1719d5dabc98668967",
+  "bluetooth/characteristic/notifications/service-is-removed.https.window.js": [
+   "29bc671c5d4c9e27e4fc59b4dee520a494770cd8",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html": [
-   "c0d4328a0e4d83d852b0d3fe4f885294f44b7297",
+  "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js": [
+   "7e6e4159bb11234b01162b3daf080143c0055252",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/characteristic-is-removed.https.html": [
-   "3c963c3c9fdbae6d6aeb6bed8f0f99dce720a0aa",
+  "bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js": [
+   "07678e6e037b211ee9560a6c1af02465e7cc4e11",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/event-is-fired.https.html": [
-   "a217bdd36aad2eb305f85804e023e86da6477c52",
+  "bluetooth/characteristic/readValue/event-is-fired.https.window.js": [
+   "eee34d0612d3611121d219c0b4098937df507ece",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.html": [
    "a80bccfe469223145ae4ec78dfd33e24a613fcd7",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/read-succeeds.https.html": [
-   "4dca3ed5a571fc636fa57c4ae6287e63a1830d8f",
+  "bluetooth/characteristic/readValue/read-succeeds.https.window.js": [
+   "aeece7d11f480e5cf7122ef97bc9eb098a7da883",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/read-updates-value.https.html": [
-   "11bb9391b626f089d1913cd8d93e67c275eb9604",
+  "bluetooth/characteristic/readValue/read-updates-value.https.window.js": [
+   "45da8af25020374c8b876984017fbefc95f4b8f1",
    "testharness"
   ],
-  "bluetooth/characteristic/readValue/service-is-removed.https.html": [
-   "48f8127de83628e3ff01f4d754e9269519209961",
+  "bluetooth/characteristic/readValue/service-is-removed.https.window.js": [
+   "07e9701d3c321dfdf166195ec4eab6c2f354f216",
    "testharness"
   ],
-  "bluetooth/characteristic/service-same-from-2-characteristics.https.html": [
-   "395d49b7f07f1acf7f1b3ee72595fbcecc8201fd",
+  "bluetooth/characteristic/service-same-from-2-characteristics.https.window.js": [
+   "e3bc5d0e103d66368db4b294e3e09d8a9018b792",
    "testharness"
   ],
-  "bluetooth/characteristic/service-same-object.https.html": [
-   "0b2a915721431b23b1dba5a584701039fd82aac4",
+  "bluetooth/characteristic/service-same-object.https.window.js": [
+   "6b1f543ae5e9944d4792a01209417016f4566a2e",
    "testharness"
   ],
   "bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.html": [
    "d9a9594320d5ec337b5b50ac5f7873e547e4b30a",
    "testharness"
   ],
-  "bluetooth/characteristic/writeValue/buffer-is-detached.https.html": [
-   "b8a1abfa5afe3d514d6884b58268dc47cfc15f5e",
+  "bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js": [
+   "35347e3bcf8fdc3c895e6daea5d9b7247cbcfcac",
    "testharness"
   ],
-  "bluetooth/characteristic/writeValue/characteristic-is-removed.https.html": [
-   "f79c21916fba824578eeb20052dba6f86c350adc",
+  "bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js": [
+   "33a963bed0950485a06685df8a601025bd4c419c",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.html": [
    "1652070463057dc48ef64cdb4bfe07379a672a49",
    "testharness"
   ],
-  "bluetooth/characteristic/writeValue/service-is-removed.https.html": [
-   "2b43bfb7c9138c2ba284fdbc63a38afbf8c4f91c",
+  "bluetooth/characteristic/writeValue/service-is-removed.https.window.js": [
+   "a9f812c137f236ac088fbf42886c44e92eabafc4",
    "testharness"
   ],
-  "bluetooth/characteristic/writeValue/write-succeeds.https.html": [
-   "f2cf577e4f9b60c43e5b47b7ee1192f3824e1362",
+  "bluetooth/characteristic/writeValue/write-succeeds.https.window.js": [
+   "1472c619a2dbdf5c8536e240ff024349a6e938ea",
    "testharness"
   ],
   "bluetooth/descriptor/readValue/gen-service-is-removed.https.html": [
@@ -492971,6 +493683,10 @@
    "86e5e190aa043f3961464def7ea01190027a12ee",
    "reftest"
   ],
+  "css/CSS2/linebox/inline-children-root-linebox-crash-001.html": [
+   "7fe6b3ea5df5986a5f747cb8e9c5312afdeede21",
+   "testharness"
+  ],
   "css/CSS2/linebox/inline-formatting-context-001-ref.xht": [
    "d142292ad802391482d806bdc24374b5ee50ca28",
    "support"
@@ -532679,6 +533395,10 @@
    "552416df3d2fe1a08aeb8145c5d263770543aa5e",
    "testharness"
   ],
+  "css/css-backgrounds/parsing/box-shadow-computed.html": [
+   "5d268bf3fd2347d3da641f1354179157b4a96c91",
+   "testharness"
+  ],
   "css/css-backgrounds/parsing/box-shadow-invalid.html": [
    "44f074d05a85fbdf183544da5c6fb5af075ea8da",
    "testharness"
@@ -535332,7 +536052,7 @@
    "reftest"
   ],
   "css/css-contain/contain-style-counters-004.html": [
-   "e0e0528918abe7d3d696c8b077a58f310ad1a810",
+   "4a366e32776d223dba69cb307a1ac06606d3ab3d",
    "reftest"
   ],
   "css/css-contain/contain-style-counters-ref.html": [
@@ -535599,6 +536319,10 @@
    "12f9b989fd2402d5e8af279cd03f03931856270e",
    "support"
   ],
+  "css/css-contain/reference/contain-style-counters-004-ref.html": [
+   "afe60666c02e726ab3c3f2a7f603255168a03b14",
+   "support"
+  ],
   "css/css-contain/reference/contain-subgrid-001.html": [
    "ab0d1fede5367681b74a6790286796249614a5f1",
    "support"
@@ -542495,6 +543219,10 @@
    "ecc601bcf6a97a1722e3901d731f9f424d0a79e1",
    "testharness"
   ],
+  "css/css-fonts/inheritance.html": [
+   "8ff02fb7405a358cb4716716e87adc1bee58fca7",
+   "testharness"
+  ],
   "css/css-fonts/language-specific-01.html": [
    "0438046083112d0497ecad4eb8ad34ff3c98f09b",
    "visual"
@@ -542619,6 +543347,182 @@
    "56cb1eca09d7741275df03ea217e2b31acb04371",
    "testharness"
   ],
+  "css/css-fonts/parsing/font-family-computed.html": [
+   "993b72e6a8f013d92633ce4866e1522c1c554ffe",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-family-invalid.html": [
+   "f4403e7e6424734ea4b3b4acedde90eb3c06c983",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-family-valid.html": [
+   "2dafcc684569a9ea2b8b455ab23644ba7bd1da52",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-feature-settings-computed.html": [
+   "137d9dbbf478a7269fd7047092ee1a56238163fb",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-feature-settings-invalid.html": [
+   "37689ce7058535cb6afbfe99879e0d6209821b61",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-feature-settings-valid.html": [
+   "9ed4b5cde208a9635ab76e78482baafae3bfb8b4",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-invalid.html": [
+   "d6db9338aa2adf5945fd88e29bdd9376e2efe1d1",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-kerning-computed.html": [
+   "5cd0b252ffed757dc59bafcef2abce4c087340da",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-kerning-invalid.html": [
+   "46e94b0a76f274b22d75fe51b5f0207a4ca1a829",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-kerning-valid.html": [
+   "623f860dd79c452b6403c1aa23ebf3ffa9dbbdac",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-adjust-computed.html": [
+   "601e22ee0d13510b8a75ee36afbd508773836b0a",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-adjust-invalid.html": [
+   "8e83052eb0608c68d6a1fce15ac773e84e52fddd",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-adjust-valid.html": [
+   "1e4d0aebe1147beba0ce37e2773125a0b742501e",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-computed.html": [
+   "ebbbeac0802928d0ea8ef0856470b824fcc2f697",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-invalid.html": [
+   "b3bccc289f0c6c1b10f5d6a9d9526cf94e9a3b8b",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-size-valid.html": [
+   "72cf605302fbbd6e425715b0e6dcffac30d28da4",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-stretch-computed.html": [
+   "4a1ecdb6a6b84ba112e36f6745d1ebcac3107ffb",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-stretch-invalid.html": [
+   "9ff8fa5dcf8b60af5fe7d4a83bd0d0bcf227544c",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-stretch-valid.html": [
+   "38452c2699e625cef71d93273535f9002ae2c566",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-style-computed.html": [
+   "a7bb42146a0e2bd8b24b557ad841bca424557026",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-style-invalid.html": [
+   "4542c29cf2ce6a3a6fada6e4392f469c410c4ca7",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-style-valid.html": [
+   "b61864478ba29a82854fe1924832ead4dc199747",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-synthesis-computed.html": [
+   "933a879bfb619626dcded25b99072cac0e477de2",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-synthesis-invalid.html": [
+   "adbe9c0236d0d150950b627fd0cba0e734d0e9ab",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-synthesis-valid.html": [
+   "1d1aa5d29974125dc119223233f237ba4925e699",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-valid.html": [
+   "769e6b42eae37a864fec6577614917f7b1fd7667",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-caps-computed.html": [
+   "03f37ec11c981d67fa08aba4c7a05dd548cd8798",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-caps-invalid.html": [
+   "4c538ad5eb75cf3f0cb6dec5c6dd5d8da48f39ed",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-caps-valid.html": [
+   "f34595a9f295f2952930d32ca6a94f506b10c5bf",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-east-asian-computed.html": [
+   "27b3b1c86dfb19392cdd528c9569582f5bfaccf2",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-east-asian-invalid.html": [
+   "30dbe403b8db67ec1921390e1611683407da3f23",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-east-asian-valid.html": [
+   "0f16ceccfe1fe2668d01dfc64e99f4e3ca3164b1",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-ligatures-computed.html": [
+   "8cc3fce267fd661e29b4954fd22909b5aec0c638",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-ligatures-invalid.html": [
+   "69af66b9b03baa1961e4cbd7470561c7597b339c",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-ligatures-valid.html": [
+   "2fdd99e226700a065ab6c5646f86dd2c6a5a0637",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-numeric-computed.html": [
+   "b7706e2688af587da2266f55cf06e5ab42853f40",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-numeric-invalid.html": [
+   "97f9e1484023cd2b8acea2cb62751ed6c29e5656",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-numeric-valid.html": [
+   "ed240cc36d5ac8701e090748fe1ccb24057a2d53",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-position-computed.html": [
+   "f11c0f6ab972a5121b761cdd416cef827814cbe8",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-position-invalid.html": [
+   "11110ce53b433595b4aa40ffb580068b1726a910",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-variant-position-valid.html": [
+   "3887ab0cc4b59024544338d2338c3a723fe3b625",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-weight-computed.html": [
+   "b88565ee5aa23b20837bf625dd7cf08587dacb7e",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-weight-invalid.html": [
+   "af81569306247f3715dc7904490d9bd53fb2cce4",
+   "testharness"
+  ],
+  "css/css-fonts/parsing/font-weight-valid.html": [
+   "090729287b265ab3992a44867a622be595b5e7e9",
+   "testharness"
+  ],
   "css/css-fonts/quoted-generic-ignored-ref.html": [
    "70e2d50cd83f61017f0f22da14065c7afa76e1d1",
    "support"
@@ -569164,7 +570068,7 @@
    "support"
   ],
   "css/css-text/text-transform/math/text-transform-math-auto-002.tentative.html": [
-   "86c1ea17c76b40a0a69ab1daf1ad563e810e4dcc",
+   "32bad74f94d682db15f893b5a61c85c113083ef7",
    "reftest"
   ],
   "css/css-text/text-transform/math/text-transform-math-bold-001.tentative-ref.html": [
@@ -576840,7 +577744,7 @@
    "testharness"
   ],
   "css/css-transitions/CSSTransition-effect.tentative.html": [
-   "3979dd29533ad3a3af7135aaa5255721aa100702",
+   "a6153b33171daee1dc0e9cb5b98c2ff89059fbae",
    "testharness"
   ],
   "css/css-transitions/CSSTransition-finished.tentative.html": [
@@ -580083,6 +580987,10 @@
    "3dfa4f979419af8ced63af5aa73c32ea68d11095",
    "testharness"
   ],
+  "css/css-ui/parsing/caret-color-computed.html": [
+   "0428c783f5b0b0efc664d18529f8cae22acf72e2",
+   "testharness"
+  ],
   "css/css-ui/parsing/caret-color-invalid.html": [
    "a59b01ec2bb6d2ada5acef7ac7ec68417d79fa03",
    "testharness"
@@ -580103,6 +581011,10 @@
    "285c16a4ee513b898d9d1c2852ae40897bb12545",
    "testharness"
   ],
+  "css/css-ui/parsing/outline-color-computed.html": [
+   "b9aab1d230a226e64cd5be736091d6ffaf1d003c",
+   "testharness"
+  ],
   "css/css-ui/parsing/outline-color-invalid.html": [
    "2b910e803038e3c9892a7e3ee09473a410d84465",
    "testharness"
@@ -604644,7 +605556,7 @@
    "support"
   ],
   "docs/writing-tests/python-handlers/index.md": [
-   "ffb990b5b5d9f40ed401d7bc2ee50406d8c10009",
+   "f75703bb9efdb1a467b9172be9385bfdd63ad537",
    "support"
   ],
   "docs/writing-tests/reftests.md": [
@@ -604656,11 +605568,11 @@
    "support"
   ],
   "docs/writing-tests/server-features.md": [
-   "17fa1a887a779cedc8fdbbf40758ae0b1f26f68e",
+   "cf1ae3b174ca5b298dbc8457723e0cd669f73b0a",
    "support"
   ],
   "docs/writing-tests/server-pipes.md": [
-   "a2a09854a98ada790032fe31a2f5829322c37d87",
+   "4f4011a6c2148dc91358e89f31f234a6fd82d7b8",
    "support"
   ],
   "docs/writing-tests/submission-process.md": [
@@ -607075,6 +607987,10 @@
    "68eeeefe15fdc587cdf0d4382f90c33ee3230290",
    "testharness"
   ],
+  "element-timing/buffered-flag.html": [
+   "19c387d26b9c22ed10c352c57d5c771ea75363ba",
+   "testharness"
+  ],
   "element-timing/cross-origin-element.sub.html": [
    "40a97056c2bfba92485f627117f61cd56a563d0b",
    "testharness"
@@ -607223,6 +608139,10 @@
    "4d51ac4b4633f0a24155f331ee63035e62b6dbe1",
    "support"
   ],
+  "element-timing/retrievability.html": [
+   "3ac04d8278512ae9b35913c215ffd4ace97a9f8b",
+   "testharness"
+  ],
   "element-timing/supported-element-type.html": [
    "15733d46f95c9079acfec06cdd25f70ca0e056a6",
    "testharness"
@@ -609380,7 +610300,7 @@
    "testharness"
   ],
   "event-timing/onloadthenobserve-firstInput.html": [
-   "4efdfbbf006cdd8577b4d11b668974bfe20aaa84",
+   "fe40bdf65fbb61671e01a4c11039027deaed677a",
    "testharness"
   ],
   "event-timing/onloadthenobserve.html": [
@@ -609388,11 +610308,11 @@
    "testharness"
   ],
   "event-timing/only-observe-firstInput.html": [
-   "dd6a18ea484e7f1031da525773c31b208afd39bb",
+   "d356902c31d4b9d6d23042d8f57cb1d9ec2a8447",
    "testharness"
   ],
   "event-timing/programmatic-click-not-observed.html": [
-   "4c7c4e74a9be4e3599e9715cc5acf77c93771440",
+   "9eb067024da8c01c2575eeb6ff86c27329498a68",
    "testharness"
   ],
   "event-timing/resources/crossiframe-childframe.html": [
@@ -609400,7 +610320,7 @@
    "support"
   ],
   "event-timing/resources/event-timing-test-utils.js": [
-   "53cd49795b50bd4fb72e206ce950807d3487ba10",
+   "83f1bc7f32aa1d7900e235737caba183d2d27da2",
    "support"
   ],
   "event-timing/resources/observer-manual-childframe.html": [
@@ -609412,15 +610332,15 @@
    "support"
   ],
   "event-timing/retrievability.html": [
-   "3a762e7aa79f2a1d95ad9f916d67e25f94378101",
+   "cdb47c6a50480087b92a35ce86c621e28f23d8a7",
    "testharness"
   ],
   "event-timing/retrieve-firstInput.html": [
-   "ae66fd9d04cba40b5f8887bdba7ff1182ee72e58",
+   "5ea5d74b1a86abf81d69ec1165b58ecd07a72ea5",
    "testharness"
   ],
   "event-timing/supported-types.window.js": [
-   "c81d501f49fc583904ebf3fd4e83bb315e718d7e",
+   "443c2533c2e503145e8c3639050f89d1277993bd",
    "testharness"
   ],
   "event-timing/timingconditions.html": [
@@ -633615,6 +634535,10 @@
    "cbae6b15410e13433c4a9fadd8c2a8cc5fbc4fdc",
    "support"
   ],
+  "infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini": [
+   "c83e8ff9261b78084f75fb584a8b5236cc28c3fd",
+   "support"
+  ],
   "infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini": [
    "49e4a40016e0eb2304a5e6e61b19556818c4ef3d",
    "support"
@@ -633815,6 +634739,10 @@
    "ea7973a62e0ee9cdc874879fd844b2309e944e61",
    "testharness"
   ],
+  "infrastructure/testdriver/actions/actionsWithKeyPressed.html": [
+   "74e939f5fde4773aade6ce4f7bbee573e39ae8ec",
+   "testharness"
+  ],
   "infrastructure/testdriver/actions/elementPosition.html": [
    "145852e7b51bd0cdc9e7b4ef5ebddcbf1c0235c5",
    "testharness"
@@ -634924,23 +635852,23 @@
    "testharness"
   ],
   "largest-contentful-paint/cross-origin-image.sub.html": [
-   "3716f9319227c0f5bdfbcf17a21a718cf7dd72e8",
+   "fd4844d16b3a3b150ad98747184e4c3bb25c2f81",
    "testharness"
   ],
   "largest-contentful-paint/observe-image.html": [
-   "8adf2150afcc74082d173f06f6aa929c33a52b87",
+   "a1ecbceb503a31c99ff070ff06146014f8c3fdf9",
    "testharness"
   ],
   "largest-contentful-paint/observe-text.html": [
-   "a9a0d750d66712eaf72fca9897d84794ae44c35d",
+   "58897907365d3156e838ca9e0a65db289ea4cfec",
    "testharness"
   ],
   "layout-instability/buffer-layout-shift.html": [
-   "5d2e69f1ff2ab2f673f432b3b69d678ff1d9a218",
+   "216cafd45de0785b27a0ca7fa009352de7887e23",
    "testharness"
   ],
   "layout-instability/observe-layout-shift.html": [
-   "1aa429b6b68df3872f2f1e8dbd591d8a171361ba",
+   "a522b49034e58c7aafd98eacae12353bc3476d06",
    "testharness"
   ],
   "layout-instability/resources/slow-image.py": [
@@ -634948,7 +635876,7 @@
    "support"
   ],
   "layout-instability/supported-layout-type.html": [
-   "af0ff3aa138c41bc8ce2ec1447381bf036a167e2",
+   "9bc537016581274e03b09e677f3fe8c36f3c613e",
    "testharness"
   ],
   "lifecycle/META.yml": [
@@ -647335,6 +648263,14 @@
    "46f16ae5f31aa388cfd1f7ff759a5df44d17fd0a",
    "support"
   ],
+  "performance-timeline/buffered-flag-after-timeout.any.js": [
+   "08b3e3231465857cf248e4ace8ef574469a14864",
+   "testharness"
+  ],
+  "performance-timeline/buffered-flag-observer.any.js": [
+   "31dc39c128ad55c13eef66583a6888622f86bf63",
+   "testharness"
+  ],
   "performance-timeline/case-sensitivity.any.js": [
    "588b59cc6a796b64aa4ad42137700430805a1d16",
    "testharness"
@@ -647347,6 +648283,14 @@
    "585bda92dced217354f93fb5beebe6d930890c0e",
    "testharness"
   ],
+  "performance-timeline/multiple-buffered-flag-observers.any.js": [
+   "5dd44fb18fbdb9c3c32f4538d2ef7ec2cac47302",
+   "testharness"
+  ],
+  "performance-timeline/observer-buffered-false.any.js": [
+   "a28100b0fdba2e00579809a581935d312cf1245e",
+   "testharness"
+  ],
   "performance-timeline/performanceentry-tojson.any.js": [
    "44f0156eec19241970028c28e5897be4d6f1cb81",
    "testharness"
@@ -659275,10 +660219,6 @@
    "be3e6afd423f767369725724eb3509447c852a59",
    "support"
   ],
-  "server-side.md": [
-   "46a9e8367c3cf4fa6a04c908143175b414f132dd",
-   "support"
-  ],
   "server-timing/META.yml": [
    "f20b425fc5e69d41083c40b8a5d76d69efe510cf",
    "support"
@@ -662243,10 +663183,6 @@
    "79f08991174cb50735f8bc0631876c22b3359be1",
    "support"
   ],
-  "service-workers/service-worker/resources/worker-interception-iframe.https.html": [
-   "87b0ed3f2498552d995cc5086fcc15b90d47097f",
-   "support"
-  ],
   "service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js": [
    "f5ba5a38df5a7893dca3e2db47b4395c5360db2c",
    "support"
@@ -662456,7 +663392,7 @@
    "testharness"
   ],
   "service-workers/service-worker/worker-interception.https.html": [
-   "6b66fb0f02296410f4d96076c68deb798024e7b9",
+   "204638a44afffda47c39d1e0fed7d9a3cf3972fc",
    "testharness"
   ],
   "service-workers/service-worker/xhr-response-url.https.html": [
@@ -663424,7 +664360,7 @@
    "support"
   ],
   "signed-exchange/resources/generate-test-sxgs.sh": [
-   "16750f25438a52d4cbe74ea98827bb1743ca37ac",
+   "81a5e043469c5586a49326ac72896c15c7520508",
    "support"
   ],
   "signed-exchange/resources/inner-url.html": [
@@ -663459,6 +664395,22 @@
    "ddbe3503548ae2915253ad1f0ccc62d4278bf17a",
    "support"
   ],
+  "signed-exchange/resources/sxg-subresource-iframe.html": [
+   "bd812857b46a24a69d1c7bb76917fad2e03e4342",
+   "support"
+  ],
+  "signed-exchange/resources/sxg-subresource-script-inner.js": [
+   "dcc7a356a0a222b3cf4064f2aeb5a40c9a209338",
+   "support"
+  ],
+  "signed-exchange/resources/sxg-subresource-script.js": [
+   "c730568fcfa9393c7807e9c5d41ded2d59f394b7",
+   "support"
+  ],
+  "signed-exchange/resources/sxg-subresource-sxg-inner.html": [
+   "9dfff56ad8fced46ee816fc2239ab9efb1560761",
+   "support"
+  ],
   "signed-exchange/resources/sxg-util.js": [
    "78edf137408f93150209f76b6e492d13805ca95a",
    "support"
@@ -663583,6 +664535,18 @@
    "cc7793efa287b21d10c8c92dcd371a7938b31686",
    "support"
   ],
+  "signed-exchange/resources/sxg/sxg-subresource-script.sxg": [
+   "6a6f37e781865db4aaf801ff6ffef1da96f7a33c",
+   "support"
+  ],
+  "signed-exchange/resources/sxg/sxg-subresource.sxg": [
+   "05be42adcc164ad51af413da3745566588cb8ece",
+   "support"
+  ],
+  "signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers": [
+   "8bc3938df8ac90e655b3aa6aeb342cd092ccc9b1",
+   "support"
+  ],
   "signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg": [
    "3edf285f1bd5affc5c575ca258a8cd3cfa546e35",
    "support"
@@ -663611,6 +664575,10 @@
    "ad21ebb20d44c846bd99cbffeb510c8af2bb81ea",
    "testharness"
   ],
+  "signed-exchange/subresource/sxg-subresource.tentative.html": [
+   "8ca12b4cbcf3c0950c04deed96e7174247444a25",
+   "testharness"
+  ],
   "signed-exchange/sxg-data-cert-url.tentative.html": [
    "0d6bd5602e0ca0e6610b9fe2fb48b94fd5821bfd",
    "testharness"
@@ -673304,7 +674272,7 @@
    "support"
   ],
   "tools/webdriver/webdriver/client.py": [
-   "1ce49069cfdc128f4ea0e6584bd13bac4d50774a",
+   "781eabdbc4dd46779064c1ebfcc2c99a86e1d3a0",
    "support"
   ],
   "tools/webdriver/webdriver/error.py": [
@@ -673324,7 +674292,7 @@
    "support"
   ],
   "tools/wpt/browser.py": [
-   "b093600b596fa8d3736b72e842bcbacdd82f6463",
+   "23e91a7aa40b82081ea10f2638c7414b61fe9456",
    "support"
   ],
   "tools/wpt/commands.json": [
@@ -673352,7 +674320,7 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "fec2afc9a365b9daa813cfe6463060958a4a7a1b",
+   "282dd29178b626ffc19b0e896f759b6fa388789f",
    "support"
   ],
   "tools/wpt/testfiles.py": [
@@ -673392,7 +674360,7 @@
    "support"
   ],
   "tools/wpt/virtualenv.py": [
-   "e0f51d561b633403b3400fb81173569cd9438ff6",
+   "a894c9c68d276ee7e621de56b646b25206a17421",
    "support"
   ],
   "tools/wpt/wpt.py": [
@@ -673712,7 +674680,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/base.py": [
-   "d1c123a3ef39c016fb32475e5255c119f306a828",
+   "588e0b2fad6afbe17ed4ba9ea5b8f25cc9b7e055",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorchrome.py": [
@@ -673732,7 +674700,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executormarionette.py": [
-   "7ab701879ff1c0186a077c9e0dad313f6064ed6a",
+   "c46571bd544927fca7b3fb2a8c167b5f7cf51311",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executoropera.py": [
@@ -673744,7 +674712,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorselenium.py": [
-   "e7b9f45dc81d5f11f58beeefff9d9f76d6bc1047",
+   "9a2d223f6495356859aec05035deec2f775a7f22",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorservo.py": [
@@ -673756,7 +674724,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebdriver.py": [
-   "65938a7678b1aefc003faa05521dfde3a0edaaa1",
+   "ce7691c4d565ac330b7f941111d36b7e035ef7db",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebkit.py": [
@@ -673768,7 +674736,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/protocol.py": [
-   "d08b74bfc36ae97cebaa148741701dcc2a767399",
+   "7da592396096db85479dd65162ae63775856a937",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py": [
@@ -673856,7 +674824,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/testdriver-extra.js": [
-   "09d7c2908671228e625d0717e567d751470fe6cd",
+   "e23073dece1f35db632d48ad6036a90a9cc12b46",
    "support"
   ],
   "tools/wptrunner/wptrunner/testdriver-vendor.js": [
@@ -673884,7 +674852,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/testrunner.py": [
-   "44b5401e4f8410b8ed68940b6845c6db590b68c5",
+   "d7b51c5eb275842b873c3cd7dbba6d065a8b0373",
    "support"
   ],
   "tools/wptrunner/wptrunner/tests/__init__.py": [
@@ -674284,7 +675252,7 @@
    "support"
   ],
   "tools/wptserve/tests/functional/test_response.py": [
-   "20fb3f776a9e98e2a6c95f23bf5b5d03bb0c0c27",
+   "d8d64d54ccc78a3c6deba21b73428e71aeb1be60",
    "support"
   ],
   "tools/wptserve/tests/functional/test_server.py": [
@@ -675187,6 +676155,10 @@
    "a97a31d766bd96f0030a047632c3342c70abf3d8",
    "support"
   ],
+  "user-timing/buffered-flag.any.js": [
+   "e3e60656317d523961a1c9bb459be1d8cacfebda",
+   "testharness"
+  ],
   "user-timing/clearMarks.html": [
    "92c60a3bbb856bd05bf13f12bde09dac7eefb6e6",
    "testharness"
@@ -675327,6 +676299,10 @@
    "822376be24c2fc7e45441e47a1a3f09d341e7bac",
    "support"
   ],
+  "user-timing/structured-serialize-detail.html": [
+   "c9689fe33480dfcd71bbb953804b7d6308988cb2",
+   "testharness"
+  ],
   "user-timing/supported-usertiming-types.any.js": [
    "ea3b2fe9dc90f70f3998a94a1460460b8b8b5992",
    "testharness"
diff --git a/tests/wpt/metadata/bluetooth/characteristic/characteristicProperties.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/characteristicProperties.https.window.js.ini
new file mode 100644
index 00000000000..7d5590044cc
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/characteristicProperties.https.window.js.ini
@@ -0,0 +1,4 @@
+[characteristicProperties.https.window.html]
+  [HeartRate device properties]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..3105a0f9239
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[characteristic-is-removed.https.window.html]
+  [Characteristic is removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/notifications/service-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/notifications/service-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..17ce130ff75
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/notifications/service-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[service-is-removed.https.window.html]
+  [Service is removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js.ini
new file mode 100644
index 00000000000..55e07ad21b7
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js.ini
@@ -0,0 +1,4 @@
+[add-multiple-event-listeners.https.window.html]
+  [Add multiple event listeners then readValue().]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..c5032c5b28b
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[characteristic-is-removed.https.window.html]
+  [Characteristic gets removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/event-is-fired.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/event-is-fired.https.window.js.ini
new file mode 100644
index 00000000000..57097bf2c43
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/event-is-fired.https.window.js.ini
@@ -0,0 +1,4 @@
+[event-is-fired.https.window.html]
+  [Reading a characteristic should fire an event.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/read-succeeds.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/read-succeeds.https.window.js.ini
new file mode 100644
index 00000000000..ebfec4e2a27
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/read-succeeds.https.window.js.ini
@@ -0,0 +1,4 @@
+[read-succeeds.https.window.html]
+  [A read request succeeds and returns the characteristic's value.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/read-updates-value.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/read-updates-value.https.window.js.ini
new file mode 100644
index 00000000000..17e966c69c7
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/read-updates-value.https.window.js.ini
@@ -0,0 +1,4 @@
+[read-updates-value.https.window.html]
+  [Succesful read should update characteristic.value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/readValue/service-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/readValue/service-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..6fde66b04c8
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/readValue/service-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[service-is-removed.https.window.html]
+  [Service gets removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js.ini
new file mode 100644
index 00000000000..e799d15fcdc
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js.ini
@@ -0,0 +1,4 @@
+[service-same-from-2-characteristics.https.window.html]
+  [Same parent service returned from multiple characteristics.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/service-same-object.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/service-same-object.https.window.js.ini
new file mode 100644
index 00000000000..8c1c44079af
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/service-same-object.https.window.js.ini
@@ -0,0 +1,4 @@
+[service-same-object.https.window.html]
+  [[SameObject\] test for BluetoothRemoteGATTCharacteristic service.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js.ini
new file mode 100644
index 00000000000..900b56a01c7
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js.ini
@@ -0,0 +1,4 @@
+[buffer-is-detached.https.window.html]
+  [writeValue() fails when passed a detached buffer]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..c5032c5b28b
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[characteristic-is-removed.https.window.html]
+  [Characteristic gets removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/writeValue/service-is-removed.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/writeValue/service-is-removed.https.window.js.ini
new file mode 100644
index 00000000000..6fde66b04c8
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/writeValue/service-is-removed.https.window.js.ini
@@ -0,0 +1,4 @@
+[service-is-removed.https.window.html]
+  [Service gets removed. Reject with InvalidStateError.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/characteristic/writeValue/write-succeeds.https.window.js.ini b/tests/wpt/metadata/bluetooth/characteristic/writeValue/write-succeeds.https.window.js.ini
new file mode 100644
index 00000000000..df37a229b93
--- /dev/null
+++ b/tests/wpt/metadata/bluetooth/characteristic/writeValue/write-succeeds.https.window.js.ini
@@ -0,0 +1,4 @@
+[write-succeeds.https.window.html]
+  [A regular write request to a writable characteristic should succeed.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/inheritance.html.ini b/tests/wpt/metadata/css/css-fonts/inheritance.html.ini
new file mode 100644
index 00000000000..d89d8b50254
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/inheritance.html.ini
@@ -0,0 +1,55 @@
+[inheritance.html]
+  [Property font-kerning has initial value auto]
+    expected: FAIL
+
+  [Property font-variant-east-asian inherits]
+    expected: FAIL
+
+  [Property font-variant-east-asian has initial value normal]
+    expected: FAIL
+
+  [Property font-variant inherits]
+    expected: FAIL
+
+  [Property font-variant-position inherits]
+    expected: FAIL
+
+  [Property font-size-adjust inherits]
+    expected: FAIL
+
+  [Property font-variant-ligatures has initial value normal]
+    expected: FAIL
+
+  [Property font-variant has initial value normal]
+    expected: FAIL
+
+  [Property font-variant-ligatures inherits]
+    expected: FAIL
+
+  [Property font-synthesis has initial value weight style]
+    expected: FAIL
+
+  [Property font-variant-numeric inherits]
+    expected: FAIL
+
+  [Property font-synthesis inherits]
+    expected: FAIL
+
+  [Property font-feature-settings inherits]
+    expected: FAIL
+
+  [Property font-feature-settings has initial value normal]
+    expected: FAIL
+
+  [Property font-variant-numeric has initial value normal]
+    expected: FAIL
+
+  [Property font-variant-position has initial value normal]
+    expected: FAIL
+
+  [Property font-size-adjust has initial value none]
+    expected: FAIL
+
+  [Property font-kerning inherits]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-computed.html.ini
new file mode 100644
index 00000000000..1148fa32756
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-computed.html.ini
@@ -0,0 +1,25 @@
+[font-feature-settings-computed.html]
+  [Property font-feature-settings value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property font-feature-settings value '"liga" 0' computes to '"liga" 0']
+    expected: FAIL
+
+  [Property font-feature-settings value '"smcp"' computes to '"smcp"']
+    expected: FAIL
+
+  [Property font-feature-settings value '"tnum", "hist"' computes to '"tnum", "hist"']
+    expected: FAIL
+
+  [Property font-feature-settings value '"dlig"' computes to '"dlig"']
+    expected: FAIL
+
+  [Property font-feature-settings value '"c2sc"' computes to '"c2sc"']
+    expected: FAIL
+
+  [Property font-feature-settings value '"PKRN"' computes to '"PKRN"']
+    expected: FAIL
+
+  [Property font-feature-settings value '"dlig", "smcp", "dlig" 0' computes to '"dlig", "smcp", "dlig" 0']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-valid.html.ini
new file mode 100644
index 00000000000..19401d84319
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-feature-settings-valid.html.ini
@@ -0,0 +1,25 @@
+[font-feature-settings-valid.html]
+  [e.style['font-feature-settings'\] = "'c2sc'" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"dlig\\" 1" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"smcp\\" on" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"tnum\\", 'hist'" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"PKRN\\"" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"liga\\" off" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-feature-settings'\] = "\\"dlig\\" 1, \\"smcp\\" on, \\"dlig\\" 0" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-computed.html.ini
new file mode 100644
index 00000000000..211838e7cd9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-computed.html.ini
@@ -0,0 +1,10 @@
+[font-kerning-computed.html]
+  [Property font-kerning value 'none' computes to 'none']
+    expected: FAIL
+
+  [Property font-kerning value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property font-kerning value 'auto' computes to 'auto']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-valid.html.ini
new file mode 100644
index 00000000000..6466fc26b82
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-kerning-valid.html.ini
@@ -0,0 +1,10 @@
+[font-kerning-valid.html]
+  [e.style['font-kerning'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['font-kerning'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['font-kerning'\] = "normal" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-computed.html.ini
new file mode 100644
index 00000000000..dba0bd0bcc9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-computed.html.ini
@@ -0,0 +1,7 @@
+[font-size-adjust-computed.html]
+  [Property font-size-adjust value 'none' computes to 'none']
+    expected: FAIL
+
+  [Property font-size-adjust value '0.5' computes to '0.5']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-valid.html.ini
new file mode 100644
index 00000000000..6037eb65374
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-size-adjust-valid.html.ini
@@ -0,0 +1,7 @@
+[font-size-adjust-valid.html]
+  [e.style['font-size-adjust'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['font-size-adjust'\] = "0.5" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini
new file mode 100644
index 00000000000..8a1237e8bb6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini
@@ -0,0 +1,16 @@
+[font-size-computed.html]
+  [<font size="4"> is font-size: large]
+    expected: FAIL
+
+  [<font size="2"> is font-size: small]
+    expected: FAIL
+
+  [<font size="7"> is font-size: xxx-large]
+    expected: FAIL
+
+  [<font size="6"> is font-size: xx-large]
+    expected: FAIL
+
+  [<font size="5"> is font-size: x-large]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-size-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-size-valid.html.ini
new file mode 100644
index 00000000000..4b1533148fc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-size-valid.html.ini
@@ -0,0 +1,4 @@
+[font-size-valid.html]
+  [e.style['font-size'\] = "xxx-large" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-computed.html.ini
new file mode 100644
index 00000000000..8ad737926c9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-computed.html.ini
@@ -0,0 +1,13 @@
+[font-synthesis-computed.html]
+  [Property font-synthesis value 'style' computes to 'style']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight' computes to 'weight']
+    expected: FAIL
+
+  [Property font-synthesis value 'weight style' computes to 'weight style']
+    expected: FAIL
+
+  [Property font-synthesis value 'none' computes to 'none']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-valid.html.ini
new file mode 100644
index 00000000000..fd41da6ed74
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-synthesis-valid.html.ini
@@ -0,0 +1,13 @@
+[font-synthesis-valid.html]
+  [e.style['font-synthesis'\] = "style weight" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "weight" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['font-synthesis'\] = "style" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-valid.html.ini
new file mode 100644
index 00000000000..e86a1dbea6e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-valid.html.ini
@@ -0,0 +1,19 @@
+[font-valid.html]
+  [message-box should be a supported system font.]
+    expected: FAIL
+
+  [status-bar should be a supported system font.]
+    expected: FAIL
+
+  [menu should be a supported system font.]
+    expected: FAIL
+
+  [icon should be a supported system font.]
+    expected: FAIL
+
+  [small-caption should be a supported system font.]
+    expected: FAIL
+
+  [caption should be a supported system font.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-computed.html.ini
new file mode 100644
index 00000000000..cbc02f7cb8e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-computed.html.ini
@@ -0,0 +1,16 @@
+[font-variant-caps-computed.html]
+  [Property font-variant-caps value 'unicase' computes to 'unicase']
+    expected: FAIL
+
+  [Property font-variant-caps value 'titling-caps' computes to 'titling-caps']
+    expected: FAIL
+
+  [Property font-variant-caps value 'all-small-caps' computes to 'all-small-caps']
+    expected: FAIL
+
+  [Property font-variant-caps value 'all-petite-caps' computes to 'all-petite-caps']
+    expected: FAIL
+
+  [Property font-variant-caps value 'petite-caps' computes to 'petite-caps']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-valid.html.ini
new file mode 100644
index 00000000000..42bec63669b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-caps-valid.html.ini
@@ -0,0 +1,16 @@
+[font-variant-caps-valid.html]
+  [e.style['font-variant-caps'\] = "all-petite-caps" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-caps'\] = "all-small-caps" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-caps'\] = "unicase" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-caps'\] = "petite-caps" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-caps'\] = "titling-caps" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-computed.html.ini
new file mode 100644
index 00000000000..b9cf050a1a3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-computed.html.ini
@@ -0,0 +1,37 @@
+[font-variant-east-asian-computed.html]
+  [Property font-variant-east-asian value 'jis90' computes to 'jis90']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'simplified' computes to 'simplified']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'jis04' computes to 'jis04']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'full-width' computes to 'full-width']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'proportional-width' computes to 'proportional-width']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'simplified full-width ruby' computes to 'simplified full-width ruby']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'jis78 proportional-width' computes to 'jis78 proportional-width']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'jis78' computes to 'jis78']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'jis83' computes to 'jis83']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'ruby' computes to 'ruby']
+    expected: FAIL
+
+  [Property font-variant-east-asian value 'traditional' computes to 'traditional']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-valid.html.ini
new file mode 100644
index 00000000000..b072dcea817
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-east-asian-valid.html.ini
@@ -0,0 +1,37 @@
+[font-variant-east-asian-valid.html]
+  [e.style['font-variant-east-asian'\] = "jis83" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "ruby full-width simplified" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "jis78 proportional-width" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "jis04" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "ruby" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "proportional-width" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "jis90" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "jis78" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "full-width" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "simplified" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-east-asian'\] = "traditional" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-computed.html.ini
new file mode 100644
index 00000000000..aa3ef8279aa
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-computed.html.ini
@@ -0,0 +1,31 @@
+[font-variant-ligatures-computed.html]
+  [Property font-variant-ligatures value 'none' computes to 'none']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'historical-ligatures' computes to 'historical-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'discretionary-ligatures' computes to 'discretionary-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'no-historical-ligatures' computes to 'no-historical-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'no-common-ligatures' computes to 'no-common-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'contextual' computes to 'contextual']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'common-ligatures' computes to 'common-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'no-discretionary-ligatures' computes to 'no-discretionary-ligatures']
+    expected: FAIL
+
+  [Property font-variant-ligatures value 'no-contextual' computes to 'no-contextual']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-valid.html.ini
new file mode 100644
index 00000000000..48cbbd0255b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-ligatures-valid.html.ini
@@ -0,0 +1,31 @@
+[font-variant-ligatures-valid.html]
+  [e.style['font-variant-ligatures'\] = "contextual" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "historical-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "no-historical-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "no-discretionary-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "common-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "no-common-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "discretionary-ligatures" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-ligatures'\] = "no-contextual" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-computed.html.ini
new file mode 100644
index 00000000000..5e02c786180
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-computed.html.ini
@@ -0,0 +1,34 @@
+[font-variant-numeric-computed.html]
+  [Property font-variant-numeric value 'lining-nums' computes to 'lining-nums']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'diagonal-fractions' computes to 'diagonal-fractions']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'proportional-nums' computes to 'proportional-nums']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'lining-nums proportional-nums stacked-fractions ordinal slashed-zero' computes to 'lining-nums proportional-nums stacked-fractions ordinal slashed-zero']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'ordinal' computes to 'ordinal']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'oldstyle-nums tabular-nums diagonal-fractions' computes to 'oldstyle-nums tabular-nums diagonal-fractions']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'oldstyle-nums' computes to 'oldstyle-nums']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'tabular-nums' computes to 'tabular-nums']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'stacked-fractions' computes to 'stacked-fractions']
+    expected: FAIL
+
+  [Property font-variant-numeric value 'slashed-zero' computes to 'slashed-zero']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-valid.html.ini
new file mode 100644
index 00000000000..cd53846619d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-numeric-valid.html.ini
@@ -0,0 +1,34 @@
+[font-variant-numeric-valid.html]
+  [e.style['font-variant-numeric'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "diagonal-fractions" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "oldstyle-nums" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "lining-nums" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "oldstyle-nums tabular-nums diagonal-fractions" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "stacked-fractions" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "tabular-nums" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "ordinal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "proportional-nums" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "slashed-zero ordinal stacked-fractions proportional-nums lining-nums" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-numeric'\] = "slashed-zero" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-computed.html.ini
new file mode 100644
index 00000000000..5ff2096182a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-computed.html.ini
@@ -0,0 +1,10 @@
+[font-variant-position-computed.html]
+  [Property font-variant-position value 'sub' computes to 'sub']
+    expected: FAIL
+
+  [Property font-variant-position value 'super' computes to 'super']
+    expected: FAIL
+
+  [Property font-variant-position value 'normal' computes to 'normal']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-valid.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-valid.html.ini
new file mode 100644
index 00000000000..b1b9b2ec4e2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-variant-position-valid.html.ini
@@ -0,0 +1,10 @@
+[font-variant-position-valid.html]
+  [e.style['font-variant-position'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-position'\] = "super" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variant-position'\] = "sub" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/CSSTransition-effect.tentative.html.ini b/tests/wpt/metadata/css/css-transitions/CSSTransition-effect.tentative.html.ini
index 3f96cef0698..09cab11e134 100644
--- a/tests/wpt/metadata/css/css-transitions/CSSTransition-effect.tentative.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/CSSTransition-effect.tentative.html.ini
@@ -17,3 +17,6 @@
   [After setting a transition's effect to null, style is updated]
     expected: FAIL
 
+  [After setting a transition's effect to null, a new transition can be started]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/caret-color-computed.html.ini b/tests/wpt/metadata/css/css-ui/parsing/caret-color-computed.html.ini
new file mode 100644
index 00000000000..9103c108a5f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/caret-color-computed.html.ini
@@ -0,0 +1,10 @@
+[caret-color-computed.html]
+  [Property caret-color value 'currentColor' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property caret-color value 'auto' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property caret-color value 'red' computes to 'rgb(255, 0, 0)']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 708984e6952..e9550c763e7 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -318,12 +318,18 @@
   [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index c7413d589dc..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -59,6 +59,3 @@
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 2441091c676..2023a855086 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,12 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20'NosniFF']
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20%2Cnosniff]
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 385376c7321..dc2e45516de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
index 9d841e61bc0..28f93ee71b5 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
@@ -1,48 +1,32 @@
 [open-features-non-integer-width.html]
   type: testharness
-  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `width`]
     expected: FAIL
 
   [features "width=405^4" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405.5" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405e1" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405  " should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405.32" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405LLl" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405*3" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405e-1" should set "width=405"]
-    expected: TIMEOUT
+    expected: FAIL
 
   [features "width=405/5" should set "width=405"]
-    expected: TIMEOUT
-
-  [top=0,left=0: absence of feature "width" should be treated same as "width=0"]
-    expected: TIMEOUT
-
-  [features "width=_404" should NOT set "width=404"]
-    expected: TIMEOUT
-
-  [top=0,left=0,height=401,: absence of feature "width" should be treated same as "width=0"]
-    expected: TIMEOUT
-
-  [features "width=/404" should NOT set "width=404"]
-    expected: TIMEOUT
-
-  [features "width=L404" should NOT set "width=404"]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
new file mode 100644
index 00000000000..9e522297c94
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@@ -0,0 +1,7 @@
+[toggleEvent.html]
+  [Calling open twice on 'details' fires only one toggle event]
+    expected: FAIL
+
+  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/buffered-flag-after-timeout.any.js.ini b/tests/wpt/metadata/performance-timeline/buffered-flag-after-timeout.any.js.ini
new file mode 100644
index 00000000000..1069b54261c
--- /dev/null
+++ b/tests/wpt/metadata/performance-timeline/buffered-flag-after-timeout.any.js.ini
@@ -0,0 +1,9 @@
+[buffered-flag-after-timeout.any.html]
+  [PerformanceObserver with buffered flag sees entry after timeout]
+    expected: FAIL
+
+
+[buffered-flag-after-timeout.any.worker.html]
+  [PerformanceObserver with buffered flag sees entry after timeout]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/buffered-flag-observer.any.js.ini b/tests/wpt/metadata/performance-timeline/buffered-flag-observer.any.js.ini
new file mode 100644
index 00000000000..b076184db3e
--- /dev/null
+++ b/tests/wpt/metadata/performance-timeline/buffered-flag-observer.any.js.ini
@@ -0,0 +1,9 @@
+[buffered-flag-observer.any.html]
+  [PerformanceObserver with buffered flag should see past and future entries.]
+    expected: FAIL
+
+
+[buffered-flag-observer.any.worker.html]
+  [PerformanceObserver with buffered flag should see past and future entries.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/multiple-buffered-flag-observers.any.js.ini b/tests/wpt/metadata/performance-timeline/multiple-buffered-flag-observers.any.js.ini
new file mode 100644
index 00000000000..390c2e4cec2
--- /dev/null
+++ b/tests/wpt/metadata/performance-timeline/multiple-buffered-flag-observers.any.js.ini
@@ -0,0 +1,11 @@
+[multiple-buffered-flag-observers.any.html]
+  expected: ERROR
+  [Multiple PerformanceObservers with buffered flag see all entries]
+    expected: TIMEOUT
+
+
+[multiple-buffered-flag-observers.any.worker.html]
+  expected: ERROR
+  [Multiple PerformanceObservers with buffered flag see all entries]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/performance-timeline/observer-buffered-false.any.js.ini b/tests/wpt/metadata/performance-timeline/observer-buffered-false.any.js.ini
new file mode 100644
index 00000000000..5939a89c650
--- /dev/null
+++ b/tests/wpt/metadata/performance-timeline/observer-buffered-false.any.js.ini
@@ -0,0 +1,9 @@
+[observer-buffered-false.any.html]
+  [PerformanceObserver without buffered flag set to false cannot see past entries.]
+    expected: FAIL
+
+
+[observer-buffered-false.any.worker.html]
+  [PerformanceObserver without buffered flag set to false cannot see past entries.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/resource-timing/resource_TAO_origin.htm.ini b/tests/wpt/metadata/resource-timing/resource_TAO_origin.htm.ini
index 29a30ecee0e..d9f5956bc52 100644
--- a/tests/wpt/metadata/resource-timing/resource_TAO_origin.htm.ini
+++ b/tests/wpt/metadata/resource-timing/resource_TAO_origin.htm.ini
@@ -14,3 +14,6 @@
   [The iframe should have one resource timing entry.]
     expected: FAIL
 
+  [responseEnd should not be 0 in timing-allow cross-origin request.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index b5077140d65..907e0d46421 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -71,3 +71,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t9.4836157560348511e-1\t9.5236867666244507e-1\t4.0071010589599609e-3\t4.2075103446311962e-3\t3.8985999999999999e-3\n\t[31\]\t9.2646563053131104e-1\t9.3139332532882690e-1\t4.9276947975158691e-3\t5.2906700783754857e-3\t3.8985999999999999e-3\n\t[32\]\t9.0087991952896118e-1\t9.0675884485244751e-1\t5.8789253234863281e-3\t6.4834496590358351e-3\t3.8985999999999999e-3\n\t[33\]\t8.7170630693435669e-1\t8.7856203317642212e-1\t6.8557262420654297e-3\t7.8033490899654511e-3\t3.8985999999999999e-3\n\t[34\]\t8.3906102180480957e-1\t8.4691369533538818e-1\t7.8526735305786133e-3\t9.2721059699818163e-3\t3.8985999999999999e-3\n\t...and 31037 more errors.\n\tMax AbsError of 9.8276454210281372e-1 at index of 39267.\n\t[39267\]\t1.7243747130372099e-22\t-9.8276454210281372e-1\t9.8276454210281372e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\tMax RelError of 3.3137802965303198e+0 at index of 1253.\n\t[1253\]\t-4.3022233992815018e-2\t-9.9732093513011932e-3\t3.3049024641513824e-2\t3.3137802965303198e+0\t3.8985999999999999e-3\n]
     expected: FAIL
 
+  [X SNR (16.93160787588116 dB) is not greater than or equal to 65.737. Got 16.93160787588116.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t9.4836157560348511e-1\t9.5236867666244507e-1\t4.0071010589599609e-3\t4.2075103446311962e-3\t3.8985999999999999e-3\n\t[31\]\t9.2646563053131104e-1\t9.3139332532882690e-1\t4.9276947975158691e-3\t5.2906700783754857e-3\t3.8985999999999999e-3\n\t[32\]\t9.0087991952896118e-1\t9.0675884485244751e-1\t5.8789253234863281e-3\t6.4834496590358351e-3\t3.8985999999999999e-3\n\t[33\]\t8.7170630693435669e-1\t8.7856203317642212e-1\t6.8557262420654297e-3\t7.8033490899654511e-3\t3.8985999999999999e-3\n\t[34\]\t8.3906102180480957e-1\t8.4691369533538818e-1\t7.8526735305786133e-3\t9.2721059699818163e-3\t3.8985999999999999e-3\n\t...and 31037 more errors.\n\tMax AbsError of 1.3937766373157501e+1 at index of 39267.\n\t[39267\]\t1.2955001831054688e+1\t-9.8276454210281372e-1\t1.3937766373157501e+1\t1.4182203138235909e+1\t3.8985999999999999e-3\n\tMax RelError of 2.0553654218963288e+1 at index of 20238.\n\t[20238\]\t9.3026428222656250e+0\t-4.7574958205223083e-1\t9.7783924043178558e+0\t2.0553654218963288e+1\t3.8985999999999999e-3\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/get_current_url/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_current_url/get.py.ini
index 10212c3612d..50814ab1ce7 100644
--- a/tests/wpt/metadata/webdriver/tests/get_current_url/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_current_url/get.py.ini
@@ -5,3 +5,6 @@
   [test_get_current_url_nested_browsing_context]
     expected: FAIL
 
+  [test_get_current_url_nested_browsing_contexts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
index db49df7d2e7..5c008fbe550 100644
--- a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
@@ -32,3 +32,9 @@
   [test_no_browsing_context]
     expected: ERROR
 
+  [test_frame_id_webelement_no_frame_element]
+    expected: FAIL
+
+  [test_null_response_value]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 92309f9d52e..f9d4bd58466 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -225,6 +225,8 @@ jobs:
   - template: tools/ci/azure/update_manifest.yml
   - script: python ./wpt run --yes --no-manifest-update --install-fonts --manifest MANIFEST.json --metadata infrastructure/metadata/ --log-tbpl - --log-tbpl-level info --channel dev edgechromium infrastructure/
     displayName: 'Run tests (Edge Dev)'
+  - script: python ./wpt run --yes --no-manifest-update --install-fonts --manifest MANIFEST.json --metadata infrastructure/metadata/ --log-tbpl - --log-tbpl-level info --channel canary edgechromium infrastructure/
+    displayName: 'Run tests (Edge Canary)'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
     inputs:
@@ -258,6 +260,8 @@ jobs:
   - template: tools/ci/azure/update_manifest.yml
   - script: python ./wpt run --yes --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --install-fonts --this-chunk $(System.JobPositionInPhase) --total-chunks $(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel dev edgechromium
     displayName: 'Run tests (Edge Dev)'
+  - script: python ./wpt run --yes --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --install-fonts --this-chunk $(System.JobPositionInPhase) --total-chunks $(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel canary edgechromium
+    displayName: 'Run tests (Edge Canary)'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
     inputs:
diff --git a/tests/wpt/web-platform-tests/bluetooth/README.md b/tests/wpt/web-platform-tests/bluetooth/README.md
index 2d0e9ab7a9b..dcf3d2832c3 100644
--- a/tests/wpt/web-platform-tests/bluetooth/README.md
+++ b/tests/wpt/web-platform-tests/bluetooth/README.md
@@ -24,9 +24,9 @@ infrastructure.
 
 [Web Bluetooth Testing API]: https://docs.google.com/document/d/1Nhv_oVDCodd1pEH_jj9k8gF4rPGb_84VYaZ9IG8M_WY/
 
-# Generated gen-* files from generator.py
+# Generated gen-* files from generate.py
 
-`generator.py` builds `gen-*.html` tests using templates in
+`generate.py` builds `gen-*.html` tests using templates in
 `script-tests/*/*.js`.
 
 The subdirectory structure in `bluetooth/script-test/*` is recreated into
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.html
deleted file mode 100644
index 0747af2fc9c..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'HeartRate device properties';
-
-bluetooth_test(
-    () => getHealthThermometerService()
-              .then(({service}) => Promise.all([
-                service.getCharacteristic('temperature_measurement'),
-                service.getCharacteristic('measurement_interval')
-              ]))
-              .then(([temperature_measurement, measurement_interval]) => {
-                let tm_expected_properties =
-                    new TestCharacteristicProperties(['indicate']);
-                assert_properties_equal(
-                    temperature_measurement.properties, tm_expected_properties);
-
-                let mi_expected_properties = new TestCharacteristicProperties(
-                    ['read', 'write', 'indicate']);
-                assert_properties_equal(
-                    measurement_interval.properties, mi_expected_properties);
-              }),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js
new file mode 100644
index 00000000000..abe9f79ce26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js
@@ -0,0 +1,23 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'HeartRate device properties';
+
+bluetooth_test(async () => {
+  const {service} = await getHealthThermometerService()
+  const [temperature_measurement, measurement_interval] = await Promise.all([
+    service.getCharacteristic('temperature_measurement'),
+    service.getCharacteristic('measurement_interval')
+  ]);
+  const tm_expected_properties = new TestCharacteristicProperties(['indicate']);
+  assert_properties_equal(
+      temperature_measurement.properties, tm_expected_properties);
+
+  const mi_expected_properties =
+      new TestCharacteristicProperties(['read', 'write', 'indicate']);
+  assert_properties_equal(
+      measurement_interval.properties, mi_expected_properties);
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.html
deleted file mode 100644
index 35f5ee974fc..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Characteristic is removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Characteristic no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => fake_characteristic.remove())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.startNotifications(),
-        expected,
-        'Characteristic got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js
new file mode 100644
index 00000000000..6b5d3e22a12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Characteristic is removed. Reject with InvalidStateError.';
+const expected = new DOMException(
+    'GATT Characteristic no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.remove();
+  await assert_promise_rejects_with_message(
+      characteristic.startNotifications(), expected,
+      'Characteristic got removed.');
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.html
deleted file mode 100644
index bf389ce5286..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Service is removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Service no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_peripheral, fake_service;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
-    .then(() => fake_service.remove())
-    .then(() => fake_peripheral.simulateGATTServicesChanged())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.startNotifications(),
-        expected,
-        'Service got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js
new file mode 100644
index 00000000000..29bc671c5d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Service is removed. Reject with InvalidStateError.';
+const expected =
+    new DOMException('GATT Service no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_peripheral, fake_service} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_service.remove();
+  await fake_peripheral.simulateGATTServicesChanged();
+  await assert_promise_rejects_with_message(
+      characteristic.startNotifications(), expected, 'Service got removed.');
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html
deleted file mode 100644
index c0d4328a0e4..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Add multiple event listeners then readValue().';
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => fake_characteristic.setNextReadResponse(GATT_SUCCESS, [0,1,2]))
-    .then(() => assert_promise_resolves_after_event(
-        characteristic,
-        'readValue',
-        'characteristicvaluechanged',
-        3 /* attach 3 listeners */))
-    .then(results => {
-      let read_value = new Uint8Array(results[0].buffer);
-      let event_values = results.slice(1).map(v => new Uint8Array(v.buffer));
-      for (let event_value of event_values) {
-        assert_equals(event_value.buffer, read_value.buffer);
-        assert_array_equals(event_value, read_value);
-      }
-    }), test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js
new file mode 100644
index 00000000000..7e6e4159bb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js
@@ -0,0 +1,26 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Add multiple event listeners then readValue().';
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.setNextReadResponse(GATT_SUCCESS, [0, 1, 2]);
+
+  // Make sure that |characteristic.readValue()| resolves after
+  // |characteristicvaluechanged| is fired |3| times.
+  const results = await assert_promise_resolves_after_event(
+      characteristic /* object */, 'readValue' /* func */,
+      'characteristicvaluechanged' /* event */, 3 /* num_listeners */);
+
+  const read_value = new Uint8Array(results[0].buffer);
+  const event_values = results.slice(1).map(v => new Uint8Array(v.buffer));
+  for (const event_value of event_values) {
+    assert_equals(event_value.buffer, read_value.buffer);
+    assert_array_equals(event_value, read_value);
+  }
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.html
deleted file mode 100644
index 3c963c3c9fd..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Characteristic gets removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Characteristic no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => fake_characteristic.remove())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.readValue(),
-        expected,
-        'Characteristic got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js
new file mode 100644
index 00000000000..07678e6e037
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js
@@ -0,0 +1,17 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Characteristic gets removed. Reject with InvalidStateError.';
+const expected = new DOMException(
+    'GATT Characteristic no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.remove();
+  await assert_promise_rejects_with_message(
+      characteristic.readValue(), expected, 'Characteristic got removed.');
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.html
deleted file mode 100644
index a217bdd36aa..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Reading a characteristic should fire an event.';
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => fake_characteristic.setNextReadResponse(
-          GATT_SUCCESS, [0, 1, 2]))
-    .then(() => assert_promise_resolves_after_event(
-         characteristic,
-         'readValue',
-         'characteristicvaluechanged'))
-    .then(results => new Promise(resolve => {
-        let read_value = new Uint8Array(results[0].buffer);
-        let event_value = new Uint8Array(results[1].buffer);
-        assert_equals(event_value.buffer, read_value.buffer);
-        assert_array_equals(event_value, read_value);
-        resolve();
-    })), test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js
new file mode 100644
index 00000000000..eee34d0612d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js
@@ -0,0 +1,24 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Reading a characteristic should fire an event.';
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.setNextReadResponse(GATT_SUCCESS, [0, 1, 2]);
+
+  // Make sure that |characteristic.readValue()| resolves after
+  // |characteristicvaluechanged| is fired.
+  const results = await assert_promise_resolves_after_event(
+      characteristic /* object */, 'readValue' /* func */,
+      'characteristicvaluechanged' /* event */);
+
+  const read_value = new Uint8Array(results[0].buffer);
+  const event_value = new Uint8Array(results[1].buffer);
+  assert_equals(event_value.buffer, read_value.buffer);
+  assert_array_equals(event_value, read_value);
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.html
deleted file mode 100644
index 4dca3ed5a57..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'A read request succeeds and returns the characteristic\'s ' +
-    'value.';
-const EXPECTED_VALUE = [0, 1, 2];
-
-let characteristic, fake_characteristic;
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() =>  fake_characteristic.setNextReadResponse(
-        GATT_SUCCESS,
-        EXPECTED_VALUE))
-    .then(() => characteristic.readValue())
-    .then(value => assert_array_equals(
-        new Uint8Array(value.buffer),
-        EXPECTED_VALUE)),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js
new file mode 100644
index 00000000000..aeece7d11f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js
@@ -0,0 +1,17 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'A read request succeeds and returns the characteristic\'s ' +
+    'value.';
+const EXPECTED_VALUE = [0, 1, 2];
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.setNextReadResponse(GATT_SUCCESS, EXPECTED_VALUE);
+  const value = await characteristic.readValue();
+  assert_array_equals(new Uint8Array(value.buffer), EXPECTED_VALUE)
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.html
deleted file mode 100644
index 11bb9391b62..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Succesful read should update characteristic.value';
-const EXPECTED_VALUE = [0, 1, 2];
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => assert_equals(characteristic.value, null))
-    .then(() => fake_characteristic.setNextReadResponse(
-          GATT_SUCCESS, EXPECTED_VALUE))
-    .then(() => characteristic.readValue())
-    .then(() => assert_array_equals(
-          new Uint8Array(characteristic.value.buffer),
-          EXPECTED_VALUE)),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js
new file mode 100644
index 00000000000..45da8af2502
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+const test_desc = 'Succesful read should update characteristic.value';
+const EXPECTED_VALUE = [0, 1, 2];
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  assert_equals(characteristic.value, null);
+
+  await fake_characteristic.setNextReadResponse(GATT_SUCCESS, EXPECTED_VALUE);
+  await characteristic.readValue();
+  assert_array_equals(
+      new Uint8Array(characteristic.value.buffer), EXPECTED_VALUE)
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.html
deleted file mode 100644
index 48f8127de83..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Service gets removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Service no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_peripheral, fake_service;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
-    .then(() => fake_service.remove())
-    .then(() => fake_peripheral.simulateGATTServicesChanged())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.readValue(),
-        expected,
-        'Service got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js
new file mode 100644
index 00000000000..07e9701d3c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Service gets removed. Reject with InvalidStateError.';
+const expected =
+    new DOMException('GATT Service no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_peripheral, fake_service} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_service.remove();
+  await fake_peripheral.simulateGATTServicesChanged();
+  await assert_promise_rejects_with_message(
+      characteristic.readValue(), expected, 'Service got removed.')
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.html
deleted file mode 100644
index 395d49b7f07..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Same parent service returned from multiple characteristics.';
-
-bluetooth_test(
-    () => getHealthThermometerService()
-              .then(({service}) => Promise.all([
-                service.getCharacteristic('measurement_interval'),
-                service.getCharacteristic('temperature_measurement')
-              ]))
-              .then(
-                  characteristics => assert_equals(
-                      characteristics[0].service, characteristics[1].service)),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js
new file mode 100644
index 00000000000..e3bc5d0e103
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js
@@ -0,0 +1,16 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Same parent service returned from multiple characteristics.';
+
+bluetooth_test(async () => {
+  const {service} = await getHealthThermometerService();
+  const characteristics = await Promise.all([
+    service.getCharacteristic('measurement_interval'),
+    service.getCharacteristic('temperature_measurement')
+  ]);
+  assert_equals(characteristics[0].service, characteristics[1].service);
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.html
deleted file mode 100644
index 0b2a9157214..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = '[SameObject] test for BluetoothRemoteGATTCharacteristic ' +
-    'service.';
-
-bluetooth_test(
-    () => getMeasurementIntervalCharacteristic().then(
-        ({characteristic}) =>
-            assert_equals(characteristic.service, characteristic.service)),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js
new file mode 100644
index 00000000000..6b1f543ae5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js
@@ -0,0 +1,13 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = '[SameObject] test for BluetoothRemoteGATTCharacteristic ' +
+    'service.';
+
+bluetooth_test(async () => {
+  const {characteristic} = await getMeasurementIntervalCharacteristic();
+  assert_equals(characteristic.service, characteristic.service);
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.html
deleted file mode 100644
index b8a1abfa5af..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-
-function detachBuffer(buffer) {
-  window.postMessage('', '*', [buffer]);
-}
-
-bluetooth_test(async (t) => {
-  let {characteristic, fake_characteristic} =
-      await getMeasurementIntervalCharacteristic();
-
-  let typed_array = Uint8Array.of(1, 2);
-  detachBuffer(typed_array.buffer);
-  await promise_rejects(
-    t, 'InvalidStateError', characteristic.writeValue(typed_array));
-
-  let array_buffer = Uint8Array.of(3, 4).buffer;
-  detachBuffer(array_buffer);
-  await promise_rejects(
-    t, 'InvalidStateError', characteristic.writeValue(array_buffer));
-}, 'writeValue() fails when passed a detached buffer');
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js
new file mode 100644
index 00000000000..35347e3bcf8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js
@@ -0,0 +1,25 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'writeValue() fails when passed a detached buffer';
+
+function detachBuffer(buffer) {
+  window.postMessage('', '*', [buffer]);
+}
+
+bluetooth_test(async (t) => {
+  const {characteristic} = await getMeasurementIntervalCharacteristic();
+
+  const typed_array = Uint8Array.of(1, 2);
+  detachBuffer(typed_array.buffer);
+  await promise_rejects(
+      t, 'InvalidStateError', characteristic.writeValue(typed_array));
+
+  const array_buffer = Uint8Array.of(3, 4).buffer;
+  detachBuffer(array_buffer);
+  await promise_rejects(
+      t, 'InvalidStateError', characteristic.writeValue(array_buffer));
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.html
deleted file mode 100644
index f79c21916fb..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Characteristic gets removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Characteristic no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => fake_characteristic.remove())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.writeValue(new ArrayBuffer(1 /* length */)),
-        expected,
-        'Characteristic got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js
new file mode 100644
index 00000000000..33a963bed09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Characteristic gets removed. Reject with InvalidStateError.';
+const expected = new DOMException(
+    'GATT Characteristic no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_characteristic.remove();
+  await assert_promise_rejects_with_message(
+      characteristic.writeValue(new ArrayBuffer(1 /* length */)), expected,
+      'Characteristic got removed.');
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.html
deleted file mode 100644
index 2b43bfb7c91..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'Service gets removed. Reject with InvalidStateError.';
-const expected = new DOMException('GATT Service no longer exists.',
-    'InvalidStateError');
-let characteristic, fake_peripheral, fake_service;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
-    .then(() => fake_service.remove())
-    .then(() => fake_peripheral.simulateGATTServicesChanged())
-    .then(() => assert_promise_rejects_with_message(
-        characteristic.writeValue(new ArrayBuffer(1 /* length */)),
-        expected,
-        'Service got removed.')),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js
new file mode 100644
index 00000000000..a9f812c137f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js
@@ -0,0 +1,19 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'Service gets removed. Reject with InvalidStateError.';
+const expected =
+    new DOMException('GATT Service no longer exists.', 'InvalidStateError');
+
+bluetooth_test(async () => {
+  const {characteristic, fake_peripheral, fake_service} =
+      await getMeasurementIntervalCharacteristic();
+  await fake_service.remove();
+  await fake_peripheral.simulateGATTServicesChanged();
+  await assert_promise_rejects_with_message(
+      characteristic.writeValue(new ArrayBuffer(1 /* length */)), expected,
+      'Service got removed.');
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.html b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.html
deleted file mode 100644
index f2cf577e4f9..00000000000
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-helpers.js"></script>
-<script>
-'use strict';
-const test_desc = 'A regular write request to a writable characteristic ' +
-    'should succeed.';
-let typed_array = Uint8Array.of(1, 2);
-let array_buffer = Uint8Array.of(3, 4).buffer;
-let data_view = new DataView(new ArrayBuffer(2));
-let characteristic, fake_characteristic;
-
-bluetooth_test(() => getMeasurementIntervalCharacteristic()
-    .then(_ => ({characteristic, fake_characteristic} = _))
-    .then(() => new Promise(resolve => {
-        data_view.setUint8(0, 5);
-        data_view.setUint8(1, 6);
-        resolve();
-    }))
-    .then(() => fake_characteristic.getLastWrittenValue())
-    .then(last_value => assert_true(last_value === null))
-
-    .then(() => fake_characteristic.setNextWriteResponse(GATT_SUCCESS))
-    .then(() => characteristic.writeValue(typed_array))
-    .then(() => fake_characteristic.getLastWrittenValue())
-    .then(last_value => assert_array_equals(last_value, [1, 2]))
-
-    .then(() => fake_characteristic.setNextWriteResponse(GATT_SUCCESS))
-    .then(() => characteristic.writeValue(array_buffer))
-    .then(() => fake_characteristic.getLastWrittenValue())
-    .then(last_value => assert_array_equals(last_value, [3, 4]))
-
-    .then(() => fake_characteristic.setNextWriteResponse(GATT_SUCCESS))
-    .then(() => characteristic.writeValue(data_view))
-    .then(() => fake_characteristic.getLastWrittenValue())
-    .then(last_value => assert_array_equals(last_value, [5, 6])),
-    test_desc);
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js
new file mode 100644
index 00000000000..1472c619a2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js
@@ -0,0 +1,39 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-helpers.js
+'use strict';
+const test_desc = 'A regular write request to a writable characteristic ' +
+    'should succeed.';
+
+bluetooth_test(async () => {
+  const {characteristic, fake_characteristic} =
+      await getMeasurementIntervalCharacteristic();
+
+  let last_value = await fake_characteristic.getLastWrittenValue();
+  assert_equals(last_value, null);
+
+  await fake_characteristic.setNextWriteResponse(GATT_SUCCESS);
+
+  const typed_array = Uint8Array.of(1, 2);
+  await characteristic.writeValue(typed_array);
+  last_value = await fake_characteristic.getLastWrittenValue();
+  assert_array_equals(last_value, [1, 2]);
+
+  await fake_characteristic.setNextWriteResponse(GATT_SUCCESS);
+
+  const array_buffer = Uint8Array.of(3, 4).buffer;
+  await characteristic.writeValue(array_buffer);
+  last_value = await fake_characteristic.getLastWrittenValue();
+  assert_array_equals(last_value, [3, 4]);
+
+  await fake_characteristic.setNextWriteResponse(GATT_SUCCESS);
+
+  const data_view = new DataView(new ArrayBuffer(2));
+  data_view.setUint8(0, 5);
+  data_view.setUint8(1, 6);
+  await characteristic.writeValue(data_view);
+  last_value = await fake_characteristic.getLastWrittenValue();
+  assert_array_equals(last_value, [5, 6]);
+}, test_desc);
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html
new file mode 100644
index 00000000000..7fe6b3ea5df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/981602">
+<link rel="author" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.class6 { writing-mode: vertical-rl; }
+</style>
+<svg>
+<radialGradient id="svgvar00004">
+<pattern>
+<foreignObject>
+<pre class="class6">
+<svg>
+<polyline fill="url(#svgvar00004) red">
+</svg>
+<script>test(() => {});</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-computed.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-computed.html
new file mode 100644
index 00000000000..5d268bf3fd2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-computed.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Module Level 3: getComputedStyle().boxShadow</title>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#box-shadow">
+<meta name="assert" content="box-shadow computes to none or a list.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    color: blue;
+    font-size: 20px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+'use strict';
+const currentColor = 'rgb(0, 0, 255)';
+test_computed_value('box-shadow', 'none');
+test_computed_value('box-shadow', '1px 2px', currentColor + ' 1px 2px 0px 0px');
+test_computed_value('box-shadow', 'currentcolor -1em -2em 3em -4em', currentColor + ' -20px -40px 60px -80px');
+test_computed_value('box-shadow', 'rgb(0, 255, 0) 1px 2px 3px 4px inset');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html
index e0e0528918a..4a366e32776 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html
@@ -6,7 +6,7 @@
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
   <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
-  <link rel="match" href="reference/contain-style-counters-003-ref.html">
+  <link rel="match" href="reference/contain-style-counters-004-ref.html">
 
   <meta name="flags" content="">
 
@@ -63,8 +63,10 @@
 
   <p> <span></span> <span></span> <span></span> <span></span>
 
-  <!-- 4 span inside the <p> -->
+  <!-- 4 span inside the <p>. However, since div isn't a sibling of spans,
+       it creates a new counter.
+  -->
 
-  <p>Test passes if there is the number 20.
+  <p>Test passes if there is the number 0.
 
   <div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-004-ref.html b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-004-ref.html
new file mode 100644
index 00000000000..afe60666c02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+
+  <style>
+  div
+    {
+      font-size: 3em;
+    }
+  </style>
+
+  <p>Test passes if there is the number 0.
+
+  <div>0</div>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/inheritance.html b/tests/wpt/web-platform-tests/css/css-fonts/inheritance.html
new file mode 100644
index 00000000000..8ff02fb7405
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/inheritance.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance of CSS Fonts Level 3 properties</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#property-index">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
+<meta name="assert" content="Properties inherit 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>
+<style>
+  #box {
+    font: initial;
+    font-size: medium;
+  }
+</style>
+</head>
+<body>
+<div id="box"></div>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+const box = document.getElementById('box');
+const initialFontFamily = getComputedStyle(box).fontFamily;
+const mediumFontSize = getComputedStyle(box).fontSize;
+
+assert_inherited('font-family', initialFontFamily, '"Not Initial!"');
+assert_inherited('font-feature-settings', 'normal', '"smcp", "swsh" 2');
+assert_inherited('font-kerning', 'auto', 'none');
+assert_inherited('font-size', mediumFontSize /* medium */, '123px');
+assert_inherited('font-size-adjust', 'none', '1.5');
+assert_inherited('font-stretch', '100%' /* normal */, '75%');
+assert_inherited('font-style', 'normal', 'italic');
+assert_inherited('font-synthesis', 'weight style', 'none');
+assert_inherited('font-variant', 'normal', 'none');
+assert_inherited('font-variant-caps', 'normal', 'small-caps');
+assert_inherited('font-variant-east-asian', 'normal', 'ruby');
+assert_inherited('font-variant-ligatures', 'normal', 'none');
+assert_inherited('font-variant-numeric', 'normal', 'ordinal');
+assert_inherited('font-variant-position', 'normal', 'super');
+assert_inherited('font-weight', '400' /* normal */, '900');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-computed.html
new file mode 100644
index 00000000000..993b72e6a8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-computed.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontFamily</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-family-prop">
+<meta name="assert" content="font-family computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-family', 'serif');
+test_computed_value('font-family', 'sans-serif');
+test_computed_value('font-family', 'cursive');
+test_computed_value('font-family', 'fantasy');
+test_computed_value('font-family', 'monospace');
+test_computed_value('font-family', 'serif, sans-serif, cursive, fantasy, monospace');
+
+test_computed_value('font-family', 'Helvetica, Verdana, sans-serif');
+test_computed_value('font-family', '"New Century Schoolbook", serif');
+test_computed_value('font-family', '"21st Century", fantasy');
+
+test_computed_value('font-family', '"inherit", "serif"');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-invalid.html
new file mode 100644
index 00000000000..f4403e7e642
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-invalid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-family with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-family-prop">
+<meta name="assert" content="font-family supports only the grammar '[ <family-name> | <generic-family> ] #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-family', 'cursive serif');
+
+test_invalid_value('font-family', 'Red/Black, sans-serif');
+test_invalid_value('font-family', '"Lucida" Grande, sans-serif');
+test_invalid_value('font-family', 'Ahem!, sans-serif');
+test_invalid_value('font-family', 'test@foo, sans-serif');
+test_invalid_value('font-family', '#POUND, sans-serif');
+test_invalid_value('font-family', 'Hawaii 5-0, sans-serif');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-valid.html
new file mode 100644
index 00000000000..2dafcc68456
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-valid.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-family with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-family-prop">
+<meta name="assert" content="font-family supports the full grammar '[ <family-name> | <generic-family> ] #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-family', 'Serif', 'serif');
+test_valid_value('font-family', 'Sans-Serif', 'sans-serif');
+test_valid_value('font-family', 'Cursive', 'cursive');
+test_valid_value('font-family', 'Fantasy', 'fantasy');
+test_valid_value('font-family', 'Monospace', 'monospace');
+test_valid_value('font-family', 'serif, sans-serif, cursive, fantasy, monospace');
+
+test_valid_value('font-family', 'Helvetica, Verdana, sans-serif');
+test_valid_value('font-family', '"New Century Schoolbook", serif');
+test_valid_value('font-family', "'21st Century', fantasy", '"21st Century", fantasy');
+
+test_valid_value('font-family', '"inherit", "serif"');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-computed.html
new file mode 100644
index 00000000000..137d9dbbf47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-computed.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontFeatureSettings</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+<meta name="assert" content="font-feature-settings computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-feature-settings', 'normal');
+
+test_computed_value('font-feature-settings', '"dlig"');
+test_computed_value('font-feature-settings', '"smcp"');
+test_computed_value('font-feature-settings', '"c2sc"');
+test_computed_value('font-feature-settings', '"liga" 0');
+test_computed_value('font-feature-settings', '"tnum", "hist"');
+
+test_computed_value('font-feature-settings', '"PKRN"');
+
+test_computed_value('font-feature-settings', '"dlig", "smcp", "dlig" 0');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-invalid.html
new file mode 100644
index 00000000000..37689ce7058
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-invalid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-feature-settings with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+<meta name="assert" content="font-feature-settings supports only the grammar 'normal | <feature-tag-value> #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-feature-settings', 'normal "dlig"');
+test_invalid_value('font-feature-settings', '"c2sc", normal');
+
+test_invalid_value('font-feature-settings', '"tnum" "hist"');
+test_invalid_value('font-feature-settings', '"silly" off');
+
+test_invalid_value('font-feature-settings', 'dlig');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-valid.html
new file mode 100644
index 00000000000..9ed4b5cde20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-valid.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-feature-settings with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+<meta name="assert" content="font-feature-settings supports the full grammar 'normal | <feature-tag-value> #'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-feature-settings', 'normal');
+
+// <feature-tag-value> = <string> [ <integer> | on | off ]?
+test_valid_value('font-feature-settings', '"dlig" 1', '"dlig"');
+test_valid_value('font-feature-settings', '"smcp" on', '"smcp"');
+test_valid_value('font-feature-settings', "'c2sc'", '"c2sc"');
+test_valid_value('font-feature-settings', '"liga" off', '"liga" 0');
+test_valid_value('font-feature-settings', '"tnum", \'hist\'', '"tnum", "hist"');
+
+test_valid_value('font-feature-settings', '"PKRN"');
+
+test_valid_value('font-feature-settings', '"dlig" 1, "smcp" on, "dlig" 0', '"dlig", "smcp", "dlig" 0');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-invalid.html
new file mode 100644
index 00000000000..d6db9338aa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-invalid.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-prop">
+<meta name="assert" content="font supports only the grammar '[ [ <'font-style'> || <font-variant-css2> || <'font-weight'> || <font-stretch-css3> ]? <'font-size'> [ / <'line-height'> ]? <'font-family'> ] | caption | icon | menu | message-box | small-caption | status-bar'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font', 'menu icon');
+
+test_invalid_value('font', 'italic oblique xx-small serif');
+test_invalid_value('font', 'small-caps small-caps medium/normal sans-serif');
+test_invalid_value('font', 'bold bolder xx-large/1.2 cursive');
+test_invalid_value('font', 'ultra-condensed extra-condensed larger/calc(120% + 1.2em) fantasy');
+test_invalid_value('font', 'italic small-caps lighter condensed normal smaller monospace');
+test_invalid_value('font', 'normal 100 semi-condensed oblique small-caps 10px/normal Menu');
+test_invalid_value('font', 'normal normal normal normal normal 20%/1.2 \"FB Armada\"');
+
+test_invalid_value('font', 'italic small-caps lighter condensed smaller');
+test_invalid_value('font', 'normal 100 semi-condensed oblique small-caps Menu');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-computed.html
new file mode 100644
index 00000000000..5cd0b252ffe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-computed.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontKerning</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-kerning-prop">
+<meta name="assert" content="font-kerning computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-kerning', 'auto');
+test_computed_value('font-kerning', 'normal');
+test_computed_value('font-kerning', 'none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-invalid.html
new file mode 100644
index 00000000000..46e94b0a76f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-kerning with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-kerning-prop">
+<meta name="assert" content="font-kerning supports only the grammar 'auto | normal | none'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-kerning', 'normal auto');
+test_invalid_value('font-kerning', 'none, auto');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-valid.html
new file mode 100644
index 00000000000..623f860dd79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-kerning with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-kerning-prop">
+<meta name="assert" content="font-kerning supports the full grammar 'auto | normal | none'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-kerning', 'auto');
+test_valid_value('font-kerning', 'normal');
+test_valid_value('font-kerning', 'none');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-computed.html
new file mode 100644
index 00000000000..601e22ee0d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-computed.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontSizeAdjust</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<meta name="assert" content="font-size-adjust computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-size-adjust', 'none');
+test_computed_value('font-size-adjust', '0.5');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-invalid.html
new file mode 100644
index 00000000000..8e83052eb06
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-size-adjust with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<meta name="assert" content="font-size-adjust supports only the grammar 'none | <number>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-size-adjust', 'auto');
+test_invalid_value('font-size-adjust', '-10');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-valid.html
new file mode 100644
index 00000000000..1e4d0aebe11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-valid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-size-adjust with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<meta name="assert" content="font-size-adjust supports the full grammar 'none | <number>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-size-adjust', 'none');
+test_valid_value('font-size-adjust', '0.5');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-computed.html
new file mode 100644
index 00000000000..ebbbeac0802
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-computed.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: getComputedValue().fontSize</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<meta name="assert" content="font-size computed value is an absolute length.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #container {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<font id="reference"></font>
+<script>
+function test_relative_size(first, second) {
+  test(() => {
+    const target = document.getElementById('target');
+    target.style.fontSize = first;
+    const firstResult = Number(getComputedStyle(target).fontSize.replace('px', ''));
+    target.style.fontSize = second;
+    const secondResult = Number(getComputedStyle(target).fontSize.replace('px', ''));
+    assert_less_than_equal(firstResult, secondResult);
+  }, first + ' <= ' + second);
+}
+
+test_relative_size('xx-small', 'x-small');
+test_relative_size('x-small', 'small');
+test_relative_size('small', 'medium');
+test_relative_size('medium', 'large');
+test_relative_size('large', 'x-large');
+test_relative_size('x-large', 'xx-large');
+// Added in Fonts level 4: https://github.com/w3c/csswg-drafts/issues/3907
+test_relative_size('xx-large', 'xxx-large');
+
+// <relative-size>
+test_relative_size('inherit', 'larger');
+test_relative_size('smaller', 'inherit');
+
+// <length-percentage>
+test_computed_value('font-size', '10px');
+test_computed_value('font-size', '20%', '8px');
+test_computed_value('font-size', 'calc(30% - 40px)', '0px');
+test_computed_value('font-size', 'calc(30% + 40px)', '52px');
+test_computed_value('font-size', 'calc(10px - 0.5em)', '0px');
+test_computed_value('font-size', 'calc(10px + 0.5em)', '30px');
+
+function test_font_size(attribute, keyword) {
+  test(() => {
+    const reference = document.getElementById('reference');
+    reference.setAttribute('size', attribute);
+    const target = document.getElementById('target');
+    target.style.fontSize = keyword;
+    assert_equals(getComputedStyle(target).fontSize, getComputedStyle(reference).fontSize);
+  }, '<font size="' + attribute + '"> is font-size: ' + keyword);
+}
+
+test_font_size('2', 'small');
+test_font_size('3', 'medium');
+test_font_size('4', 'large');
+test_font_size('5', 'x-large');
+test_font_size('6', 'xx-large');
+test_font_size('7', 'xxx-large');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-invalid.html
new file mode 100644
index 00000000000..b3bccc289f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-size with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-size-prop">
+<meta name="assert" content="font-size supports only the grammar '<absolute-size> | <relative-size> | <length-percentage>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-size', 'auto');
+test_invalid_value('font-size', 'medium small');
+
+test_invalid_value('font-size', '-10px');
+test_invalid_value('font-size', '-20%');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-valid.html
new file mode 100644
index 00000000000..72cf605302f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-valid.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-size with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<meta name="assert" content="font-size supports the full grammar '<absolute-size> | <relative-size> | <length-percentage>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// <absolute-size>
+test_valid_value('font-size', 'xx-small');
+test_valid_value('font-size', 'x-small');
+test_valid_value('font-size', 'small');
+test_valid_value('font-size', 'medium');
+test_valid_value('font-size', 'large');
+test_valid_value('font-size', 'x-large');
+test_valid_value('font-size', 'xx-large');
+// Added in Fonts level 4: https://github.com/w3c/csswg-drafts/issues/3907
+test_valid_value('font-size', 'xxx-large');
+
+// <relative-size>
+test_valid_value('font-size', 'larger');
+test_valid_value('font-size', 'smaller');
+
+// <length-percentage>
+test_valid_value('font-size', '10px');
+test_valid_value('font-size', '20%');
+test_valid_value('font-size', 'calc(30% - 40px)');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-computed.html
new file mode 100644
index 00000000000..4a1ecdb6a6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-computed.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: getComputedValue().fontStretch</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
+<meta name="assert" content="font-stretch computed value is a percentage.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-stretch', 'ultra-condensed', '50%');
+test_computed_value('font-stretch', 'extra-condensed', '62.5%');
+test_computed_value('font-stretch', 'condensed', '75%');
+test_computed_value('font-stretch', 'semi-condensed', '87.5%');
+test_computed_value('font-stretch', 'normal', '100%');
+test_computed_value('font-stretch', 'semi-expanded', '112.5%');
+test_computed_value('font-stretch', 'expanded', '125%');
+test_computed_value('font-stretch', 'extra-expanded', '150%');
+test_computed_value('font-stretch', 'ultra-expanded', '200%');
+
+test_computed_value('font-stretch', '234.5%');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-invalid.html
new file mode 100644
index 00000000000..9ff8fa5dcf8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-stretch with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
+<meta name="assert" content="font-stretch supports only the grammar 'normal | <percentage> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
+<meta name="assert" content="Values less than 0% are invalid.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-stretch', 'auto');
+test_invalid_value('font-stretch', 'normal, ultra-condensed');
+test_invalid_value('font-stretch', 'condensed expanded');
+test_invalid_value('font-stretch', '-50%');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-valid.html
new file mode 100644
index 00000000000..38452c2699e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-valid.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-stretch with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
+<meta name="assert" content="font-stretch supports the full grammar 'normal | <percentage> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-stretch', 'normal');
+test_valid_value('font-stretch', 'ultra-condensed');
+test_valid_value('font-stretch', 'extra-condensed');
+test_valid_value('font-stretch', 'condensed');
+test_valid_value('font-stretch', 'semi-condensed');
+test_valid_value('font-stretch', 'semi-expanded');
+test_valid_value('font-stretch', 'expanded');
+test_valid_value('font-stretch', 'extra-expanded');
+test_valid_value('font-stretch', 'ultra-expanded');
+
+test_valid_value('font-stretch', '234.5%');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-computed.html
new file mode 100644
index 00000000000..a7bb42146a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-computed.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontStyle</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-style-prop">
+<meta name="assert" content="font-style computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-family: Ahem;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-style', 'normal');
+test_computed_value('font-style', 'italic');
+test_computed_value('font-style', 'oblique');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-invalid.html
new file mode 100644
index 00000000000..4542c29cf2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-style with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-style-prop">
+<meta name="assert" content="font-style supports only the grammar 'normal | italic | oblique'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-style', 'auto');
+test_invalid_value('font-style', 'italic oblique');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-valid.html
new file mode 100644
index 00000000000..b61864478ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-style with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-style-prop">
+<meta name="assert" content="font-style supports the full grammar 'normal | italic | oblique'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-style', 'normal');
+test_valid_value('font-style', 'italic');
+test_valid_value('font-style', 'oblique');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-computed.html
new file mode 100644
index 00000000000..933a879bfb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-computed.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontSynthesis</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="font-synthesis computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-synthesis', 'none');
+test_computed_value('font-synthesis', 'weight');
+test_computed_value('font-synthesis', 'style');
+test_computed_value('font-synthesis', 'weight style');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-invalid.html
new file mode 100644
index 00000000000..adbe9c0236d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-synthesis with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="font-synthesis supports only the grammar 'none | [ weight || style ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-synthesis', 'auto');
+test_invalid_value('font-synthesis', 'none weight');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-valid.html
new file mode 100644
index 00000000000..1d1aa5d2997
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-valid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-synthesis with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="font-synthesis supports the full grammar 'none | [ weight || style ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-synthesis', 'none');
+test_valid_value('font-synthesis', 'weight');
+test_valid_value('font-synthesis', 'style');
+test_valid_value('font-synthesis', 'style weight', 'weight style');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-valid.html
new file mode 100644
index 00000000000..769e6b42eae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-valid.html
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-prop">
+<meta name="assert" content="font supports the full grammar '[ [ <'font-style'> || <font-variant-css2> || <'font-weight'> || <font-stretch-css3> ]? <'font-size'> [ / <'line-height'> ]? <'font-family'> ] | caption | icon | menu | message-box | small-caption | status-bar'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+'use strict';
+
+// Firefox and Edge 18 serialize these as supplied.
+// Blink and Safari have implementation-dependent or platform-dependent serializations.
+function test_system_font(keyword) {
+  test(() => {
+    const target = document.getElementById('target');
+    const previousValue = 'italic xx-large/0px fantasy';
+    target.style.font = previousValue;
+    target.style.font = keyword;
+    const readValue = target.style.getPropertyValue('font');
+    assert_not_equals(readValue, '', 'font should be set');
+    assert_not_equals(readValue, previousValue, 'font should be updated');
+    target.style.font = previousValue;
+    target.style.font = readValue;
+    assert_equals(target.style.getPropertyValue('font'), readValue, "serialization should round-trip");
+  }, keyword + ' should be a supported system font.');
+}
+
+test_system_font('caption');
+test_system_font('icon');
+test_system_font('menu');
+test_system_font('message-box');
+test_system_font('small-caption');
+test_system_font('status-bar');
+
+// values other than normal
+const generate_style = (() => {
+  const alternatives = [
+    'italic',
+    'oblique'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+// value other than normal
+const generate_variant = () => 'small-caps';
+
+// values other than normal
+const generate_weight = (() => {
+  const alternatives = [
+    'bold',
+    'bolder',
+    'lighter',
+    '100',
+    '900'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+// values other than normal
+const generate_stretch = (() => {
+  const alternatives = [
+    'ultra-condensed',
+    'extra-condensed',
+    'condensed',
+    'semi-condensed',
+    'semi-expanded',
+    'expanded',
+    'extra-expanded',
+    'ultra-expanded'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_size = (() => {
+  const alternatives = [
+    // <absolute-size>
+    'xx-small',
+    'medium',
+    'xx-large',
+
+    // <relative-size>
+    'larger',
+    'smaller',
+
+    // <length-percentage>
+    '10px',
+    '20%',
+    'calc(30% - 40px)',
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_line_height = (() => {
+  const alternatives = [
+    null,
+    'normal',
+    '1.2',
+    'calc(120% + 1.2em)'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_family = (() => {
+  const alternatives = [
+    'serif',
+    'sans-serif',
+    'cursive',
+    'fantasy',
+    'monospace',
+    'Menu',
+    '"FB Armada"'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+function test_specific(prefix) {
+  let parts = [];
+  let canonical = [];
+  let style = null;
+  let variant = null;
+  let weight = null;
+  let stretch = null;
+  for (let entry of prefix) {
+    if (entry === 'style') {
+      style = generate_style();
+      parts.push(style);
+    } else if (entry === 'variant') {
+      variant = generate_variant();
+      parts.push(variant);
+    } else if (entry === 'weight') {
+      weight = generate_weight();
+      parts.push(weight);
+    } else if (entry === 'stretch') {
+      stretch = generate_stretch();
+      parts.push(stretch);
+    } else {
+      // normal
+      parts.push('normal');
+    }
+  }
+
+  if (style)
+    canonical.push(style);
+  if (variant)
+    canonical.push(variant);
+  if (weight)
+    canonical.push(weight);
+  if (stretch)
+    canonical.push(stretch);
+
+  const size = generate_size();
+  const lineHeight = generate_line_height();
+  if (lineHeight) {
+    parts.push(size + '/' + lineHeight);
+    if (lineHeight === 'normal')
+      canonical.push(size);
+    else
+      canonical.push(size + '/' + lineHeight);
+  } else {
+    parts.push(size);
+    canonical.push(size);
+  }
+
+  const family = generate_family();
+  parts.push(family);
+  canonical.push(family);
+
+  test_valid_value('font', parts.join(' '), canonical.join(' '));
+}
+
+function test_various(prefix) {
+  test_specific(prefix);
+  if (prefix.length === 4)
+    return;
+
+  const alternatives = [
+    'normal',
+    'style',
+    'variant',
+    'weight',
+    'stretch'
+  ];
+  for (let alternative of alternatives) {
+    if (alternative === 'normal' || !prefix.includes(alternative))
+      test_various(prefix.concat(alternative));
+    // else we would have two styles or two variants, etc.
+  }
+}
+
+test_various([]);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-computed.html
new file mode 100644
index 00000000000..03f37ec11c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-computed.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontVariantCaps</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-caps-prop">
+<meta name="assert" content="font-variant-caps computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-variant-caps', 'normal');
+test_computed_value('font-variant-caps', 'small-caps');
+test_computed_value('font-variant-caps', 'all-small-caps');
+test_computed_value('font-variant-caps', 'petite-caps');
+test_computed_value('font-variant-caps', 'all-petite-caps');
+test_computed_value('font-variant-caps', 'unicase');
+test_computed_value('font-variant-caps', 'titling-caps');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-invalid.html
new file mode 100644
index 00000000000..4c538ad5eb7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-caps with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-caps-prop">
+<meta name="assert" content="font-variant-caps supports only the grammar 'normal | small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-variant-caps', 'auto');
+test_invalid_value('font-variant-caps', 'normal unicase');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-valid.html
new file mode 100644
index 00000000000..f34595a9f29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-valid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-caps with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-caps-prop">
+<meta name="assert" content="font-variant-caps supports the full grammar 'normal | small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-variant-caps', 'normal');
+test_valid_value('font-variant-caps', 'small-caps');
+test_valid_value('font-variant-caps', 'all-small-caps');
+test_valid_value('font-variant-caps', 'petite-caps');
+test_valid_value('font-variant-caps', 'all-petite-caps');
+test_valid_value('font-variant-caps', 'unicase');
+test_valid_value('font-variant-caps', 'titling-caps');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-computed.html
new file mode 100644
index 00000000000..27b3b1c86df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-computed.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontVariantEastAsian</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-east-asian-prop">
+<meta name="assert" content="font-variant-east-asian computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-variant-east-asian', 'normal');
+
+// <east-asian-variant-values> = [ jis78 | jis83 | jis90 | jis04 | simplified | traditional ]
+test_computed_value('font-variant-east-asian', 'jis78');
+test_computed_value('font-variant-east-asian', 'jis83');
+test_computed_value('font-variant-east-asian', 'jis90');
+test_computed_value('font-variant-east-asian', 'jis04');
+test_computed_value('font-variant-east-asian', 'simplified');
+test_computed_value('font-variant-east-asian', 'traditional');
+
+// <east-asian-width-values>   = [ full-width | proportional-width ]
+test_computed_value('font-variant-east-asian', 'full-width');
+test_computed_value('font-variant-east-asian', 'proportional-width');
+
+test_computed_value('font-variant-east-asian', 'ruby');
+
+test_computed_value('font-variant-east-asian', 'jis78 proportional-width');
+test_computed_value('font-variant-east-asian', 'simplified full-width ruby');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html
new file mode 100644
index 00000000000..30dbe403b8d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-east-asian with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-east-asian-prop">
+<meta name="assert" content="font-variant-east-asian supports only the grammar 'normal | [ <east-asian-variant-values> || <east-asian-width-values> || ruby ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-variant-east-asian', 'normal ruby');
+
+test_invalid_value('font-variant-east-asian', 'jis78 jis83');
+
+test_invalid_value('font-variant-east-asian', 'full-width proportional-width');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-valid.html
new file mode 100644
index 00000000000..0f16ceccfe1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-valid.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-east-asian with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-east-asian-prop">
+<meta name="assert" content="font-variant-east-asian supports the full grammar 'normal | [ <east-asian-variant-values> || <east-asian-width-values> || ruby ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-variant-east-asian', 'normal');
+
+// <east-asian-variant-values> = [ jis78 | jis83 | jis90 | jis04 | simplified | traditional ]
+test_valid_value('font-variant-east-asian', 'jis78');
+test_valid_value('font-variant-east-asian', 'jis83');
+test_valid_value('font-variant-east-asian', 'jis90');
+test_valid_value('font-variant-east-asian', 'jis04');
+test_valid_value('font-variant-east-asian', 'simplified');
+test_valid_value('font-variant-east-asian', 'traditional');
+
+// <east-asian-width-values>   = [ full-width | proportional-width ]
+test_valid_value('font-variant-east-asian', 'full-width');
+test_valid_value('font-variant-east-asian', 'proportional-width');
+
+test_valid_value('font-variant-east-asian', 'ruby');
+
+test_valid_value('font-variant-east-asian', 'jis78 proportional-width');
+test_valid_value('font-variant-east-asian', 'ruby full-width simplified', 'simplified full-width ruby');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-computed.html
new file mode 100644
index 00000000000..8cc3fce267f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-computed.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontVariantLigatures</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-ligatures-prop">
+<meta name="assert" content="font-variant-ligatures computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-variant-ligatures', 'normal');
+test_computed_value('font-variant-ligatures', 'none');
+
+// <common-lig-values>        = [ common-ligatures | no-common-ligatures ]
+test_computed_value('font-variant-ligatures', 'common-ligatures');
+test_computed_value('font-variant-ligatures', 'no-common-ligatures');
+
+// <discretionary-lig-values> = [ discretionary-ligatures | no-discretionary-ligatures ]
+test_computed_value('font-variant-ligatures', 'discretionary-ligatures');
+test_computed_value('font-variant-ligatures', 'no-discretionary-ligatures');
+
+// <historical-lig-values>    = [ historical-ligatures | no-historical-ligatures ]
+test_computed_value('font-variant-ligatures', 'historical-ligatures');
+test_computed_value('font-variant-ligatures', 'no-historical-ligatures');
+
+// <contextual-alt-values>    = [ contextual | no-contextual ]
+test_computed_value('font-variant-ligatures', 'contextual');
+test_computed_value('font-variant-ligatures', 'no-contextual');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html
new file mode 100644
index 00000000000..69af66b9b03
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-ligatures with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-ligatures-prop">
+<meta name="assert" content="font-variant-ligatures supports only the grammar 'normal | none | [ <common-lig-values> || <discretionary-lig-values> || <historical-lig-values> || <contextual-alt-values> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-variant-ligatures', 'none normal');
+
+test_invalid_value('font-variant-ligatures', 'normal common-ligatures');
+
+test_invalid_value('font-variant-ligatures', 'common-ligatures no-common-ligatures');
+
+test_invalid_value('font-variant-ligatures', 'discretionary-ligatures no-discretionary-ligatures');
+
+test_invalid_value('font-variant-ligatures', 'historical-ligatures no-historical-ligatures');
+
+test_invalid_value('font-variant-ligatures', 'contextual no-contextual');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-valid.html
new file mode 100644
index 00000000000..2fdd99e2267
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-valid.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-ligatures with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-ligatures-prop">
+<meta name="assert" content="font-variant-ligatures supports the full grammar 'normal | none | [ <common-lig-values> || <discretionary-lig-values> || <historical-lig-values> || <contextual-alt-values> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-variant-ligatures', 'normal');
+test_valid_value('font-variant-ligatures', 'none');
+
+// <common-lig-values>        = [ common-ligatures | no-common-ligatures ]
+test_valid_value('font-variant-ligatures', 'common-ligatures');
+test_valid_value('font-variant-ligatures', 'no-common-ligatures');
+
+// <discretionary-lig-values> = [ discretionary-ligatures | no-discretionary-ligatures ]
+test_valid_value('font-variant-ligatures', 'discretionary-ligatures');
+test_valid_value('font-variant-ligatures', 'no-discretionary-ligatures');
+
+// <historical-lig-values>    = [ historical-ligatures | no-historical-ligatures ]
+test_valid_value('font-variant-ligatures', 'historical-ligatures');
+test_valid_value('font-variant-ligatures', 'no-historical-ligatures');
+
+// <contextual-alt-values>    = [ contextual | no-contextual ]
+test_valid_value('font-variant-ligatures', 'contextual');
+test_valid_value('font-variant-ligatures', 'no-contextual');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-computed.html
new file mode 100644
index 00000000000..b7706e2688a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-computed.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontVariantNumeric</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-numeric-prop">
+<meta name="assert" content="font-variant-numeric computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-variant-numeric', 'normal');
+
+// <numeric-figure-values>   = [ lining-nums | oldstyle-nums ]
+test_computed_value('font-variant-numeric', 'lining-nums');
+test_computed_value('font-variant-numeric', 'oldstyle-nums');
+
+// <numeric-spacing-values>  = [ proportional-nums | tabular-nums ]
+test_computed_value('font-variant-numeric', 'proportional-nums');
+test_computed_value('font-variant-numeric', 'tabular-nums');
+
+// <numeric-fraction-values> = [ diagonal-fractions | stacked-fractions ]
+test_computed_value('font-variant-numeric', 'diagonal-fractions');
+test_computed_value('font-variant-numeric', 'stacked-fractions');
+
+test_computed_value('font-variant-numeric', 'ordinal');
+
+test_computed_value('font-variant-numeric', 'slashed-zero');
+
+test_computed_value('font-variant-numeric', 'oldstyle-nums tabular-nums diagonal-fractions');
+
+test_computed_value('font-variant-numeric', 'lining-nums proportional-nums stacked-fractions ordinal slashed-zero');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-invalid.html
new file mode 100644
index 00000000000..97f9e148402
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-invalid.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-numeric with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-numeric-prop">
+<meta name="assert" content="font-variant-numeric supports only the grammar 'normal | [ <numeric-figure-values> || <numeric-spacing-values> || <numeric-fraction-values> || ordinal || slashed-zero ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-variant-numeric', 'auto');
+
+test_invalid_value('font-variant-numeric', 'normal lining-nums');
+test_invalid_value('font-variant-numeric', 'lining-nums oldstyle-nums');
+
+test_invalid_value('font-variant-numeric', 'proportional-nums normal');
+test_invalid_value('font-variant-numeric', 'tabular-nums proportional-nums');
+
+test_invalid_value('font-variant-numeric', 'normal diagonal-fractions');
+test_invalid_value('font-variant-numeric', 'diagonal-fractions stacked-fractions');
+
+test_invalid_value('font-variant-numeric', 'ordinal normal');
+
+test_invalid_value('font-variant-numeric', 'normal slashed-zero');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-valid.html
new file mode 100644
index 00000000000..ed240cc36d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-valid.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-numeric with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-numeric-prop">
+<meta name="assert" content="font-variant-numeric supports the full grammar 'normal | [ <numeric-figure-values> || <numeric-spacing-values> || <numeric-fraction-values> || ordinal || slashed-zero ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-variant-numeric', 'normal');
+
+// <numeric-figure-values>   = [ lining-nums | oldstyle-nums ]
+test_valid_value('font-variant-numeric', 'lining-nums');
+test_valid_value('font-variant-numeric', 'oldstyle-nums');
+
+// <numeric-spacing-values>  = [ proportional-nums | tabular-nums ]
+test_valid_value('font-variant-numeric', 'proportional-nums');
+test_valid_value('font-variant-numeric', 'tabular-nums');
+
+// <numeric-fraction-values> = [ diagonal-fractions | stacked-fractions ]
+test_valid_value('font-variant-numeric', 'diagonal-fractions');
+test_valid_value('font-variant-numeric', 'stacked-fractions');
+
+test_valid_value('font-variant-numeric', 'ordinal');
+
+test_valid_value('font-variant-numeric', 'slashed-zero');
+
+test_valid_value('font-variant-numeric', 'oldstyle-nums tabular-nums diagonal-fractions');
+
+// Blink gives "slashed-zero ordinal stacked-fractions proportional-nums lining-nums".
+test_valid_value('font-variant-numeric', 'slashed-zero ordinal stacked-fractions proportional-nums lining-nums', 'lining-nums proportional-nums stacked-fractions ordinal slashed-zero');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-computed.html
new file mode 100644
index 00000000000..f11c0f6ab97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-computed.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontVariantPosition</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-position-prop">
+<meta name="assert" content="font-variant-position computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('font-variant-position', 'normal');
+test_computed_value('font-variant-position', 'sub');
+test_computed_value('font-variant-position', 'super');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-invalid.html
new file mode 100644
index 00000000000..11110ce53b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-position with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-position-prop">
+<meta name="assert" content="font-variant-position supports only the grammar 'normal | sub | super'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-variant-position', 'auto');
+test_invalid_value('font-variant-position', 'super sub');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-valid.html
new file mode 100644
index 00000000000..3887ab0cc4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-variant-position with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-position-prop">
+<meta name="assert" content="font-variant-position supports the full grammar 'normal | sub | super'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-variant-position', 'normal');
+test_valid_value('font-variant-position', 'sub');
+test_valid_value('font-variant-position', 'super');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-computed.html
new file mode 100644
index 00000000000..b88565ee5aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-computed.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: getComputedValue().fontWeight</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-weight-prop">
+<meta name="assert" content="font-weight computed value is a number.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+test_computed_value('font-weight', 'normal', '400');
+test_computed_value('font-weight', 'bold', '700');
+test_computed_value('font-weight', '100');
+test_computed_value('font-weight', '200');
+test_computed_value('font-weight', '300');
+test_computed_value('font-weight', '400');
+test_computed_value('font-weight', '500');
+test_computed_value('font-weight', '600');
+test_computed_value('font-weight', '700');
+test_computed_value('font-weight', '800');
+test_computed_value('font-weight', '900');
+
+function test_relative(specified, inherited, computed) {
+  test(() => {
+    const container = document.getElementById('container');
+    const target = document.getElementById('target');
+    container.style.fontWeight = inherited;
+    target.style.fontWeight = specified;
+    assert_equals(getComputedStyle(target).fontWeight, computed);
+  }, inherited + ' made ' + specified + ' computes to ' + computed);
+}
+
+test_relative('bolder', '100', '400');
+test_relative('bolder', '200', '400');
+test_relative('bolder', '300', '400');
+test_relative('bolder', '400', '700');
+test_relative('bolder', '500', '700');
+test_relative('bolder', '600', '900');
+test_relative('bolder', '700', '900');
+test_relative('bolder', '800', '900');
+test_relative('bolder', '900', '900');
+
+test_relative('lighter', '100', '100');
+test_relative('lighter', '200', '100');
+test_relative('lighter', '300', '100');
+test_relative('lighter', '400', '100');
+test_relative('lighter', '500', '100');
+test_relative('lighter', '600', '400');
+test_relative('lighter', '700', '400');
+test_relative('lighter', '800', '700');
+test_relative('lighter', '900', '700');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-invalid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-invalid.html
new file mode 100644
index 00000000000..af815693062
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-invalid.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-weight with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-weight-prop">
+<meta name="assert" content="font-weight supports only the grammar 'normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value('font-weight', 'auto');
+test_invalid_value('font-weight', 'bold 900');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-valid.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-valid.html
new file mode 100644
index 00000000000..090729287b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-valid.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 3: parsing font-weight with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-weight-prop">
+<meta name="assert" content="font-weight supports the full grammar 'normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value('font-weight', 'normal');
+test_valid_value('font-weight', 'bold');
+test_valid_value('font-weight', 'bolder');
+test_valid_value('font-weight', 'lighter');
+test_valid_value('font-weight', '100');
+test_valid_value('font-weight', '200');
+test_valid_value('font-weight', '300');
+test_valid_value('font-weight', '400');
+test_valid_value('font-weight', '500');
+test_valid_value('font-weight', '600');
+test_valid_value('font-weight', '700');
+test_valid_value('font-weight', '800');
+test_valid_value('font-weight', '900');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.tentative.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.tentative.html
index 86c1ea17c76..32bad74f94d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.tentative.html
@@ -4,6 +4,7 @@
 <meta charset="utf-8"/>
 <title>text-transform math-auto</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/3745"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#new-text-transform-values">
 <link rel="match" href="text-transform-math-auto-002.tentative-ref.html"/>
 <meta name="assert" content="Test 'text-transform: math-auto' for text nodes of different lengths">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html b/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html
index 3979dd29533..a6153b33171 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html
@@ -56,6 +56,37 @@ promise_test(async t => {
   assert_equals(getComputedStyle(div).left, '100px');
 }, 'After setting a transition\'s effect to null, style is updated');
 
+// This is a regression test for https://crbug.com/964113, where Chromium would
+// crash if the running transition's effect was set to null and a new transition
+// was started before the running one could finish.
+promise_test(async t => {
+  const div = addDiv(t);
+  div.style.left = '0px';
+
+  div.style.transition = 'left 100s';
+  getComputedStyle(div).left;
+  div.style.left = '100px';
+
+  assert_equals(div.getAnimations().length, 1);
+
+  const transition = div.getAnimations()[0];
+  await transition.ready;
+
+  // Without yielding to the rendering loop, set the current transition's
+  // effect to null and start a new transition. This should work correctly.
+  transition.effect = null;
+
+  div.style.left = '150px';
+
+  // This will run style update.
+  assert_equals(div.getAnimations().length, 1);
+
+  const new_transition = div.getAnimations()[0];
+  await new_transition.ready;
+
+  assert_equals(getComputedStyle(div).left, '0px');
+}, 'After setting a transition\'s effect to null, a new transition can be started');
+
 promise_test(async t => {
   const div = addDiv(t);
   div.style.left = '0px';
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-computed.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-computed.html
new file mode 100644
index 00000000000..0428c783f5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-computed.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: getComputedStyle().caretColor</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#caret-color">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    color: blue;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+'use strict';
+const currentColor = "rgb(0, 0, 255)";
+test_computed_value("caret-color", "auto", currentColor);
+test_computed_value("caret-color", "currentColor", currentColor);
+test_computed_value("caret-color", "red", "rgb(255, 0, 0)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-computed.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-computed.html
new file mode 100644
index 00000000000..b9aab1d230a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-computed.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: getComputedStyle().outlineColor</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    color: blue;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+'use strict';
+const currentColor = "rgb(0, 0, 255)";
+test_computed_value("outline-color", "currentColor", currentColor);
+test_computed_value("outline-color", "red", "rgb(255, 0, 0)");
+
+test(() => {
+  const target = document.getElementById('target');
+  target.style.outlineColor = 'invert';
+  if (target.style.outlineColor === 'invert')
+    assert_equals(getComputedStyle(target).outlineColor, 'invert');
+}, 'invert, if supported, computes to invert');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md b/tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md
index ffb990b5b5d..f75703bb9ef 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md
@@ -22,12 +22,15 @@ This function must return a value in one of the following four formats:
     content
 
 Above, `headers` is a list of (field name, value) pairs, and `content` is a
-string or an iterable returning strings. The `main` function may also update
-the response manually. For example, one may use `response.headers.set` to set a
-response header, and only return the content. One may even use this kind of
-handler, but manipulate the output socket directly, in which case the return
-value of the function, and the properties of the response object, will be
-ignored.
+string or an iterable returning strings.
+
+The `main` function may also update the response manually. For example, one may
+use `response.headers.set` to set a response header, and only return the
+content. One may even use this kind of handler, but manipulate the output
+socket directly. The `writer` property of the response exposes a
+`ResponseWriter` object that allows writing specific parts of the request or
+direct access to the underlying socket. If used, the return value of the
+`main` function and the properties of the `response` object will be ignored.
 
 The wptserver implements a number of Python APIs for controlling traffic.
 
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
index 17fa1a887a7..cf1ae3b174c 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
@@ -1,12 +1,31 @@
 # Server Features
 
-## Advanced Testing Features
+For many tests, writing one or more static HTML files is
+sufficient. However there are a large class of tests for which this
+approach is insufficient, including:
 
-Certain test scenarios require more than just static HTML
-generation. This is supported through the
-[wptserve](http://wptserve.readthedocs.io) server, and controlled by
-[file name flags](file-names). Several scenarios in particular are common:
+* Tests that require cross-domain access
 
+* Tests that depend on setting specific headers or status codes
+
+* Tests that need to inspect the browser-sent request
+
+* Tests that require state to be stored on the server
+
+* Tests that require precise timing of the response.
+
+To make writing such tests possible, we are using a number of
+server-side components designed to make it easy to manipulate the
+precise details of the response:
+
+* *wptserve*, a custom Python HTTP server.
+
+* *pywebsocket*, an existing websockets server
+
+wptserve is a Python-based web server. By default it serves static
+files in the testsuite. For more sophisticated requirements, several
+mechanisms are available to take control of the response. These are
+outlined below.
 
 ### Tests Involving Multiple Origins
 
@@ -90,14 +109,18 @@ the file e.g. `test.html.sub.headers`.
    server-pipes
 ```
 
-For full control over the request and response the server provides the
-ability to write `.asis` files; these are served as literal HTTP
-responses. It also provides the ability to write [Python
+For full control over the request and response, the server provides the ability
+to write `.asis` files; these are served as literal HTTP responses. In other
+words, they are sent byte-for-byte to the server without adding an HTTP status
+line, headers, or anything else. This makes them suitable for testing
+situations where the precise bytes on the wire are static, and control over the
+timing is unnecessary, but the response does not conform to HTTP requirements.
+
+The server also provides the ability to write [Python
 "handlers"](python-handlers/index)--Python scripts that have access to request
 data and can manipulate the content and timing of the response. Responses are
 also influenced by [the `pipe` query string parameter](server-pipes).
 
-
 ### Writing tests for HTTP/2.0
 
 The server now has a prototype HTTP/2.0 server which gives you access to
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md b/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
index a2a09854a98..4f4011a6c21 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
@@ -1,5 +1,11 @@
 # wptserve Pipes
 
+Pipes are designed to allow simple manipulation of the way that
+static files are sent without requiring any custom code. They are also
+useful for cross-origin tests because they can be used to activate a
+substitution mechanism which can fill in details of ports and server
+names in the setup on which the tests are being run.
+
 ## Enabling
 
 Pipes are functions that may be used when serving files to alter parts
@@ -28,7 +34,9 @@ preventing the use of HTTP 1.1 keepalive.
 ### `sub`
 
 Used to substitute variables from the server environment, or from the
-request into the response.
+request into the response. A typical use case is for testing
+cross-domain since the exact domain name and ports of the servers are
+generally unknown.
 
 Substitutions are marked in a file using a block delimited by `{{`
 and `}}`. Inside the block the following variables are available:
diff --git a/tests/wpt/web-platform-tests/element-timing/buffered-flag.html b/tests/wpt/web-platform-tests/element-timing/buffered-flag.html
new file mode 100644
index 00000000000..19c387d26b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/element-timing/buffered-flag.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Element Timing: observe element with buffered flag</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/element-timing-helpers.js"></script>
+<script>
+  async_test(t => {
+    const beforeRender = performance.now();
+    const img = document.createElement('img');
+    if (!window.PerformanceElementTiming) {
+      assert_unreached("PerformanceElementTiming is not implemented");
+    }
+    // Initial observer used to know when entry has been dispatched
+    new PerformanceObserver(() => {
+      // Second observer should require buffered flag to receive the already-dispatched entry.
+      new PerformanceObserver(t.step_func_done(entryList => {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        const pathname = window.location.origin + '/images/black-rectangle.png';
+        checkElement(entry, pathname, 'my_image', 'my_id', beforeRender, document.getElementById('my_id'));
+        // Test that viewport size is at least 100, so element is fully visible.
+        assert_greater_than_equal(document.documentElement.clientWidth, 100, 'Width should be >= 100');
+        assert_greater_than_equal(document.documentElement.clientHeight, 100, 'Height should be >= 100');
+
+        checkRect(entry, [0, 100, 0, 50]);
+        checkNaturalSize(entry, 100, 50);
+      })).observe({type: 'element', buffered: true});
+    }).observe({type: 'element'});
+    img.src = '/images/black-rectangle.png';
+    img.setAttribute('elementtiming', 'my_image');
+    img.setAttribute('id', 'my_id');
+    document.body.appendChild(img);
+  }, 'Element Timing entries are observable via buffered flag.');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/element-timing/retrievability.html b/tests/wpt/web-platform-tests/element-timing/retrievability.html
new file mode 100644
index 00000000000..3ac04d82785
--- /dev/null
+++ b/tests/wpt/web-platform-tests/element-timing/retrievability.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Element Timing: 'element' entries are not accessible via performance timeline</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/element-timing-helpers.js"></script>
+<script>
+  let img;
+  async_test(function (t) {
+    if (!window.PerformanceElementTiming) {
+      assert_unreached("PerformanceElementTiming is not implemented");
+    }
+    const beforeRender = performance.now();
+    new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        assert_equals(entry.entryType, 'element');
+        assert_equals(entry.name, 'image-paint');
+
+        const entriesByName = performance.getEntriesByName('image-paint', 'element');
+        const entriesByType = performance.getEntriesByType('element');
+        const allEntries = performance.getEntries();
+        assert_equals(entriesByName.length, 0, 'Element Timing entry should not be retrievable by getEntriesByName');
+        assert_equals(entriesByType.length, 0, 'Element Timing entry should not be retrievable by getEntriesByType');
+        assert_equals(allEntries.filter(e => e.entryType === 'element').length, 0, 'Element Timing entry should not be retrievable by getEntries');
+      })
+    ).observe({type: 'element', buffered: true});
+  }, 'Element Timing entries are not accessible via performance.getEntries*');
+</script>
+<img src='resources/square100.png' elementtiming='my_image' id='my_id'/>
diff --git a/tests/wpt/web-platform-tests/event-timing/onloadthenobserve-firstInput.html b/tests/wpt/web-platform-tests/event-timing/onloadthenobserve-firstInput.html
index 4efdfbbf006..fe40bdf65fb 100644
--- a/tests/wpt/web-platform-tests/event-timing/onloadthenobserve-firstInput.html
+++ b/tests/wpt/web-platform-tests/event-timing/onloadthenobserve-firstInput.html
@@ -17,7 +17,7 @@
      PerformanceObserver is registered
      Click 1
      Click 2
-     PerformanceObserver should observe only one firstInput entry.
+     PerformanceObserver should observe only one first-input entry.
      (Dispatch and Process Click 2 - not buffered)
   */
   async_test(function(t) {
@@ -43,7 +43,7 @@
       new PerformanceObserver(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         resolve();
-      }).observe({ type: 'firstInput' , buffered: true});
+      }).observe({ type: 'first-input' , buffered: true});
     });
 
     on_event(window, 'load', function(e) {
@@ -57,7 +57,7 @@
       });
     });
   },
-  "Event Timing: check firstInput after onload, observer, click, click."
+  "Event Timing: check first-input after onload, observer, click, click."
   );
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html b/tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html
index dd6a18ea484..d356902c31d 100644
--- a/tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html
+++ b/tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html
@@ -12,7 +12,7 @@
 
 <script>
   /* Test:
-     PerformanceObserver for firstInput is registered
+     PerformanceObserver for first-input is registered
      Click 1
      Click 2
      Wait
@@ -27,14 +27,14 @@
         const observedEntries = entryList.getEntries().filter(
             entry => entry.name === 'mousedown');
         assert_equals(observedEntries.length, 1);
-        assert_equals(observedEntries[0].entryType, 'firstInput');
+        assert_equals(observedEntries[0].entryType, 'first-input');
         assert_equals(observedEntries[0].name, 'mousedown');
-    })).observe({ entryTypes: ['firstInput'] });
+    })).observe({ entryTypes: ['first-input'] });
     on_event(window, 'load', () => {
       clickAndBlockMain('button').then(() => {
         clickAndBlockMain('button').then(wait).then( () => {
           // After some wait, the PerformanceObserver should have processed both clicks.
-          // One and only one firstInput entry should have been dispatched, so
+          // One and only one first-input entry should have been dispatched, so
           // |hasObservedFirstInput| should be true.
           t.step_timeout( () => {
             assert_true(hasObservedFirstInput);
@@ -44,7 +44,7 @@
       });
     });
   },
-  "Event Timing: check firstInput for a PerformanceObserver observing only firstInput."
+  "Event Timing: check first-input for a PerformanceObserver observing only first-input."
   );
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html b/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
index 4c7c4e74a9b..9eb067024da 100644
--- a/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
+++ b/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html
@@ -27,7 +27,7 @@
       // the one from the clickAndBlockMain() call.
       assert_greater_than_equal(entry.processingStart, beforeClick);
       // Check that the first input entry was also from the second click.
-      const firstInput = performance.getEntriesByType('firstInput');
+      const firstInput = performance.getEntriesByType('first-input');
       assert_equals(firstInput.length, 1);
       assert_greater_than_equal(firstInput[0].processingStart, beforeClick);
     }));
diff --git a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
index 53cd49795b5..83f1bc7f32a 100644
--- a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
+++ b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
@@ -24,7 +24,7 @@ function mainThreadBusy(duration) {
 
 // This method should receive an entry of type 'event'. |is_first| is true only
 // when the event also happens to correspond to the first event. In this case,
-// the timings of the 'firstInput' entry should be equal to those of this entry.
+// the timings of the 'first-input' entry should be equal to those of this entry.
 function verifyClickEvent(entry, is_first=false) {
   assert_true(entry.cancelable);
   assert_equals(entry.name, 'mousedown');
@@ -40,11 +40,11 @@ function verifyClickEvent(entry, is_first=false) {
   assert_greater_than_equal(entry.duration + 4, entry.processingEnd - entry.startTime,
       "The entry's duration must be at least as large as processingEnd - startTime.");
   if (is_first) {
-    let firstInputs = performance.getEntriesByType('firstInput');
-    assert_equals(firstInputs.length, 1, 'There should be a single firstInput entry');
+    let firstInputs = performance.getEntriesByType('first-input');
+    assert_equals(firstInputs.length, 1, 'There should be a single first-input entry');
     let firstInput = firstInputs[0];
     assert_equals(firstInput.name, entry.name);
-    assert_equals(firstInput.entryType, 'firstInput');
+    assert_equals(firstInput.entryType, 'first-input');
     assert_equals(firstInput.startTime, entry.startTime);
     assert_equals(firstInput.duration, entry.duration);
     assert_equals(firstInput.processingStart, entry.processingStart);
diff --git a/tests/wpt/web-platform-tests/event-timing/retrievability.html b/tests/wpt/web-platform-tests/event-timing/retrievability.html
index 3a762e7aa79..cdb47c6a504 100644
--- a/tests/wpt/web-platform-tests/event-timing/retrievability.html
+++ b/tests/wpt/web-platform-tests/event-timing/retrievability.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <meta charset=utf-8>
-<title>Event Timing: make sure event-timing entries are retrievable by existing perf APIs.</title>
+<title>Event Timing: make sure 'event' entries are not retrievable by performance.getEntries* APIs.</title>
 <meta name="timeout" content="long">
 <button id='button'>Generate a 'click' event</button>
 <script src=/resources/testharness.js></script>
@@ -10,17 +10,15 @@
 <script src=/resources/testdriver-vendor.js></script>
 
 <script src=resources/event-timing-test-utils.js></script>
-<img src=resources/slow-image.py>
 
 <script>
   function validateEntries() {
     const entriesByName = performance.getEntriesByName('mousedown', 'event');
     const entriesByType = performance.getEntriesByType('event');
     const allEntries = performance.getEntries();
-    assert_equals(entriesByName.length, 1, 'event-timing entry should be retrievable by getEntriesByName');
-    const e = entriesByName[0];
-    assert_true(entriesByType.includes(e), 'event-timing entry should be retrievable by getEntries');
-    assert_true(allEntries.includes(e), 'event-timing entry should be retrievable by getEntriesByType');
+    assert_equals(entriesByName.length, 0, 'Event Timing entry should not be retrievable by getEntriesByName');
+    assert_equals(entriesByType.length, 0, 'Event Timing entry should not be retrievable by getEntriesByType');
+    assert_equals(allEntries.filter(e => e.entryType === 'event').length, 0, 'Event Timing entry should not be retrievable by getEntries');
   }
 
   /* Timeline:
@@ -32,12 +30,15 @@
      Validate entries
   */
   async_test(function(t) {
-    clickAndBlockMain('button');
-    on_event(window, 'load', e => {
+    if (!window.PerformanceEventTiming) {
+      assert_unreached('PerformanceEventTiming is not implemented');
+    }
+    new PerformanceObserver(t.step_func_done(() => {
       validateEntries();
       t.done();
-    });
-  }, "Event Timing: make sure event-timing entries are retrievable by existing perf APIs.");
+    })).observe({entryTypes: ['event']});
+    clickAndBlockMain('button');
+  }, "Event Timing: make sure event-timing entries are not retrievable by performance.getEntries*.");
 
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html b/tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html
index ae66fd9d04c..5ea5d74b1a8 100644
--- a/tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html
+++ b/tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <meta charset=utf-8 />
-<title>Event Timing: firstInput entry should be buffered even without observer</title>
+<title>Event Timing: first-input entry should be buffered even without observer</title>
 <button id='button'>Generate a 'click' event</button>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
@@ -14,22 +14,22 @@
   async_test(function(t) {
     function testEntries() {
       // First callback is not ensured to have the entry.
-      if (performance.getEntriesByType('firstInput').length === 0) {
+      if (performance.getEntriesByType('first-input').length === 0) {
         t.step_timeout(testEntries, 10);
         return;
       }
-      assert_equals(performance.getEntriesByType('firstInput').length, 1,
-        "There should be a firstInput entry in the performance timeline");
-      const entry = performance.getEntriesByType('firstInput')[0];
+      assert_equals(performance.getEntriesByType('first-input').length, 1,
+        "There should be a first-input entry in the performance timeline");
+      const entry = performance.getEntriesByType('first-input')[0];
       assert_equals(entry.name, 'mousedown');
-      assert_equals(entry.entryType, 'firstInput');
+      assert_equals(entry.entryType, 'first-input');
       assert_greater_than_equal(entry.duration, 104,
         "The first input was a long one.");
       t.done();
     }
     clickAndBlockMain('button').then(wait).then(t.step_func(testEntries));
   },
-  "Event Timing: check firstInput after onload, observer, click, click."
+  "Event Timing: check first-input after onload, observer, click, click."
   );
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/event-timing/supported-types.window.js b/tests/wpt/web-platform-tests/event-timing/supported-types.window.js
index c81d501f49f..443c2533c2e 100644
--- a/tests/wpt/web-platform-tests/event-timing/supported-types.window.js
+++ b/tests/wpt/web-platform-tests/event-timing/supported-types.window.js
@@ -2,10 +2,10 @@ test(() => {
   if (typeof PerformanceObserver.supportedEntryTypes === "undefined")
     assert_unreached("supportedEntryTypes is not supported.");
   const types = PerformanceObserver.supportedEntryTypes;
-  assert_true(types.includes("firstInput"),
-    "There should be 'firstInput' in PerformanceObserver.supportedEntryTypes");
+  assert_true(types.includes("first-input"),
+    "There should be 'first-input' in PerformanceObserver.supportedEntryTypes");
   assert_true(types.includes("event"),
     "There should be 'event' in PerformanceObserver.supportedEntryTypes");
-  assert_greater_than(types.indexOf("firstInput"), types.indexOf('event'),
-    "The 'firstInput' entry should appear after the 'event' entry");
-}, "supportedEntryTypes contains 'event' and 'firstInput'.");
+  assert_greater_than(types.indexOf("first-input"), types.indexOf('event'),
+    "The 'first-input' entry should appear after the 'event' entry");
+}, "supportedEntryTypes contains 'event' and 'first-input'.");
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
new file mode 100644
index 00000000000..c83e8ff9261
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
@@ -0,0 +1,8 @@
+[actionsWithKeyPressed.html]
+  expected:
+    if product == "safari": ERROR
+
+  [TestDriver actions: actions with key pressed]
+    expected:
+      if product == "firefox": FAIL
+      if os == "mac" and product == "chrome": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html
new file mode 100644
index 00000000000..74e939f5fde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: actions with key pressed</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div#test1, div#test2 {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+
+div#test2 {
+  position: fixed;
+  top: 100px;
+  left: 0;
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+</style>
+
+<div id="test1">
+</div>
+
+<div id="test2">
+</div>
+
+<script>
+let keys = [];
+
+async_test(t => {
+  let test1 = document.getElementById("test1");
+  let test2 = document.getElementById("test2");
+  document.getElementById("test1").addEventListener("click",
+    e => {keys.push(e.getModifierState("Control"))});
+  document.getElementById("test2").addEventListener("click",
+    e => {keys.push(e.getModifierState("Control"))});
+
+  let actions = new test_driver.Actions()
+    .keyDown("\uE009")
+    .addTick()
+    .pointerMove(0, 0, {origin: test1})
+    .pointerDown()
+    .pointerUp()
+    .pointerMove(0, 0, {origin: test2})
+    .pointerDown()
+    .pointerUp()
+    .addTick()
+    .keyUp("\uE009")
+    .addTick()
+    .pointerMove(0, 0, {origin: test1})
+    .pointerDown()
+    .pointerUp();
+
+  actions.send()
+    .then(t.step_func_done(() => assert_array_equals(keys, [true, true, false])))
+    .catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html b/tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html
index 3716f931922..fd4844d16b3 100644
--- a/tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html
@@ -13,7 +13,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, 'largestContentfulPaint');
+        assert_equals(entry.entryType, 'largest-contentful-paint');
         assert_equals(entry.startTime, 0, 'The startTime value should be 0 for a cross origin image.');
         assert_equals(entry.duration, 0);
         // blue.png is 133 x 106.
@@ -26,7 +26,7 @@
         assert_equals(entry.element, document.getElementById('image_id'));
       })
     );
-    observer.observe({type: 'largestContentfulPaint', buffered: true});
+    observer.observe({type: 'largest-contentful-paint', buffered: true});
   }, 'Cross-origin image is observable, with startTime equal to 0.');
 </script>
 
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html b/tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html
index 8adf2150afc..a1ecbceb503 100644
--- a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html
@@ -14,7 +14,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, 'largestContentfulPaint');
+        assert_equals(entry.entryType, 'largest-contentful-paint');
         assert_greater_than_equal(entry.startTime, beforeRender,
           'The rendering timestamp should occur after script starts running.');
         assert_greater_than_equal(performance.now(), entry.startTime,
@@ -32,7 +32,7 @@
         assert_equals(entry.element, document.getElementById('image_id'));
       })
     );
-    observer.observe({type: 'largestContentfulPaint', buffered: true});
+    observer.observe({type: 'largest-contentful-paint', buffered: true});
   }, 'Same-origin image is observable.');
 </script>
 
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html b/tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html
index a9a0d750d66..58897907365 100644
--- a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html
@@ -19,7 +19,7 @@ p {
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, 'largestContentfulPaint');
+        assert_equals(entry.entryType, 'largest-contentful-paint');
         assert_greater_than_equal(entry.startTime, beforeRender);
         assert_greater_than_equal(performance.now(), entry.startTime);
         assert_equals(entry.duration, 0);
@@ -33,7 +33,7 @@ p {
         assert_equals(entry.element, document.getElementById('my_text'));
       })
     );
-    observer.observe({type: 'largestContentfulPaint', buffered: true});
+    observer.observe({type: 'largest-contentful-paint', buffered: true});
     beforeRender = performance.now();
   }, 'Element with elementtiming attribute is observable.');
 </script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html b/tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html
index 5d2e69f1ff2..216cafd45de 100644
--- a/tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html
+++ b/tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
-<title>Layout Instability: query layout shift value via the performance timeline</title>
+<title>Layout Instability entries are not available via the performance timeline</title>
 <body>
 <style>
 #myDiv { position: relative; width: 300px; height: 100px; }
@@ -13,19 +13,11 @@
 <script>
   async_test(function (t) {
     const startTime = performance.now();
-    // Modify the position of the div.
-    document.getElementById('myDiv').style = "top: 60px";
-    function testBufferedEntry() {
-      if (performance.getEntriesByType('layoutShift').length === 0) {
-        t.step_timeout(testBufferedEntry, 0);
-        return;
-      }
+    new PerformanceObserver(list => {
       const endTime = performance.now();
-      assert_equals(performance.getEntriesByType('layoutShift').length, 1);
-      assert_equals(performance.getEntries().filter(
-        entry => entry.entryType === 'layoutShift').length, 1);
-      const entry = performance.getEntriesByType('layoutShift')[0];
-      assert_equals(entry.entryType, "layoutShift");
+      assert_equals(list.getEntries().length, 1);
+      const entry = list.getEntries()[0];
+      assert_equals(entry.entryType, "layout-shift");
       assert_equals(entry.name, "");
       assert_greater_than_equal(entry.startTime, startTime)
       assert_less_than_equal(entry.startTime, endTime)
@@ -36,10 +28,16 @@
       // 300 * (100 + 60) * (60 / maxDimension) / viewport size.
       assert_equals(entry.value, 300 * (100 + 60) * (60 / maxDimension) /
         (document.documentElement.clientWidth * document.documentElement.clientHeight));
+
+      // The entry should not be available via getEntries* methods.
+      assert_equals(performance.getEntriesByType('layout-shift').length, 0, 'getEntriesByType should have no layout-shift entries');
+      assert_equals(performance.getEntriesByName('', 'layout-shift').length, 0, 'getEntriesByName should have no layout-shift entries');
+      assert_equals(performance.getEntries().filter(e => e.entryType === 'layout-shift').length, 0, 'getEntries should have no layout-shift entries');
       t.done();
-    }
-    t.step(testBufferedEntry);
-  }, 'Layout shift before onload is buffered into the performance timeline.');
+    }).observe({type: 'layout-shift'});
+    // Modify the position of the div.
+    document.getElementById('myDiv').style = "top: 60px";
+  }, 'Layout shift before onload is not buffered into the performance timeline.');
 </script>
 
 </body>
diff --git a/tests/wpt/web-platform-tests/layout-instability/observe-layout-shift.html b/tests/wpt/web-platform-tests/layout-instability/observe-layout-shift.html
index 1aa429b6b68..a522b49034e 100644
--- a/tests/wpt/web-platform-tests/layout-instability/observe-layout-shift.html
+++ b/tests/wpt/web-platform-tests/layout-instability/observe-layout-shift.html
@@ -46,7 +46,7 @@
         const endTime = performance.now();
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, "layoutShift");
+        assert_equals(entry.entryType, "layout-shift");
         assert_equals(entry.name, "");
         assert_greater_than_equal(entry.startTime, startTime)
         assert_less_than_equal(entry.startTime, endTime)
@@ -59,7 +59,7 @@
           (document.documentElement.clientWidth * document.documentElement.clientHeight));
       })
     );
-    observer.observe({entryTypes: ['layoutShift']});
+    observer.observe({entryTypes: ['layout-shift']});
     window.onload = () => {
       // Modify the position of the div.
       document.getElementById('myDiv').style = "top: 60px";
@@ -73,7 +73,7 @@
         const endTime = performance.now();
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, "layoutShift");
+        assert_equals(entry.entryType, "layout-shift");
         assert_equals(entry.name, "");
         assert_greater_than_equal(entry.startTime, startTime)
         assert_less_than_equal(entry.startTime, endTime)
@@ -89,7 +89,7 @@
         assert_greater_than_equal(timeAfterClick, entry.lastInputTime);
       })
     );
-    observer.observe({entryTypes: ['layoutShift']});
+    observer.observe({entryTypes: ['layout-shift']});
     window.onload = () => {
       // User input event
       clickAndBlockMain('button').then( () => {
diff --git a/tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html b/tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html
index af0ff3aa138..9bc53701658 100644
--- a/tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html
+++ b/tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html
@@ -9,8 +9,8 @@
 test(() => {
   if (typeof PerformanceObserver.supportedEntryTypes === "undefined")
     assert_unreached("supportedEntryTypes is not supported.");
-  assert_greater_than(PerformanceObserver.supportedEntryTypes.indexOf("layoutShift"), -1,
-    "There should be an entry 'layoutShift' in PerformanceObserver.supportedEntryTypes");
+  assert_greater_than(PerformanceObserver.supportedEntryTypes.indexOf("layout-shift"), -1,
+    "There should be an entry 'layout-shift' in PerformanceObserver.supportedEntryTypes");
 }, "supportedEntryTypes contains 'layoutShift'.");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-after-timeout.any.js b/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-after-timeout.any.js
new file mode 100644
index 00000000000..08b3e323146
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-after-timeout.any.js
@@ -0,0 +1,11 @@
+async_test(t => {
+  performance.mark('foo');
+  t.step_timeout(() => {
+    // After a timeout, PerformanceObserver should still receive entry if using the buffered flag.
+    new PerformanceObserver(t.step_func_done(list => {
+      const entries = list.getEntries();
+      assert_equals(entries.length, 1, 'There should be 1 mark entry.');
+      assert_equals(entries[0].entryType, 'mark');
+    })).observe({type: 'mark', buffered: true});
+  }, 100);
+}, 'PerformanceObserver with buffered flag sees entry after timeout');
diff --git a/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-observer.any.js b/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-observer.any.js
new file mode 100644
index 00000000000..31dc39c128a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-observer.any.js
@@ -0,0 +1,15 @@
+async_test( t=> {
+  for (let i = 0; i < 50; i++)
+    performance.mark('foo' + i);
+  let marksCreated = 50;
+  let marksReceived = 0;
+  new PerformanceObserver(list => {
+    marksReceived += list.getEntries().length;
+    if (marksCreated < 100) {
+      performance.mark('bar' + marksCreated);
+      marksCreated++;
+    }
+    if (marksReceived == 100)
+      t.done();
+  }).observe({type: 'mark', buffered: true});
+}, 'PerformanceObserver with buffered flag should see past and future entries.');
diff --git a/tests/wpt/web-platform-tests/performance-timeline/multiple-buffered-flag-observers.any.js b/tests/wpt/web-platform-tests/performance-timeline/multiple-buffered-flag-observers.any.js
new file mode 100644
index 00000000000..5dd44fb18fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/multiple-buffered-flag-observers.any.js
@@ -0,0 +1,32 @@
+promise_test(() => {
+  // The first promise waits for one buffered flag observer to receive 3 entries.
+  const promise1 = new Promise(resolve1 => {
+    let numObserved1 = 0;
+    new PerformanceObserver((entryList, obs) => {
+      // This buffered flag observer is constructed after a regular observer detects a mark.
+      new PerformanceObserver(list => {
+        numObserved1 += list.getEntries().length;
+        if (numObserved1 == 3)
+          resolve1();
+      }).observe({type: 'mark', buffered: true});
+      obs.disconnect();
+    }).observe({entryTypes: ['mark']});
+    performance.mark('foo');
+  });
+  // The second promise waits for another buffered flag observer to receive 3 entries.
+  const promise2 = new Promise(resolve2 => {
+    step_timeout(() => {
+      let numObserved2 = 0;
+      // This buffered flag observer is constructed after a delay of 100ms.
+      new PerformanceObserver(list => {
+        numObserved2 += list.getEntries().length;
+        if (numObserved2 == 3)
+          resolve2();
+      }).observe({type: 'mark', buffered: true});
+    }, 100);
+    performance.mark('bar');
+  });
+  performance.mark('meow');
+  // Pass if and only if both buffered observers received all 3 mark entries.
+  return Promise.all([promise1, promise2]);
+}, 'Multiple PerformanceObservers with buffered flag see all entries');
diff --git a/tests/wpt/web-platform-tests/performance-timeline/observer-buffered-false.any.js b/tests/wpt/web-platform-tests/performance-timeline/observer-buffered-false.any.js
new file mode 100644
index 00000000000..a28100b0fdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/observer-buffered-false.any.js
@@ -0,0 +1,12 @@
+async_test(t => {
+  performance.mark('foo');
+  // Use a timeout to ensure the remainder of the test runs after the entry is created.
+  t.step_timeout(() => {
+    // Observer with buffered flag set to false should not see entry.
+    new PerformanceObserver(() => {
+      assert_unreached('Should not have observed any entry!');
+    }).observe({type: 'mark', buffered: false});
+    // Use a timeout to give time to the observer.
+    t.step_timeout(t.step_func_done(() => {}), 100);
+  }, 0);
+}, 'PerformanceObserver without buffered flag set to false cannot see past entries.');
diff --git a/tests/wpt/web-platform-tests/server-side.md b/tests/wpt/web-platform-tests/server-side.md
deleted file mode 100644
index 46a9e8367c3..00000000000
--- a/tests/wpt/web-platform-tests/server-side.md
+++ /dev/null
@@ -1,234 +0,0 @@
-# Writing Complex Tests #
-
-For many tests, writing one or more static HTML files is
-sufficient. However there are a large class of tests for which this
-approach is insufficient, including:
-
-* Tests that require cross-domain access
-
-* Tests that depend on setting specific headers or status codes
-
-* Tests that need to inspect the browser sent request
-
-* Tests that require state to be stored on the server
-
-* Tests that require precise timing of the response.
-
-To make writing such tests possible, we are using a number of
-server-side components designed to make it easy to manipulate the
-precise details of the response:
-
-* *wptserve*, a custom python HTTP server.
-
-* *pywebsocket*, an existing websockets server
-
-This document will concentrate on the features of wptserve available
-to test authors.
-
-## Introduction to wptserve ##
-
-wptserve is a python-based web server. By default it serves static
-files in the testsuite. For more sophisticated requirements, several
-mechanisms are available to take control of the response. These are
-outlined below.
-
-## Pipes ##
-
-Suitable for:
-
- * Cross domain requests
- * Adding headers or status codes to static files
- * Controlling the sending of static file bodies
-
-Pipes are designed to allow simple manipulation of the way that
-static files are sent without requiring any custom code. They are also
-useful for cross-origin tests because they can be used to activate a
-substitution mechanism which can fill in details of ports and server
-names in the setup on which the tests are being run.
-
-Pipes are indicated by adding a query string to a request for a static
-resource, with the parameter name `pipe`. The value of the query
-should be a `|` serperated list of pipe functions. For example to
-return a `.html` file with the status code 410 and a Content-Type of
-text/plain, one might use:
-
-    /resources/example.html?pipe=status(410)|header(Content-Type,text/plain)
-
-There are a selection of pipe functions provided with wptserve and
-more may be added if there are good use cases.
-
-### sub ###
-
-Used to subsitute variables from the server environment, or from the
-request into the response. A typical use case is for testing
-cross-domain since the exact domain name and ports of the servers are
-generally unknown.
-
-Substitutions are marked in a file using a block delimited by `{{`
-and `}}`. Inside the block the following variables are avalible:
-
-* `{{host}}` - the host name of the server exclusing any subdomain part.
-* `{{domains[]}}` - the domain name of a particular subdomain
-    e.g. `{{domains[www]}}` for the `www` subdomain.
-* `{{ports[][]}}` - The port number of servers, by protocol
-    e.g. `{{ports[http][1]}}` for the second (i.e. non-default) http
-  server.
-* `{{headers[]}}` - The HTTP headers in the request
-    e.g. `{{headers[X-Test]}}` for a hypothetical `X-Test` header.
-* `{{GET[]}}` - The query parameters for the request
-    e.g. `{{GET[id]}}` for an id parameter sent with the request.
-
-So, for example, to write a javascript file called `xhr.js` that does a
-cross domain XHR test to a different subdomain and port, one would
-write in the file:
-
-    var server_url = "http://{{domains[www]}}:{{ports[http][1]}}/path/to/resource";
-    //Create the actual XHR and so on
-
-The file would then be included as:
-
-    <script src="xhr.js?pipe=sub"></script>
-
-### status ###
-
-Used to set the HTTP status of the response, for example:
-
-    example.js?pipe=status(410)
-
-### headers ###
-
-Used to add or replace http headers in the response. Takes two or
-three arguments; the header name, the header value and whether to
-append the header rather than replace an existing header (default:
-False). So, for example, a request for:
-
-    example.html?pipe=header(Content-Type,text/plain)
-
-causes example.html to be returned with a text/plain content type
-whereas:
-
-    example.html?pipe=header(Content-Type,text/plain,True)
-
-Will cause example.html to be returned with both text/html and
-text/plain content-type headers.
-
-### slice ###
-
-Used to send only part of a response body. Takes the start and,
-optionally, end bytes as arguments, although either can be null to
-indicate the start or end of the file, respectively. So for example:
-
-    example.txt?pipe=slice(10,20)
-
-Would result in a response with a body containing 10 bytes of
-example.txt including byte 10 but excluding byte 20.
-
-    example.txt?pipe=slice(10)
-
-Would cause all bytes from byte 10 of example.txt to be sent, but:
-
-    example.txt?pipe=slice(null,20)
-
-Would send the first 20 bytes of example.txt.
-
-### trickle ###
-
-Used to send the body of a response in chunks with delays. Takes a
-single argument that is a microsyntax consisting of colon-separated
-commands. There are three types of commands:
-
-* Bare numbers represent a number of bytes to send
-
-* Numbers prefixed `d` indicate a delay in seconds
-
-* Numbers prefixed `r` must only appear at the end of the command, and
-    indicate that the preceding N items must be repeated until there is
-  no more content to send.
-
-In the absence of a repetition command, the entire remainder of the content is
-sent at once when the command list is exhausted. So for example:
-
-    example.txt?pipe=trickle(d1)
-
-causes a 1s delay before sending the entirety of example.txt.
-
-    example.txt?pipe=trickle(100:d1)
-
-causes 100 bytes of example.txt to be sent, followed by a 1s delay,
-and then the remainder of the file to be sent. On the other hand:
-
-    example.txt?pipe=trickle(100:d1:r2)
-
-Will cause the file to be sent in 100 byte chunks separated by a 1s
-delay until the whole content has been sent.
-
-## asis files ##
-
-Suitable for:
-
- * Static, HTTP-non-compliant responses
-
-asis files are simply files with the extension `.asis`. They are sent
-byte for byte to the server without adding a HTTP status line,
-headers, or anything else. This makes them suitable for testing
-situations where the precise bytes on the wire are static, and control
-over the timing is unnecessary, but the response does not conform to
-HTTP requirements.
-
-## py files ##
-
-Suitable for:
-
- * All tests requiring dynamic responses
- * Tests that need to store server side state.
-
-The most flexible mechanism for writing tests is to use `.py`
-files. These are interpreted as code and are suitable for the same
-kinds of tasks that one might achieve using cgi, PHP or a similar
-technology. Unlike cgi or PHP, the file is not executed directly and
-does not produce output by writing to `stdout`. Instead files must
-contain (at least) a function named `main`, with the signature:
-
-    def main(request, response):
-        pass
-
-Here `request` is a `Request` object that contains details of the
-request, and `response` is a `Response` object that can be used to set
-properties of the response. Full details of these objects is
-provided in the [wptserve documentation](http://wptserve.readthedocs.org/en/latest/).
-
-In many cases tests will not need to work with the `response` object
-directly. Instead they can set the status, headers and body simply by
-returning values from the `main` function. If any value is returned,
-it is interpreted as the response body. If two values are returned
-they are interpreted as headers and body, and three values are
-interpreted as status, headers, body. So, for example:
-
-    def main(request, response):
-        return "TEST"
-
-creates a response with no non-default headers and the body
-`TEST`. Headers can be added as follows:
-
-    def main(request, response):
-        return ([("Content-Type", "text/plain"), ("X-Test", "test")],
-                "TEST")
-
-And a status code as:
-
-    def main(request, response):
-        return (410,
-                [("Content-Type", "text/plain"), ("X-Test", "test")],
-              "TEST")
-
-A custom status string may be returned by using a tuple `code, string`
-in place of the code alone.
-
-At the other end of the scale, some tests require precision over the
-exact bytes sent over the wire and their timing. This can be achieved
-using the `writer` property of the response, which exposes a
-`ResponseWriter` object that allows wither writing specific parts of
-the request or direct access to the underlying socket.
-
-For full documentation on the facilities available in `.py` files, see
-the [wptserve documentation](http://wptserve.readthedocs.org/en/latest/).
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-iframe.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-iframe.https.html
deleted file mode 100644
index 87b0ed3f249..00000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-iframe.https.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<script src="/resources/testharness.js"></script>
-<script src="test-helpers.sub.js?pipe=sub"></script>
-<script>
-
-class TestRunner {
-  constructor(script_url, worker_type) {
-    this.script_url = script_url;
-    this.worker_type = worker_type;
-  }
-
-  // Tests subresource requests on a worker.
-  async run(subresource_type) {
-    let data;
-    if (this.worker_type === 'worker') {
-      data = await this.runOnDedicatedWorker(subresource_type);
-    } else if (this.worker_type === 'sharedworker') {
-      data = await this.runOnSharedWorker(subresource_type);
-    } else {
-      data = 'Unexpected worker type! ' + worker_type;
-    }
-    assert_equals(data, 'This load was successfully intercepted.');
-  }
-
-  async runOnDedicatedWorker(subresource_type) {
-    const worker = new Worker(this.script_url);
-    const data = await new Promise((resolve, reject) => {
-      worker.onmessage = e => resolve(e.data);
-      worker.onerror = e => reject(e);
-      worker.postMessage(subresource_type);
-    });
-    worker.terminate();
-    return data;
-  }
-
-  async runOnSharedWorker(subresource_type) {
-    const worker = new SharedWorker(this.script_url);
-    return await new Promise((resolve, reject) => {
-      worker.port.onmessage = e => resolve(e.data);
-      worker.onerror = e => reject(e);
-      worker.port.postMessage(subresource_type);
-    });
-  }
-}
-
-window.addEventListener('message', async evt => {
-  const test_runner = new TestRunner(evt.data.script, evt.data.type);
-  const port = evt.ports[0];
-
-  try {
-    await test_runner.run('xhr');
-    await test_runner.run('fetch');
-    await test_runner.run('importScripts');
-    port.postMessage({results: 'finish'});
-  } catch(e) {
-    port.postMessage({results: 'failure:' + e});
-  }
-});
-
-</script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
index 6b66fb0f022..204638a44af 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
@@ -7,19 +7,21 @@
 <body>
 <script>
 
-async function setup_service_worker(t, script_url, scope) {
-  const r =
-      await service_worker_unregister_and_register(t, script_url, scope);
+async function setup_service_worker(t, service_worker_url, scope) {
+  const r = await service_worker_unregister_and_register(
+      t, service_worker_url, scope);
   t.add_cleanup(() => service_worker_unregister(t, scope));
   await wait_for_state(t, r.installing, 'activated');
 }
 
+// ========== Worker main resource interception tests ==========
+
 promise_test(async t => {
   const worker_url = 'resources/dummy-synthesized-worker.js?dedicated';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new Worker(worker_url);
   const data = await new Promise((resolve, reject) => {
     w.onmessage = e => resolve(e.data);
@@ -31,10 +33,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-synthesized-worker.js?shared';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new SharedWorker(worker_url);
   const data = await new Promise((resolve, reject) => {
     w.port.onmessage = e => resolve(e.data);
@@ -46,10 +48,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-same-origin-worker.js?dedicated';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new Worker(worker_url);
   const data = await new Promise((resolve, reject) => {
     w.onmessage = e => resolve(e.data);
@@ -61,10 +63,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-same-origin-worker.js?shared';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new SharedWorker(worker_url);
   const data = await new Promise((resolve, reject) => {
     w.port.onmessage = e => resolve(e.data);
@@ -76,10 +78,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-cors-worker.js?dedicated';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new Worker(worker_url);
   const watcher = new EventWatcher(t, w, ['message', 'error']);
   await watcher.wait_for('error');
@@ -88,10 +90,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-cors-worker.js?shared';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new SharedWorker(worker_url);
   const watcher = new EventWatcher(t, w, ['message', 'error']);
   await watcher.wait_for('error');
@@ -100,10 +102,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-no-cors-worker.js?dedicated';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new Worker(worker_url);
   const watcher = new EventWatcher(t, w, ['message', 'error']);
   await watcher.wait_for('error');
@@ -112,91 +114,91 @@ promise_test(async t => {
 
 promise_test(async t => {
   const worker_url = 'resources/dummy-no-cors-worker.js?shared';
-  const service_worker = 'resources/dummy-worker-interceptor.js';
+  const service_worker_url = 'resources/dummy-worker-interceptor.js';
   const scope = worker_url;
 
-  await setup_service_worker(t, service_worker, scope);
+  await setup_service_worker(t, service_worker_url, scope);
   const w = new SharedWorker(worker_url);
   const watcher = new EventWatcher(t, w, ['message', 'error']);
   await watcher.wait_for('error');
 }, 'Verify a no-cors cross-origin worker script served by a service worker ' +
    'fails shared worker start.');
 
-promise_test(async t => {
-  const subdoc_url = 'resources/worker-interception-iframe.https.html';
-  const service_worker = 'resources/worker-load-interceptor.js';
-  const scope = 'resources/load_worker.js?dedicated';
+// ========== Worker subresource interception tests ==========
 
-  await setup_service_worker(t, service_worker, scope);
-  const frame = await with_iframe(subdoc_url);
-  t.add_cleanup(() => frame.remove());
+// Do not call this function multiple times without waiting for the promise
+// resolution because this sets new event handlers on |worker|.
+// TODO(nhiroki): To isolate multiple function calls, use MessagePort instead of
+// worker's onmessage event handler.
+async function request_on_worker(worker, resource_type) {
   const data = await new Promise((resolve, reject) => {
-    const channel = new MessageChannel();
-    channel.port1.onmessage = e => resolve(e.data);
-    frame.contentWindow.postMessage(
-        { script: 'load_worker.js?dedicated', type: 'worker' },
-        '*', [channel.port2]);
+    if (worker instanceof Worker) {
+      worker.onmessage = e => resolve(e.data);
+      worker.onerror = e => reject(e);
+      worker.postMessage(resource_type);
+    } else if (worker instanceof SharedWorker) {
+      worker.port.onmessage = e => resolve(e.data);
+      worker.onerror = e => reject(e);
+      worker.port.postMessage(resource_type);
+    } else {
+      reject('Unexpected worker type!');
+    }
   });
-  assert_equals(data.results, 'finish');
-}, 'Verify subresource requests on a dedicated worker controlled by a ' +
-   'service worker.');
+  assert_equals(data, 'This load was successfully intercepted.');
+}
 
-promise_test(async t => {
-  const subdoc_url = 'resources/worker-interception-iframe.https.html';
-  const service_worker = 'resources/worker-load-interceptor.js';
-  const scope = 'resources/load_worker.js?shared';
+// TODO(nhiroki): For optimization, register a service worker just once in an
+// initial promise test.
 
-  await setup_service_worker(t, service_worker, scope);
-  const frame = await with_iframe(subdoc_url);
-  t.add_cleanup(() => frame.remove());
-  const data = await new Promise((resolve, reject) => {
-    const channel = new MessageChannel();
-    channel.port1.onmessage = e => resolve(e.data);
-    frame.contentWindow.postMessage(
-        { script: 'load_worker.js?shared', type: 'sharedworker' },
-        '*', [channel.port2]);
-  });
-  assert_equals(data.results, 'finish');
-}, 'Verify subresource requests on a shared worker controlled by a service ' +
-   'worker.');
+function dedicated_worker_subresource_test(worker_url, scope, description) {
+  promise_test(async t => {
+    const service_worker_url = 'resources/worker-load-interceptor.js';
+    await setup_service_worker(t, service_worker_url, scope);
+    const worker = new Worker(worker_url);
 
-promise_test(async t => {
-  const subdoc_url = 'resources/worker-interception-iframe.https.html';
-  const service_worker = 'resources/worker-load-interceptor.js';
-  const scope = 'resources/nested_load_worker.js?dedicated';
+    await request_on_worker(worker, 'xhr');
+    await request_on_worker(worker, 'fetch');
+    await request_on_worker(worker, 'importScripts');
+  }, description);
+}
 
-  await setup_service_worker(t, service_worker, scope);
-  const frame = await with_iframe(subdoc_url);
-  t.add_cleanup(() => frame.remove());
-  const data = await new Promise((resolve, reject) => {
-    const channel = new MessageChannel();
-    channel.port1.onmessage = e => resolve(e.data);
-    frame.contentWindow.postMessage(
-        { script: 'nested_load_worker.js?dedicated', type: 'worker' },
-        '*', [channel.port2]);
-  });
-  assert_equals(data.results, 'finish');
-}, 'Verify subresource requests on a nested dedicated worker created from a ' +
-   'dedicated worker and controlled by a service worker.');
+function shared_worker_subresource_test(worker_url, scope, description) {
+  promise_test(async t => {
+    const service_worker_url = 'resources/worker-load-interceptor.js';
+    await setup_service_worker(t, service_worker_url, scope);
+    const worker = new SharedWorker(worker_url);
 
-promise_test(async t => {
-  const subdoc_url = 'resources/worker-interception-iframe.https.html';
-  const service_worker = 'resources/worker-load-interceptor.js';
-  const scope = 'resources/nested_load_worker.js?shared';
+    await request_on_worker(worker, 'xhr');
+    await request_on_worker(worker, 'fetch');
+    await request_on_worker(worker, 'importScripts');
+  }, description);
+}
 
-  await setup_service_worker(t, service_worker, scope);
-  const frame = await with_iframe(subdoc_url);
-  t.add_cleanup(() => frame.remove());
-  const data = await new Promise((resolve, reject) => {
-    const channel = new MessageChannel();
-    channel.port1.onmessage = e => resolve(e.data);
-    frame.contentWindow.postMessage(
-        { script: 'nested_load_worker.js?shared', type: 'sharedworker' },
-        '*', [channel.port2]);
-  });
-  assert_equals(data.results, 'finish');
-}, 'Verify subresource requests on a nested dedicated worker created from a ' +
-   'shared worker and controlled by a service worker.');
+dedicated_worker_subresource_test(
+    'resources/load_worker.js?dedicated',
+    'resources/load_worker.js?dedicated',
+    'Requests on a dedicated worker controlled by a service worker.');
+
+shared_worker_subresource_test(
+    'resources/load_worker.js?shared',
+    'resources/load_worker.js?shared',
+    'Requests on a shared worker controlled by a service worker.');
+
+dedicated_worker_subresource_test(
+    'resources/nested_load_worker.js?dedicated',
+    // TODO(nhiroki): This scope is wrong. This should be
+    // 'resources/load_worker.js?dedicated'.
+    'resources/nested_load_worker.js?dedicated',
+    'Requests on a dedicated worker nested in a dedicated worker and ' +
+        'controlled by a service worker');
+
+shared_worker_subresource_test(
+    'resources/nested_load_worker.js?shared',
+    // TODO(nhiroki): This scope is wrong. This should be
+    // 'resources/load_worker.js?shared'.
+    'resources/nested_load_worker.js?shared',
+    'Requests on a dedicated worker nested in a shared worker and controlled ' +
+        'by a service worker');
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
index 16750f25438..81a5e043469 100755
--- a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
@@ -15,7 +15,7 @@ variant_key_header=variant-key-04
 
 set -e
 
-for cmd in gen-signedexchange gen-certurl; do
+for cmd in gen-signedexchange gen-certurl dump-signedexchange; do
     if ! command -v $cmd > /dev/null 2>&1; then
         echo "$cmd is not installed. Please run:"
         echo "  go get -u github.com/WICG/webpackage/go/signedexchange/cmd/..."
@@ -540,4 +540,40 @@ gen-signedexchange \
   -o sxg/sxg-data-cert-url.sxg \
   -miRecordSize 100
 
+# Generate the signed exchange file of sxg-subresource-script-inner.js.
+gen-signedexchange \
+  -version $sxg_version \
+  -uri $inner_url_origin/signed-exchange/resources/sxg-subresource-script.js \
+  -status 200 \
+  -content sxg-subresource-script-inner.js \
+  -certificate $certfile \
+  -certUrl $cert_url_origin/signed-exchange/resources/$certfile.cbor \
+  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
+  -privateKey $keyfile \
+  -date 2030-04-01T00:00:00Z \
+  -expire 168h \
+  -o sxg/sxg-subresource-script.sxg \
+  -miRecordSize 100
+
+# Get the header integrity hash value of sxg-subresource-script.sxg.
+header_integrity=$(dump-signedexchange -i sxg/sxg-subresource-script.sxg | \
+                   grep -o "header integrity: sha256-.*" | \
+                   grep -o "sha256-.*$")
+
+# Generate the signed exchange file of signed exchange subresource test.
+gen-signedexchange \
+  -version $sxg_version \
+  -uri $inner_url_origin/signed-exchange/resources/sxg-subresource-sxg.html \
+  -status 200 \
+  -content sxg-subresource-sxg-inner.html \
+  -certificate $certfile \
+  -certUrl $cert_url_origin/signed-exchange/resources/$certfile.cbor \
+  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
+  -privateKey $keyfile \
+  -date 2030-04-01T00:00:00Z \
+  -expire 168h \
+  -o sxg/sxg-subresource.sxg \
+  -miRecordSize 100 \
+  -responseHeader "link:<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=allowed-alt-sxg;header-integrity=\"$header_integrity\",<$inner_url_origin/signed-exchange/resources/sxg-subresource-script.js>;rel=preload;as=script"
+
 rm -fr $tmpdir
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-iframe.html b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-iframe.html
new file mode 100644
index 00000000000..bd812857b46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-iframe.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<body>
+<script>
+(async () => {
+  const sxg_path = 'sxg/sxg-subresource.sxg';
+  const scipt_sxg_path = 'sxg/sxg-subresource-script.sxg';
+  const scipt_path = 'sxg-subresource-script.js';
+  const wait_for_prefetch = new Promise((resolve) => {
+    new PerformanceObserver((list) => {
+      for (let e of list.getEntries()) {
+        if (e.name.endsWith(scipt_sxg_path)) {
+          resolve();
+        } else if (e.name.endsWith(scipt_path)) {
+          window.parent.postMessage(
+            scipt_path + ' should not be prefetched', '*');
+        }
+      }
+    }).observe({ entryTypes: ['resource'] });
+  });
+
+  const link = document.createElement('link');
+  link.rel = 'prefetch';
+  link.href = sxg_path;
+  document.body.appendChild(link);
+  await wait_for_prefetch;
+  location.href = sxg_path;
+})()
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script-inner.js b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script-inner.js
new file mode 100644
index 00000000000..dcc7a356a0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script-inner.js
@@ -0,0 +1,4 @@
+// Usually the alternate resource should have the same content as the original
+// one (sxg-subresource-script.js), but for now we use differentiated content
+// for easy testing.
+window.parent.postMessage('from signed exchange', '*');
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script.js b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script.js
new file mode 100644
index 00000000000..c730568fcfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script.js
@@ -0,0 +1 @@
+window.parent.postMessage('from server', '*');
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-sxg-inner.html b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-sxg-inner.html
new file mode 100644
index 00000000000..9dfff56ad8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-sxg-inner.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<script src="sxg-subresource-script.js"></script>
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg
new file mode 100644
index 00000000000..6a6f37e7818
Binary files /dev/null and b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg differ
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg
new file mode 100644
index 00000000000..05be42adcc1
Binary files /dev/null and b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg differ
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers
new file mode 100644
index 00000000000..8bc3938df8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers
@@ -0,0 +1 @@
+Link: <https://{{host}}:{{ports[https][0]}}/signed-exchange/resources/sxg/sxg-subresource-script.sxg>;rel=alternate;type="application/signed-exchange;v=b3";anchor="https://127.0.0.1:8444/signed-exchange/resources/sxg-subresource-script.js";
diff --git a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource.tentative.html
new file mode 100644
index 00000000000..8ca12b4cbcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource.tentative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>Subresource signed exchange prefetch.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="../resources/sxg-util.js"></script>
+<body>
+<script>
+promise_test(async (t) => {
+  const iframe_path =  get_host_info().HTTPS_ORIGIN + '/signed-exchange/resources/sxg-subresource-iframe.html';
+  const wait_message = (new Promise((resolve) => {
+    const on_message = (event) => {
+      window.removeEventListener('message', on_message);
+      resolve(event.data);
+    };
+    window.addEventListener('message', on_message);
+  }));
+  withIframe(iframe_path);
+  const message = await wait_message;
+  assert_equals(message, 'from signed exchange');
+}, 'Subresource signed exchange prefetch.');
+</script>
+</body>
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 1ce49069cfd..781eabdbc4d 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -218,7 +218,12 @@ class Actions(object):
                         ``ActionSequence.dict``.
         """
         body = {"actions": [] if actions is None else actions}
-        return self.session.send_session_command("POST", "actions", body)
+        actions = self.session.send_session_command("POST", "actions", body)
+        """WebDriver window should be set to the top level window when wptrunner
+        processes the next event.
+        """
+        self.session.switch_frame(None)
+        return actions
 
     @command
     def release(self):
@@ -308,8 +313,11 @@ class Find(object):
         self.session = session
 
     @command
-    def css(self, selector, all=True):
-        return self._find_element("css selector", selector, all)
+    def css(self, element_selector, frame, all=True):
+        if (frame != "window"):
+            self.session.switch_frame(frame)
+        elements = self._find_element("css selector", element_selector, all)
+        return elements
 
     def _find_element(self, strategy, selector, all):
         route = "elements" if all else "element"
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index b093600b596..23e91a7aa40 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -3,6 +3,7 @@ import platform
 import re
 import shutil
 import stat
+import errno
 import subprocess
 import tempfile
 import urlparse
@@ -27,6 +28,14 @@ def _get_fileversion(binary, logger=None):
         return None
 
 
+def handle_remove_readonly(func, path, exc):
+    excvalue = exc[1]
+    if func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES:
+        os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
+        func(path)
+    else:
+        raise
+
 class Browser(object):
     __metaclass__ = ABCMeta
 
@@ -663,6 +672,7 @@ class EdgeChromium(Browser):
         "Darwin": "macos"
     }.get(uname[0])
     product = "edgechromium"
+    edgedriver_name = "msedgedriver"
     requirements = "requirements_edge_chromium.txt"
 
     def install(self, dest=None, channel=None):
@@ -697,22 +707,40 @@ class EdgeChromium(Browser):
         return find_executable("msedgedriver")
 
     def install_webdriver(self, dest=None, channel=None, browser_binary=None):
-        if self.platform != "win":
-            raise ValueError("Only Windows platform is currently supported")
+        if self.platform != "win" and self.platform != "macos":
+            raise ValueError("Only Windows and Mac platforms are currently supported")
 
         if dest is None:
             dest = os.pwd
 
-        platform = "x64" if uname[4] == "x86_64" else "x86"
-        url = "https://az813057.vo.msecnd.net/webdriver/msedgedriver_%s/msedgedriver.exe" % platform
+        if channel is None:
+            version_url = "https://msedgedriver.azureedge.net/LATEST_DEV"
+        else:
+            version_url = "https://msedgedriver.azureedge.net/LATEST_%s" % channel.upper()
+        version = get(version_url).text.strip()
+
+        if self.platform == "macos":
+            bits = "mac64"
+            edgedriver_path = os.path.join(dest, self.edgedriver_name)
+        else:
+            bits = "win64" if uname[4] == "x86_64" else "win32"
+            edgedriver_path = os.path.join(dest, "%s.exe" % self.edgedriver_name)
+        url = "https://msedgedriver.azureedge.net/%s/edgedriver_%s.zip" % (version, bits)
+
+        # cleanup existing Edge driver files to avoid access_denied errors when unzipping
+        if os.path.isfile(edgedriver_path):
+            # remove read-only attribute
+            os.chmod(edgedriver_path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
+            os.remove(edgedriver_path)
+            driver_notes_path = os.path.join(dest, "Driver_notes")
+            if os.path.isdir(driver_notes_path):
+                shutil.rmtree(driver_notes_path, ignore_errors=False, onerror=handle_remove_readonly)
 
         self.logger.info("Downloading MSEdgeDriver from %s" % url)
-        resp = get(url)
-        installer_path = os.path.join(dest, "msedgedriver.exe")
-        with open(installer_path, "wb") as f:
-            f.write(resp.content)
-
-        return find_executable("msedgedriver", dest)
+        unzip(get(url).raw, dest)
+        if os.path.isfile(edgedriver_path):
+            self.logger.info("Successfully downloaded MSEdgeDriver to %s" % edgedriver_path)
+        return find_executable(self.edgedriver_name, dest)
 
     def version(self, binary=None, webdriver_binary=None):
         if binary is None:
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index fec2afc9a36..282dd29178b 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -338,15 +338,23 @@ class EdgeChromium(BrowserSetup):
     browser_cls = browser.EdgeChromium
 
     def setup_kwargs(self, kwargs):
+        browser_channel = kwargs["browser_channel"]
+        if kwargs["binary"] is None:
+            binary = self.browser.find_binary(channel=browser_channel)
+            if binary:
+                kwargs["binary"] = self.browser.find_binary()
+            else:
+                raise WptrunError("Unable to locate Edge binary")
         if kwargs["webdriver_binary"] is None:
             webdriver_binary = self.browser.find_webdriver()
 
-            if webdriver_binary is None:
+            # Install browser if none are found or if it's found in venv path
+            if webdriver_binary is None or webdriver_binary in self.venv.bin_path:
                 install = self.prompt_install("msedgedriver")
 
                 if install:
                     logger.info("Downloading msedgedriver")
-                    webdriver_binary = self.browser.install_webdriver(dest=self.venv.bin_path)
+                    webdriver_binary = self.browser.install_webdriver(dest=self.venv.bin_path, channel=browser_channel)
             else:
                 logger.info("Using webdriver binary %s" % webdriver_binary)
 
@@ -354,11 +362,9 @@ class EdgeChromium(BrowserSetup):
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
                 raise WptrunError("Unable to locate or install msedgedriver binary")
-        if kwargs["browser_channel"] == "dev":
+        if browser_channel == "dev":
             logger.info("Automatically turning on experimental features for Edge Dev")
             kwargs["binary_args"].append("--enable-experimental-web-platform-features")
-        # HACK(Hexcles): work around https://github.com/web-platform-tests/wpt/issues/17403
-        kwargs["webdriver_args"].append("--disable-build-check")
 
 
 class Edge(BrowserSetup):
diff --git a/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py b/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
index e0f51d561b6..a894c9c68d2 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
@@ -34,6 +34,11 @@ class Virtualenv(object):
     def exists(self):
         return os.path.isdir(self.path)
 
+    @property
+    def broken_link(self):
+        python_link = os.path.join(self.path, ".Python")
+        return os.path.lexists(python_link) and not os.path.exists(python_link)
+
     def create(self):
         if os.path.exists(self.path):
             shutil.rmtree(self.path)
@@ -88,7 +93,7 @@ class Virtualenv(object):
         execfile(path, {"__file__": path})  # noqa: F821
 
     def start(self):
-        if not self.exists:
+        if not self.exists or self.broken_link:
             self.create()
         self.activate()
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index d1c123a3ef3..588e0b2fad6 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -669,11 +669,11 @@ class ActionSequenceAction(object):
                 for action in actionSequence["actions"]:
                     if (action["type"] == "pointerMove" and
                         isinstance(action["origin"], dict)):
-                        action["origin"] = self.get_element(action["origin"]["selector"])
+                        action["origin"] = self.get_element(action["origin"]["selector"], action["frame"]["frame"])
         self.protocol.action_sequence.send_actions({"actions": actions})
 
-    def get_element(self, selector):
-        element = self.protocol.select.element_by_selector(selector)
+    def get_element(self, element_selector, frame):
+        element = self.protocol.select.element_by_selector(element_selector, frame)
         return element
 
 class GenerateTestReportAction(object):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 7ab701879ff..c46571bd544 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -386,6 +386,9 @@ class MarionetteSelectorProtocolPart(SelectorProtocolPart):
     def elements_by_selector(self, selector):
         return self.marionette.find_elements("css selector", selector)
 
+    def elements_by_selector_and_frame(self, element_selector, frame):
+        return self.marionette.find_elements("css selector", element_selector)
+
 
 class MarionetteClickProtocolPart(ClickProtocolPart):
     def setup(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index e7b9f45dc81..9a2d223f649 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -149,6 +149,9 @@ class SeleniumSelectorProtocolPart(SelectorProtocolPart):
     def elements_by_selector(self, selector):
         return self.webdriver.find_elements_by_css_selector(selector)
 
+    def elements_by_selector_and_frame(self, element_selector, frame):
+        return self.webdriver.find_elements_by_css_selector(element_selector)
+
 
 class SeleniumClickProtocolPart(ClickProtocolPart):
     def setup(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 65938a7678b..ce7691c4d56 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -142,6 +142,9 @@ class WebDriverSelectorProtocolPart(SelectorProtocolPart):
     def elements_by_selector(self, selector):
         return self.webdriver.find.css(selector)
 
+    def elements_by_selector_and_frame(self, element_selector, frame):
+        return self.webdriver.find.css(element_selector, frame)
+
 
 class WebDriverClickProtocolPart(ClickProtocolPart):
     def setup(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
index d08b74bfc36..7da59239609 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -235,12 +235,15 @@ class SelectorProtocolPart(ProtocolPart):
 
     name = "select"
 
-    def element_by_selector(self, selector):
-        elements = self.elements_by_selector(selector)
+    def element_by_selector(self, element_selector, frame="window"):
+        elements = self.elements_by_selector_and_frame(element_selector, frame)
+        frame_name = "window"
+        if (frame != "window"):
+            frame_name = frame.id
         if len(elements) == 0:
-            raise ValueError("Selector '%s' matches no elements" % selector)
+            raise ValueError("Selector '%s' in frame '%s' matches no elements" % (element_selector, frame_name))
         elif len(elements) > 1:
-            raise ValueError("Selector '%s' matches multiple elements" % selector)
+            raise ValueError("Selector '%s' in frame '%s' matches multiple elements" % (element_selector, frame_name))
         return elements[0]
 
     @abstractmethod
@@ -251,6 +254,13 @@ class SelectorProtocolPart(ProtocolPart):
         :returns: A list of protocol-specific handles to elements"""
         pass
 
+    @abstractmethod
+    def elements_by_selector_and_frame(self, element_selector, frame):
+        """Select elements matching a CSS selector
+        :param str selector: The CSS selector
+        :returns: A list of protocol-specific handles to elements"""
+        pass
+
 
 class ClickProtocolPart(ProtocolPart):
     """Protocol part for performing trusted clicks"""
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
index 09d7c290867..e23073dece1 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -21,10 +21,26 @@
         }
     });
 
+    const get_frame = function(element, frame) {
+        let foundFrame = frame;
+        let frameDocument = frame == window ? window.document : frame.contentDocument;
+        if (!frameDocument.contains(element)) {
+          foundFrame = null;
+          let frames = document.getElementsByTagName("iframe");
+          for (let i = 0; i < frames.length; i++) {
+            if (get_frame(element, frames[i])) {
+              foundFrame = frames[i];
+              break;
+            }
+          }
+        }
+        return foundFrame;
+    };
+
     const get_selector = function(element) {
         let selector;
 
-        if (element.id && document.getElementById(element.id) === element) {
+        if (element.id) {
             const id = element.id;
 
             selector = "#";
@@ -81,8 +97,16 @@
         for (let actionSequence of actions) {
             if (actionSequence.type == "pointer") {
                 for (let action of actionSequence.actions) {
-                    if (action.type == "pointerMove" && action.origin instanceof Element) {
-                        action.origin = {selector: get_selector(action.origin)};
+                    // The origin of each action can only be an element or a string of a value "viewport" or "pointer".
+                    if (action.type == "pointerMove" && typeof(action.origin) != 'string') {
+                        let frame = get_frame(action.origin, window);
+                        if (frame != null) {
+                            if (frame == window)
+                                action.frame = {frame: "window"};
+                            else
+                                action.frame = {frame: frame};
+                            action.origin = {selector: get_selector(action.origin)};
+                        } 
                     }
                 }
             }
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index 44b5401e4f8..d7b51c5eb27 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -13,6 +13,17 @@ from mozlog import structuredlog, capture
 Stop = object()
 
 
+def release_mozlog_lock():
+    try:
+        from mozlog.structuredlog import StructuredLogger
+        try:
+            StructuredLogger._lock.release()
+        except threading.ThreadError:
+            pass
+    except ImportError:
+        pass
+
+
 class MessageLogger(object):
     def __init__(self, message_func):
         self.send_message = message_func
@@ -138,6 +149,10 @@ def start_runner(runner_command_queue, runner_result_queue,
         logger.critical(traceback.format_exc())
         stop_flag.set()
 
+    # Ensure that when we start this in a new process we have the global lock
+    # in the logging module unlocked
+    release_mozlog_lock()
+
     logger = MessageLogger(send_message)
 
     with capture.CaptureIO(logger, capture_stdio):
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
index 20fb3f776a9..d8d64d54ccc 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
@@ -160,7 +160,7 @@ class TestResponse(TestUsingServer):
     def test_write_raw_none(self):
         @wptserve.handlers.handler
         def handler(request, response):
-            with pytest.raises(ValueError, message="data cannot be None"):
+            with pytest.raises(ValueError):
                 response.writer.write_raw_content(None)
 
         route = ("GET", "/test/test_write_raw_content", handler)
diff --git a/tests/wpt/web-platform-tests/user-timing/buffered-flag.any.js b/tests/wpt/web-platform-tests/user-timing/buffered-flag.any.js
new file mode 100644
index 00000000000..e3e60656317
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/buffered-flag.any.js
@@ -0,0 +1,29 @@
+async_test(t => {
+  // First observer creates second in callback to ensure the entry has been dispatched by the time
+  // the second observer begins observing.
+  new PerformanceObserver(() => {
+    // Second observer requires 'buffered: true' to see an entry.
+    new PerformanceObserver(list => {
+      const entries = list.getEntries();
+      assert_equals(entries.length, 1, 'There should be 1 mark entry.');
+      assert_equals(entries[0].entryType, 'mark');
+      t.done();
+    }).observe({type: 'mark', buffered: true});
+  }).observe({entryTypes: ['mark']});
+  performance.mark('foo');
+}, 'PerformanceObserver with buffered flag sees previous marks');
+
+async_test(t => {
+  // First observer creates second in callback to ensure the entry has been dispatched by the time
+  // the second observer begins observing.
+  new PerformanceObserver(() => {
+    // Second observer requires 'buffered: true' to see an entry.
+    new PerformanceObserver(list => {
+      const entries = list.getEntries();
+      assert_equals(entries.length, 1, 'There should be 1 measure entry.');
+      assert_equals(entries[0].entryType, 'measure');
+      t.done();
+    }).observe({type: 'measure', buffered: true});
+  }).observe({entryTypes: ['measure']});
+  performance.measure('bar');
+}, 'PerformanceObserver with buffered flag sees previous measures');
diff --git a/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html b/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html
new file mode 100644
index 00000000000..c9689fe3348
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>UserTiming L3: the detail property should be serialized-cloned.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(function() {
+    performance.clearMarks();
+    const detail = { randomInfo: 123 }
+    const markEntry = new PerformanceMark("A", { detail });
+    assert_equals(markEntry.detail.randomInfo, detail.randomInfo);
+    assert_not_equals(markEntry.detail, detail);
+  }, "The detail property in the mark constructor should be structured-clone.");
+
+  test(function() {
+    performance.clearMarks();
+    const detail = { randomInfo: 123 }
+    const markEntry = performance.mark("A", { detail });
+    assert_not_equals(markEntry.detail, detail);
+  }, "The detail property in the mark method should be structured-clone.");
+
+  test(function() {
+    performance.clearMarks();
+    const markEntry = performance.mark("A");
+    assert_equals(markEntry.detail, null);
+  }, "When accessing detail from a mark entry and the detail is not provided, just return a null value.");
+
+  test(function() {
+    performance.clearMarks();
+    const detail = { unserializable: Symbol() };
+    assert_throws("DataCloneError", ()=>{
+      new PerformanceMark("A", { detail });
+    }, "Trying to structured-serialize a Symbol.");
+  }, "Mark: Throw an exception when the detail property cannot be structured-serialized.");
+
+  test(function() {
+    performance.clearMeasures();
+    const detail = { randomInfo: 123 }
+    const measureEntry = performance.measure("A", { detail });
+    assert_not_equals(measureEntry.detail, detail);
+  }, "The detail property in the measure method should be structured-clone.");
+
+  test(function() {
+    performance.clearMeasures();
+    const detail = { randomInfo: 123 }
+    const measureEntry = performance.measure("A", { detail });
+    assert_equals(measureEntry.detail, measureEntry.detail);
+  }, "The detail property in the measure method should be the same reference.");
+
+  test(function() {
+    performance.clearMeasures();
+    const measureEntry = performance.measure("A");
+    assert_equals(measureEntry.detail, null);
+  }, "When accessing detail from a measure entry and the detail is not provided, just return a null value.");
+
+  test(function() {
+    performance.clearMeasures();
+    const detail = { unserializable: Symbol() };
+    assert_throws("DataCloneError", ()=>{
+      performance.measure("A", { detail });
+    }, "Trying to structured-serialize a Symbol.");
+  }, "Measure: Throw an exception when the detail property cannot be structured-serialized.");
+
+  test(function() {
+    const bar = { 1: 2 };
+    const detail = { foo: 1, bar };
+    const mark = performance.mark("m", { detail });
+    detail.foo = 2;
+    assert_equals(mark.detail.foo, 1);
+  }, "The detail object is cloned when passed to mark API.");
+</script>