diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 13548a838bea..43fdce65a225 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -3225,6 +3225,22 @@
         "path": "touch-events/single-touch-manual.html",
         "url": "/touch-events/single-touch-manual.html"
       },
+      {
+        "path": "uievents/keyboard/key-101en-us-manual.html",
+        "url": "/uievents/keyboard/key-101en-us-manual.html"
+      },
+      {
+        "path": "uievents/keyboard/key-102fr-fr-manual.html",
+        "url": "/uievents/keyboard/key-102fr-fr-manual.html"
+      },
+      {
+        "path": "uievents/keyboard/key-manual.css",
+        "url": "/uievents/keyboard/key-manual.css"
+      },
+      {
+        "path": "uievents/keyboard/key-manual.js",
+        "url": "/uievents/keyboard/key-manual.js"
+      },
       {
         "path": "uievents/order-of-events/focus-events/focus-manual.html",
         "url": "/uievents/order-of-events/focus-events/focus-manual.html"
@@ -3754,44 +3770,44 @@
         "url": "/compat/webkit-text-fill-color-property-006.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html"
       },
       {
         "path": "html/dom/elements/global-attributes/dir_auto-EN-L.html",
@@ -5163,6 +5179,26 @@
         ],
         "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html"
       },
+      {
+        "path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html",
+        "references": [
+          [
+            "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html"
+      },
+      {
+        "path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html",
+        "references": [
+          [
+            "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html"
+      },
       {
         "path": "html/rendering/replaced-elements/images/space.html",
         "references": [
@@ -11102,104 +11138,52 @@
         "url": "/2dcontext/transformations/2d.transformation.translate.nonfinite.html"
       },
       {
-        "path": "DOMEvents/ClickFakeEvent.nondocument.html",
-        "url": "/DOMEvents/ClickFakeEvent.nondocument.html"
+        "path": "DOM-parsing/createContextualFragment.html",
+        "url": "/DOM-parsing/createContextualFragment.html"
       },
       {
-        "path": "DOMEvents/constructors.html",
-        "url": "/DOMEvents/constructors.html"
+        "path": "DOM-parsing/innerhtml-01.xhtml",
+        "url": "/DOM-parsing/innerhtml-01.xhtml"
       },
       {
-        "path": "DOMEvents/event-phases-order.html",
-        "url": "/DOMEvents/event-phases-order.html"
+        "path": "DOM-parsing/innerhtml-03.xhtml",
+        "url": "/DOM-parsing/innerhtml-03.xhtml"
       },
       {
-        "path": "DOMEvents/init-event-while-dispatching.html",
-        "url": "/DOMEvents/init-event-while-dispatching.html"
+        "path": "DOM-parsing/innerhtml-04.html",
+        "url": "/DOM-parsing/innerhtml-04.html"
       },
       {
-        "path": "DOMEvents/tests/approved/DOM.event.flow.html",
-        "url": "/DOMEvents/tests/approved/DOM.event.flow.html"
+        "path": "DOM-parsing/innerhtml-05.xhtml",
+        "url": "/DOM-parsing/innerhtml-05.xhtml"
       },
       {
-        "path": "DOMEvents/tests/approved/EventListener.eventHandler.html",
-        "url": "/DOMEvents/tests/approved/EventListener.eventHandler.html"
+        "path": "DOM-parsing/innerhtml-06.html",
+        "url": "/DOM-parsing/innerhtml-06.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventObject.after.dispatchEvent.html",
-        "url": "/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html"
+        "path": "DOM-parsing/innerhtml-07.html",
+        "url": "/DOM-parsing/innerhtml-07.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html",
-        "url": "/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html"
+        "path": "DOM-parsing/insert_adjacent_html.html",
+        "url": "/DOM-parsing/insert_adjacent_html.html"
       },
       {
-        "path": "DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html",
-        "url": "/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html"
+        "path": "DOM-parsing/insert_adjacent_html.xhtml",
+        "url": "/DOM-parsing/insert_adjacent_html.xhtml"
       },
       {
-        "path": "DOMEvents/tests/approved/dispatchEvent.click.checkbox.html",
-        "url": "/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html"
+        "path": "DOM-parsing/outerhtml-01.html",
+        "url": "/DOM-parsing/outerhtml-01.html"
       },
       {
-        "path": "DOMEvents/tests/approved/domnodeinserted.html",
-        "url": "/DOMEvents/tests/approved/domnodeinserted.html"
+        "path": "DOM-parsing/outerhtml-02.html",
+        "url": "/DOM-parsing/outerhtml-02.html"
       },
       {
-        "path": "DOMEvents/tests/approved/stopImmediatePropagation.effect.html",
-        "url": "/DOMEvents/tests/approved/stopImmediatePropagation.effect.html"
-      },
-      {
-        "path": "DOMEvents/tests/approved/stopPropagation.deferred.effect.html",
-        "url": "/DOMEvents/tests/approved/stopPropagation.deferred.effect.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html"
-      },
-      {
-        "path": "DOMEvents/throwing-in-listener-and-window-error-event.html",
-        "url": "/DOMEvents/throwing-in-listener-and-window-error-event.html"
-      },
-      {
-        "path": "DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html",
-        "url": "/DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html"
+        "path": "DOM-parsing/xml-serialization.xhtml",
+        "url": "/DOM-parsing/xml-serialization.xhtml"
       },
       {
         "path": "FileAPI/FileReader/Progress_event_bubbles_cancelable.html",
@@ -11577,6 +11561,10 @@
         "path": "IndexedDB/idbcursor_update_index7.htm",
         "url": "/IndexedDB/idbcursor_update_index7.htm"
       },
+      {
+        "path": "IndexedDB/idbcursor_update_index8.htm",
+        "url": "/IndexedDB/idbcursor_update_index8.htm"
+      },
       {
         "path": "IndexedDB/idbcursor_update_objectstore.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore.htm"
@@ -11609,6 +11597,10 @@
         "path": "IndexedDB/idbcursor_update_objectstore8.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore8.htm"
       },
+      {
+        "path": "IndexedDB/idbcursor_update_objectstore9.htm",
+        "url": "/IndexedDB/idbcursor_update_objectstore9.htm"
+      },
       {
         "path": "IndexedDB/idbdatabase_close.htm",
         "url": "/IndexedDB/idbdatabase_close.htm"
@@ -12641,6 +12633,10 @@
         "path": "XMLHttpRequest/open-url-multi-window-5.htm",
         "url": "/XMLHttpRequest/open-url-multi-window-5.htm"
       },
+      {
+        "path": "XMLHttpRequest/open-url-multi-window-6.htm",
+        "url": "/XMLHttpRequest/open-url-multi-window-6.htm"
+      },
       {
         "path": "XMLHttpRequest/open-url-multi-window.htm",
         "url": "/XMLHttpRequest/open-url-multi-window.htm"
@@ -13649,6 +13645,10 @@
         "path": "content-security-policy/generic/generic-0_9.sub.html",
         "url": "/content-security-policy/generic/generic-0_9.sub.html"
       },
+      {
+        "path": "content-security-policy/generic/no-default-src.sub.html",
+        "url": "/content-security-policy/generic/no-default-src.sub.html"
+      },
       {
         "path": "content-security-policy/img-src/img-src-4_1.html",
         "url": "/content-security-policy/img-src/img-src-4_1.html"
@@ -13841,6 +13841,10 @@
         "path": "cssom-view/elementFromPoint.html",
         "url": "/cssom-view/elementFromPoint.html"
       },
+      {
+        "path": "cssom-view/elementScroll.html",
+        "url": "/cssom-view/elementScroll.html"
+      },
       {
         "path": "cssom-view/elementsFromPoint.html",
         "url": "/cssom-view/elementsFromPoint.html"
@@ -13854,224 +13858,224 @@
         "url": "/cssom-view/scrollingElement.html"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-naming.html",
-        "url": "/custom-elements/concepts/custom-elements-type-naming.html"
+        "path": "custom-elements/v0/concepts/custom-elements-type-naming.html",
+        "url": "/custom-elements/v0/concepts/custom-elements-type-naming.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/new-registry-test.html",
-        "url": "/custom-elements/creating-and-passing-registries/new-registry-test.html"
+        "path": "custom-elements/v0/creating-and-passing-registries/new-registry-test.html",
+        "url": "/custom-elements/v0/creating-and-passing-registries/new-registry-test.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/no-registry-test.html",
-        "url": "/custom-elements/creating-and-passing-registries/no-registry-test.html"
+        "path": "custom-elements/v0/creating-and-passing-registries/no-registry-test.html",
+        "url": "/custom-elements/v0/creating-and-passing-registries/no-registry-test.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/share-registry-create-document.html",
-        "url": "/custom-elements/creating-and-passing-registries/share-registry-create-document.html"
+        "path": "custom-elements/v0/creating-and-passing-registries/share-registry-create-document.html",
+        "url": "/custom-elements/v0/creating-and-passing-registries/share-registry-create-document.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/share-registry-import-document.html",
-        "url": "/custom-elements/creating-and-passing-registries/share-registry-import-document.html"
+        "path": "custom-elements/v0/creating-and-passing-registries/share-registry-import-document.html",
+        "url": "/custom-elements/v0/creating-and-passing-registries/share-registry-import-document.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html",
-        "url": "/custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html"
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html",
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/changing-is-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/changing-is-attribute.html"
+        "path": "custom-elements/v0/instantiating/changing-is-attribute.html",
+        "url": "/custom-elements/v0/instantiating/changing-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html"
+        "path": "custom-elements/v0/instantiating/custom-element-constructor-is-attribute.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-constructor-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html"
+        "path": "custom-elements/v0/instantiating/custom-element-constructor-local-name.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-constructor-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html"
+        "path": "custom-elements/v0/instantiating/custom-element-constructor-namespace.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-constructor-namespace.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html"
+        "path": "custom-elements/v0/instantiating/custom-element-constructor-node-document.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-constructor-node-document.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html"
+        "path": "custom-elements/v0/instantiating/custom-element-constructor-prototype.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-constructor-prototype.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-prototype.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-prototype.html"
+        "path": "custom-elements/v0/instantiating/custom-element-prototype.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-prototype.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html"
+        "path": "custom-elements/v0/instantiating/custom-element-type-is-attribute.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-type-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html"
+        "path": "custom-elements/v0/instantiating/custom-element-type-local-name-and-is-attribute.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-type-local-name-and-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-local-name.html",
-        "url": "/custom-elements/instantiating-custom-elements/custom-element-type-local-name.html"
+        "path": "custom-elements/v0/instantiating/custom-element-type-local-name.html",
+        "url": "/custom-elements/v0/instantiating/custom-element-type-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-is-attribute.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-namespace.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-namespace.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-is-a-type.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-is-a-type.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-unresolved.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-unresolved.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-is-a-local-name.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-is-a-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element-ns.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element-ns.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html",
-        "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html"
+        "path": "custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element.html",
+        "url": "/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html",
-        "url": "/custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html"
+        "path": "custom-elements/v0/instantiating/non-configurable-constructor-property.html",
+        "url": "/custom-elements/v0/instantiating/non-configurable-constructor-property.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html",
-        "url": "/custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html"
+        "path": "custom-elements/v0/instantiating/prototype-is-interface-prototype-object.html",
+        "url": "/custom-elements/v0/instantiating/prototype-is-interface-prototype-object.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/unchanged-attribute.html",
-        "url": "/custom-elements/instantiating-custom-elements/unchanged-attribute.html"
+        "path": "custom-elements/v0/instantiating/unchanged-attribute.html",
+        "url": "/custom-elements/v0/instantiating/unchanged-attribute.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-default-namespace.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-default-namespace.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-duplicate-definition.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-duplicate-definition.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-invalid-type.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-invalid-type.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-local-name-lowercased.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-local-name-lowercased.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-name-is-null.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-name-is-null.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-no-interface-for-name.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-no-interface-for-name.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-svg-namespace-name-is-null.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace-name-is-null.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-svg-namespace.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html",
-        "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html"
+        "path": "custom-elements/v0/registering/definition-construction-algorithm-type-name-lowercased.html",
+        "url": "/custom-elements/v0/registering/definition-construction-algorithm-type-name-lowercased.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html",
-        "url": "/custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html"
+        "path": "custom-elements/v0/registering/element-registration-algorithm-no-registry.html",
+        "url": "/custom-elements/v0/registering/element-registration-algorithm-no-registry.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html",
-        "url": "/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html"
+        "path": "custom-elements/v0/registering/extensions-to-document-interface/custom-element-name.html",
+        "url": "/custom-elements/v0/registering/extensions-to-document-interface/custom-element-name.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html",
-        "url": "/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html"
+        "path": "custom-elements/v0/registering/extensions-to-document-interface/custom-element-prototype.html",
+        "url": "/custom-elements/v0/registering/extensions-to-document-interface/custom-element-prototype.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html",
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html"
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html",
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html",
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html"
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html",
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html",
-        "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html"
+        "path": "custom-elements/v0/registering/unresolved-elements-interface-html-element.html",
+        "url": "/custom-elements/v0/registering/unresolved-elements-interface-html-element.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html",
-        "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html"
+        "path": "custom-elements/v0/registering/unresolved-elements-interface-html-unknown-element.html",
+        "url": "/custom-elements/v0/registering/unresolved-elements-interface-html-unknown-element.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html",
-        "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html"
+        "path": "custom-elements/v0/registering/unresolved-elements-interface-svg-element.html",
+        "url": "/custom-elements/v0/registering/unresolved-elements-interface-svg-element.html"
       },
       {
         "path": "dom/collections/HTMLCollection-as-proto-length-get-throws.html",
@@ -14105,6 +14109,10 @@
         "path": "dom/events/Event-constructors.html",
         "url": "/dom/events/Event-constructors.html"
       },
+      {
+        "path": "dom/events/Event-defaultPrevented-after-dispatch.html",
+        "url": "/dom/events/Event-defaultPrevented-after-dispatch.html"
+      },
       {
         "path": "dom/events/Event-defaultPrevented.html",
         "url": "/dom/events/Event-defaultPrevented.html"
@@ -14189,6 +14197,10 @@
         "path": "dom/interfaces.html",
         "url": "/dom/interfaces.html"
       },
+      {
+        "path": "dom/lists/DOMTokenList-coverage-for-attributes.html",
+        "url": "/dom/lists/DOMTokenList-coverage-for-attributes.html"
+      },
       {
         "path": "dom/lists/DOMTokenList-stringifier.html",
         "url": "/dom/lists/DOMTokenList-stringifier.html"
@@ -14541,6 +14553,10 @@
         "path": "dom/nodes/Element-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Element-getElementsByTagNameNS.html"
       },
+      {
+        "path": "dom/nodes/Element-hasAttributes.html",
+        "url": "/dom/nodes/Element-hasAttributes.html"
+      },
       {
         "path": "dom/nodes/Element-insertAdjacentElement.html",
         "url": "/dom/nodes/Element-insertAdjacentElement.html"
@@ -14685,6 +14701,10 @@
         "path": "dom/nodes/Node-isEqualNode.html",
         "url": "/dom/nodes/Node-isEqualNode.html"
       },
+      {
+        "path": "dom/nodes/Node-isSameNode.html",
+        "url": "/dom/nodes/Node-isSameNode.html"
+      },
       {
         "path": "dom/nodes/Node-lookupNamespaceURI.html",
         "url": "/dom/nodes/Node-lookupNamespaceURI.html"
@@ -15177,6 +15197,10 @@
         "path": "encoding/textdecoder-byte-order-marks.html",
         "url": "/encoding/textdecoder-byte-order-marks.html"
       },
+      {
+        "path": "encoding/textdecoder-fatal-single-byte.html",
+        "url": "/encoding/textdecoder-fatal-single-byte.html"
+      },
       {
         "path": "encoding/textdecoder-fatal-streaming.html",
         "url": "/encoding/textdecoder-fatal-streaming.html"
@@ -15769,6 +15793,10 @@
         "path": "fetch/api/request/request-structure.html",
         "url": "/fetch/api/request/request-structure.html"
       },
+      {
+        "path": "fetch/api/response/response-cancel-stream.html",
+        "url": "/fetch/api/response/response-cancel-stream.html"
+      },
       {
         "path": "fetch/api/response/response-clone.html",
         "url": "/fetch/api/response/response-clone.html"
@@ -15777,6 +15805,10 @@
         "path": "fetch/api/response/response-consume-empty.html",
         "url": "/fetch/api/response/response-consume-empty.html"
       },
+      {
+        "path": "fetch/api/response/response-consume-stream.html",
+        "url": "/fetch/api/response/response-consume-stream.html"
+      },
       {
         "path": "fetch/api/response/response-consume.html",
         "url": "/fetch/api/response/response-consume.html"
@@ -15805,6 +15837,26 @@
         "path": "fetch/api/response/response-static-redirect.html",
         "url": "/fetch/api/response/response-static-redirect.html"
       },
+      {
+        "path": "fetch/api/response/response-stream-disturbed-1.html",
+        "url": "/fetch/api/response/response-stream-disturbed-1.html"
+      },
+      {
+        "path": "fetch/api/response/response-stream-disturbed-2.html",
+        "url": "/fetch/api/response/response-stream-disturbed-2.html"
+      },
+      {
+        "path": "fetch/api/response/response-stream-disturbed-3.html",
+        "url": "/fetch/api/response/response-stream-disturbed-3.html"
+      },
+      {
+        "path": "fetch/api/response/response-stream-disturbed-4.html",
+        "url": "/fetch/api/response/response-stream-disturbed-4.html"
+      },
+      {
+        "path": "fetch/api/response/response-stream-disturbed-5.html",
+        "url": "/fetch/api/response/response-stream-disturbed-5.html"
+      },
       {
         "path": "fetch/nosniff/image.html",
         "url": "/fetch/nosniff/image.html"
@@ -16353,6 +16405,10 @@
         "path": "html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html",
         "url": "/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html"
       },
+      {
+        "path": "html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html",
+        "url": "/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html"
+      },
       {
         "path": "html/browsers/history/the-location-interface/assign_after_load.html",
         "url": "/html/browsers/history/the-location-interface/assign_after_load.html"
@@ -16645,6 +16701,10 @@
         "path": "html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html",
         "url": "/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/Document.body.html",
+        "url": "/html/dom/documents/dom-tree-accessors/Document.body.html"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html",
         "url": "/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html"
@@ -16657,14 +16717,6 @@
         "path": "html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.body-getter.html",
-        "url": "/html/dom/documents/dom-tree-accessors/document.body-getter.html"
-      },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.body-setter-01.html",
-        "url": "/html/dom/documents/dom-tree-accessors/document.body-setter-01.html"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html"
@@ -17517,10 +17569,18 @@
         "path": "html/semantics/document-metadata/styling/LinkStyle.html",
         "url": "/html/semantics/document-metadata/styling/LinkStyle.html"
       },
+      {
+        "path": "html/semantics/document-metadata/the-base-element/base_about_blank.html",
+        "url": "/html/semantics/document-metadata/the-base-element/base_about_blank.html"
+      },
       {
         "path": "html/semantics/document-metadata/the-base-element/base_href_empty.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_href_empty.html"
       },
+      {
+        "path": "html/semantics/document-metadata/the-base-element/base_href_invalid.html",
+        "url": "/html/semantics/document-metadata/the-base-element/base_href_invalid.html"
+      },
       {
         "path": "html/semantics/document-metadata/the-base-element/base_href_specified.sub.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html"
@@ -17533,6 +17593,10 @@
         "path": "html/semantics/document-metadata/the-base-element/base_multiple.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_multiple.html"
       },
+      {
+        "path": "html/semantics/document-metadata/the-base-element/base_srcdoc.html",
+        "url": "/html/semantics/document-metadata/the-base-element/base_srcdoc.html"
+      },
       {
         "path": "html/semantics/document-metadata/the-link-element/link-load-event.html",
         "url": "/html/semantics/document-metadata/the-link-element/link-load-event.html"
@@ -18793,6 +18857,10 @@
         "path": "html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html"
       },
+      {
+        "path": "html/semantics/embedded-content/the-iframe-element/iframe-load-event.html",
+        "url": "/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html"
+      },
       {
         "path": "html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm",
         "url": "/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm"
@@ -18969,6 +19037,10 @@
         "path": "html/semantics/forms/form-submission-0/getactionurl.html",
         "url": "/html/semantics/forms/form-submission-0/getactionurl.html"
       },
+      {
+        "path": "html/semantics/forms/form-submission-0/submit-entity-body.html",
+        "url": "/html/semantics/forms/form-submission-0/submit-entity-body.html"
+      },
       {
         "path": "html/semantics/forms/form-submission-0/url-encoded.html",
         "url": "/html/semantics/forms/form-submission-0/url-encoded.html"
@@ -19461,6 +19533,10 @@
         "path": "html/semantics/scripting-1/the-script-element/script-text.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
       },
+      {
+        "path": "html/semantics/scripting-1/the-script-element/scripting-enabled.html",
+        "url": "/html/semantics/scripting-1/the-script-element/scripting-enabled.html"
+      },
       {
         "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html"
@@ -19865,10 +19941,18 @@
         "path": "html/syntax/parsing/the-end.html",
         "url": "/html/syntax/parsing/the-end.html"
       },
+      {
+        "path": "html/syntax/serializing-html-fragments/initial-linefeed-pre.html",
+        "url": "/html/syntax/serializing-html-fragments/initial-linefeed-pre.html"
+      },
       {
         "path": "html/syntax/serializing-html-fragments/outerHTML.html",
         "url": "/html/syntax/serializing-html-fragments/outerHTML.html"
       },
+      {
+        "path": "html/syntax/serializing-html-fragments/serializing.html",
+        "url": "/html/syntax/serializing-html-fragments/serializing.html"
+      },
       {
         "path": "html/syntax/serializing-xml-fragments/outerHTML.html",
         "url": "/html/syntax/serializing-xml-fragments/outerHTML.html"
@@ -20353,6 +20437,10 @@
         "path": "media-source/mediasource-play.html",
         "url": "/media-source/mediasource-play.html"
       },
+      {
+        "path": "media-source/mediasource-preload.html",
+        "url": "/media-source/mediasource-preload.html"
+      },
       {
         "path": "media-source/mediasource-remove.html",
         "url": "/media-source/mediasource-remove.html"
@@ -20421,6 +20509,10 @@
         "path": "mediacapture-streams/MediaDevices-getUserMedia.html",
         "url": "/mediacapture-streams/MediaDevices-getUserMedia.html"
       },
+      {
+        "path": "mediacapture-streams/MediaStream-MediaElement-preload-none.html",
+        "url": "/mediacapture-streams/MediaStream-MediaElement-preload-none.html"
+      },
       {
         "path": "mediacapture-streams/MediaStream-MediaElement-srcObject.html",
         "url": "/mediacapture-streams/MediaStream-MediaElement-srcObject.html"
@@ -22529,6 +22621,30 @@
         "path": "performance-timeline/idlharness.html",
         "url": "/performance-timeline/idlharness.html"
       },
+      {
+        "path": "performance-timeline/po-disconnect.html",
+        "url": "/performance-timeline/po-disconnect.html"
+      },
+      {
+        "path": "performance-timeline/po-getentries.html",
+        "url": "/performance-timeline/po-getentries.html"
+      },
+      {
+        "path": "performance-timeline/po-mark-measure.html",
+        "url": "/performance-timeline/po-mark-measure.html"
+      },
+      {
+        "path": "performance-timeline/po-navigation.html",
+        "url": "/performance-timeline/po-navigation.html"
+      },
+      {
+        "path": "performance-timeline/po-observe.html",
+        "url": "/performance-timeline/po-observe.html"
+      },
+      {
+        "path": "performance-timeline/po-resource.html",
+        "url": "/performance-timeline/po-resource.html"
+      },
       {
         "path": "pointerevents/pointerevent_constructor.html",
         "url": "/pointerevents/pointerevent_constructor.html"
@@ -27853,6 +27969,14 @@
         "path": "screen-orientation/orientation-reading.html",
         "url": "/screen-orientation/orientation-reading.html"
       },
+      {
+        "path": "secure-contexts/basic-popup-and-iframe-tests.html",
+        "url": "/secure-contexts/basic-popup-and-iframe-tests.html"
+      },
+      {
+        "path": "secure-contexts/basic-popup-and-iframe-tests.https.html",
+        "url": "/secure-contexts/basic-popup-and-iframe-tests.https.html"
+      },
       {
         "path": "selection/Document-open.html",
         "url": "/selection/Document-open.html"
@@ -28093,6 +28217,10 @@
         "path": "service-workers/service-worker/multiple-update.https.html",
         "url": "/service-workers/service-worker/multiple-update.https.html"
       },
+      {
+        "path": "service-workers/service-worker/navigate-window.https.html",
+        "url": "/service-workers/service-worker/navigate-window.https.html"
+      },
       {
         "path": "service-workers/service-worker/navigation-redirect.https.html",
         "url": "/service-workers/service-worker/navigation-redirect.https.html"
@@ -28249,6 +28377,10 @@
         "path": "service-workers/service-worker/update-after-oneday.https.html",
         "url": "/service-workers/service-worker/update-after-oneday.https.html"
       },
+      {
+        "path": "service-workers/service-worker/update-recovery.https.html",
+        "url": "/service-workers/service-worker/update-recovery.https.html"
+      },
       {
         "path": "service-workers/service-worker/update.https.html",
         "url": "/service-workers/service-worker/update.https.html"
@@ -28269,6 +28401,18 @@
         "path": "service-workers/service-worker/xhr.https.html",
         "url": "/service-workers/service-worker/xhr.https.html"
       },
+      {
+        "path": "shadow-dom/Document-prototype-adoptNode.html",
+        "url": "/shadow-dom/Document-prototype-adoptNode.html"
+      },
+      {
+        "path": "shadow-dom/Document-prototype-currentScript.html",
+        "url": "/shadow-dom/Document-prototype-currentScript.html"
+      },
+      {
+        "path": "shadow-dom/Document-prototype-importNode.html",
+        "url": "/shadow-dom/Document-prototype-importNode.html"
+      },
       {
         "path": "shadow-dom/Element-interface-attachShadow.html",
         "url": "/shadow-dom/Element-interface-attachShadow.html"
@@ -28277,13 +28421,17 @@
         "path": "shadow-dom/Element-interface-shadowRoot-attribute.html",
         "url": "/shadow-dom/Element-interface-shadowRoot-attribute.html"
       },
+      {
+        "path": "shadow-dom/Node-prototype-cloneNode.html",
+        "url": "/shadow-dom/Node-prototype-cloneNode.html"
+      },
       {
         "path": "shadow-dom/ShadowRoot-interface.html",
         "url": "/shadow-dom/ShadowRoot-interface.html"
       },
       {
-        "path": "shadow-dom/styles/shadow-cascade-order.html",
-        "url": "/shadow-dom/styles/shadow-cascade-order.html"
+        "path": "shadow-dom/leaktests/html-collection.html",
+        "url": "/shadow-dom/leaktests/html-collection.html"
       },
       {
         "path": "shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html",
@@ -28625,6 +28773,10 @@
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
       },
+      {
+        "path": "touch-events/historical.html",
+        "url": "/touch-events/historical.html"
+      },
       {
         "path": "touch-events/touch-globaleventhandler-interface.html",
         "url": "/touch-events/touch-globaleventhandler-interface.html"
@@ -28661,6 +28813,66 @@
         "path": "typedarrays/constructors.html",
         "url": "/typedarrays/constructors.html"
       },
+      {
+        "path": "uievents/ClickFakeEvent.nondocument.html",
+        "url": "/uievents/ClickFakeEvent.nondocument.html"
+      },
+      {
+        "path": "uievents/constructors/constructors.html",
+        "url": "/uievents/constructors/constructors.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/DOM.event.flow.html",
+        "url": "/uievents/legacy-domevents-tests/approved/DOM.event.flow.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/EventListener.eventHandler.html",
+        "url": "/uievents/legacy-domevents-tests/approved/EventListener.eventHandler.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/EventObject.multiple.dispatchEvent.html",
+        "url": "/uievents/legacy-domevents-tests/approved/EventObject.multiple.dispatchEvent.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html",
+        "url": "/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html",
+        "url": "/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/domnodeinserted.html",
+        "url": "/uievents/legacy-domevents-tests/approved/domnodeinserted.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html",
+        "url": "/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html",
+        "url": "/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html"
+      },
+      {
+        "path": "uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html",
+        "url": "/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html"
+      },
+      {
+        "path": "uievents/order-of-events/event-phases-order.html",
+        "url": "/uievents/order-of-events/event-phases-order.html"
+      },
+      {
+        "path": "uievents/order-of-events/init-event-while-dispatching.html",
+        "url": "/uievents/order-of-events/init-event-while-dispatching.html"
+      },
+      {
+        "path": "uievents/throwing-in-listener-and-window-error-event.html",
+        "url": "/uievents/throwing-in-listener-and-window-error-event.html"
+      },
+      {
+        "path": "uievents/throwing-in-listener-when-all-have-not-run-yet.html",
+        "url": "/uievents/throwing-in-listener-when-all-have-not-run-yet.html"
+      },
       {
         "path": "url/a-element-xhtml.xhtml",
         "url": "/url/a-element-xhtml.xhtml"
@@ -28897,6 +29109,14 @@
         "path": "web-animations/animation/reverse.html",
         "url": "/web-animations/animation/reverse.html"
       },
+      {
+        "path": "web-animations/animation/startTime.html",
+        "url": "/web-animations/animation/startTime.html"
+      },
+      {
+        "path": "web-animations/document/getAnimations.html",
+        "url": "/web-animations/document/getAnimations.html"
+      },
       {
         "path": "web-animations/keyframe-effect/constructor.html",
         "url": "/web-animations/keyframe-effect/constructor.html"
@@ -28905,14 +29125,6 @@
         "path": "web-animations/keyframe-effect/effect-easing.html",
         "url": "/web-animations/keyframe-effect/effect-easing.html"
       },
-      {
-        "path": "web-animations/keyframe-effect/getComputedTiming-currentIteration.html",
-        "url": "/web-animations/keyframe-effect/getComputedTiming-currentIteration.html"
-      },
-      {
-        "path": "web-animations/keyframe-effect/getComputedTiming-progress.html",
-        "url": "/web-animations/keyframe-effect/getComputedTiming-progress.html"
-      },
       {
         "path": "web-animations/keyframe-effect/getComputedTiming.html",
         "url": "/web-animations/keyframe-effect/getComputedTiming.html"
@@ -28921,6 +29133,30 @@
         "path": "web-animations/keyframe-effect/keyframe-handling.html",
         "url": "/web-animations/keyframe-effect/keyframe-handling.html"
       },
+      {
+        "path": "web-animations/keyframe-effect/setFrames.html",
+        "url": "/web-animations/keyframe-effect/setFrames.html"
+      },
+      {
+        "path": "web-animations/keyframe-effect/setTarget.html",
+        "url": "/web-animations/keyframe-effect/setTarget.html"
+      },
+      {
+        "path": "web-animations/timing-model/animation-effects/active-time.html",
+        "url": "/web-animations/timing-model/animation-effects/active-time.html"
+      },
+      {
+        "path": "web-animations/timing-model/animation-effects/current-iteration.html",
+        "url": "/web-animations/timing-model/animation-effects/current-iteration.html"
+      },
+      {
+        "path": "web-animations/timing-model/animation-effects/simple-iteration-progress.html",
+        "url": "/web-animations/timing-model/animation-effects/simple-iteration-progress.html"
+      },
+      {
+        "path": "web-animations/timing-model/animations/set-the-animation-start-time.html",
+        "url": "/web-animations/timing-model/animations/set-the-animation-start-time.html"
+      },
       {
         "path": "webaudio/the-audio-api/the-audiobuffer-interface/idl-test.html",
         "url": "/webaudio/the-audio-api/the-audiobuffer-interface/idl-test.html"
@@ -32397,10 +32633,18 @@
         "path": "websockets/binary/001.html",
         "url": "/websockets/binary/001.html"
       },
+      {
+        "path": "websockets/binary/001.html",
+        "url": "/websockets/binary/001.html?wss"
+      },
       {
         "path": "websockets/binary/005.html",
         "url": "/websockets/binary/005.html"
       },
+      {
+        "path": "websockets/binary/005.html",
+        "url": "/websockets/binary/005.html?wss"
+      },
       {
         "path": "websockets/binaryType-wrong-value.htm",
         "url": "/websockets/binaryType-wrong-value.htm"
@@ -32409,14 +32653,26 @@
         "path": "websockets/closing-handshake/002.html",
         "url": "/websockets/closing-handshake/002.html"
       },
+      {
+        "path": "websockets/closing-handshake/002.html",
+        "url": "/websockets/closing-handshake/002.html?wss"
+      },
       {
         "path": "websockets/closing-handshake/003.html",
         "url": "/websockets/closing-handshake/003.html"
       },
+      {
+        "path": "websockets/closing-handshake/003.html",
+        "url": "/websockets/closing-handshake/003.html?wss"
+      },
       {
         "path": "websockets/closing-handshake/004.html",
         "url": "/websockets/closing-handshake/004.html"
       },
+      {
+        "path": "websockets/closing-handshake/004.html",
+        "url": "/websockets/closing-handshake/004.html?wss"
+      },
       {
         "path": "websockets/constructor.html",
         "url": "/websockets/constructor.html"
@@ -32425,94 +32681,186 @@
         "path": "websockets/constructor/001.html",
         "url": "/websockets/constructor/001.html"
       },
+      {
+        "path": "websockets/constructor/001.html",
+        "url": "/websockets/constructor/001.html?wss"
+      },
       {
         "path": "websockets/constructor/002.html",
         "url": "/websockets/constructor/002.html"
       },
+      {
+        "path": "websockets/constructor/002.html",
+        "url": "/websockets/constructor/002.html?wss"
+      },
       {
         "path": "websockets/constructor/004.html",
         "url": "/websockets/constructor/004.html"
       },
+      {
+        "path": "websockets/constructor/004.html",
+        "url": "/websockets/constructor/004.html?wss"
+      },
       {
         "path": "websockets/constructor/005.html",
         "url": "/websockets/constructor/005.html"
       },
+      {
+        "path": "websockets/constructor/005.html",
+        "url": "/websockets/constructor/005.html?wss"
+      },
       {
         "path": "websockets/constructor/006.html",
         "url": "/websockets/constructor/006.html"
       },
+      {
+        "path": "websockets/constructor/006.html",
+        "url": "/websockets/constructor/006.html?wss"
+      },
       {
         "path": "websockets/constructor/007.html",
         "url": "/websockets/constructor/007.html"
       },
+      {
+        "path": "websockets/constructor/007.html",
+        "url": "/websockets/constructor/007.html?wss"
+      },
       {
         "path": "websockets/constructor/008.html",
         "url": "/websockets/constructor/008.html"
       },
+      {
+        "path": "websockets/constructor/008.html",
+        "url": "/websockets/constructor/008.html?wss"
+      },
       {
         "path": "websockets/constructor/009.html",
         "url": "/websockets/constructor/009.html"
       },
+      {
+        "path": "websockets/constructor/009.html",
+        "url": "/websockets/constructor/009.html?wss"
+      },
       {
         "path": "websockets/constructor/010.html",
         "url": "/websockets/constructor/010.html"
       },
+      {
+        "path": "websockets/constructor/010.html",
+        "url": "/websockets/constructor/010.html?wss"
+      },
       {
         "path": "websockets/constructor/011.html",
         "url": "/websockets/constructor/011.html"
       },
+      {
+        "path": "websockets/constructor/011.html",
+        "url": "/websockets/constructor/011.html?wss"
+      },
       {
         "path": "websockets/constructor/012.html",
         "url": "/websockets/constructor/012.html"
       },
+      {
+        "path": "websockets/constructor/012.html",
+        "url": "/websockets/constructor/012.html?wss"
+      },
       {
         "path": "websockets/constructor/016.html",
         "url": "/websockets/constructor/016.html"
       },
+      {
+        "path": "websockets/constructor/016.html",
+        "url": "/websockets/constructor/016.html?wss"
+      },
       {
         "path": "websockets/constructor/017.html",
         "url": "/websockets/constructor/017.html"
       },
+      {
+        "path": "websockets/constructor/017.html",
+        "url": "/websockets/constructor/017.html?wss"
+      },
       {
         "path": "websockets/constructor/018.html",
         "url": "/websockets/constructor/018.html"
       },
+      {
+        "path": "websockets/constructor/018.html",
+        "url": "/websockets/constructor/018.html?wss"
+      },
       {
         "path": "websockets/constructor/019.html",
         "url": "/websockets/constructor/019.html"
       },
+      {
+        "path": "websockets/constructor/019.html",
+        "url": "/websockets/constructor/019.html?wss"
+      },
       {
         "path": "websockets/constructor/020.html",
         "url": "/websockets/constructor/020.html"
       },
+      {
+        "path": "websockets/constructor/020.html",
+        "url": "/websockets/constructor/020.html?wss"
+      },
       {
         "path": "websockets/constructor/021.html",
         "url": "/websockets/constructor/021.html"
       },
+      {
+        "path": "websockets/constructor/021.html",
+        "url": "/websockets/constructor/021.html?wss"
+      },
       {
         "path": "websockets/constructor/022.html",
         "url": "/websockets/constructor/022.html"
       },
+      {
+        "path": "websockets/constructor/022.html",
+        "url": "/websockets/constructor/022.html?wss"
+      },
       {
         "path": "websockets/cookies/001.html",
         "url": "/websockets/cookies/001.html"
       },
+      {
+        "path": "websockets/cookies/001.html",
+        "url": "/websockets/cookies/001.html?wss"
+      },
       {
         "path": "websockets/cookies/002.html",
         "url": "/websockets/cookies/002.html"
       },
+      {
+        "path": "websockets/cookies/002.html",
+        "url": "/websockets/cookies/002.html?wss"
+      },
       {
         "path": "websockets/cookies/003.html",
         "url": "/websockets/cookies/003.html"
       },
+      {
+        "path": "websockets/cookies/003.html",
+        "url": "/websockets/cookies/003.html?wss"
+      },
       {
         "path": "websockets/cookies/004.html",
         "url": "/websockets/cookies/004.html"
       },
+      {
+        "path": "websockets/cookies/004.html",
+        "url": "/websockets/cookies/004.html?wss"
+      },
       {
         "path": "websockets/cookies/006.html",
         "url": "/websockets/cookies/006.html"
       },
+      {
+        "path": "websockets/cookies/006.html",
+        "url": "/websockets/cookies/006.html?wss"
+      },
       {
         "path": "websockets/eventhandlers.html",
         "url": "/websockets/eventhandlers.html"
@@ -32521,6 +32869,10 @@
         "path": "websockets/interfaces/CloseEvent/clean-close.html",
         "url": "/websockets/interfaces/CloseEvent/clean-close.html"
       },
+      {
+        "path": "websockets/interfaces/CloseEvent/clean-close.html",
+        "url": "/websockets/interfaces/CloseEvent/clean-close.html?wss"
+      },
       {
         "path": "websockets/interfaces/CloseEvent/constructor.html",
         "url": "/websockets/interfaces/CloseEvent/constructor.html"
@@ -32533,278 +32885,554 @@
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-basic.html",
         "url": "/websockets/interfaces/WebSocket/close/close-basic.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-basic.html",
+        "url": "/websockets/interfaces/WebSocket/close/close-basic.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-multiple.html",
         "url": "/websockets/interfaces/WebSocket/close/close-multiple.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-multiple.html",
+        "url": "/websockets/interfaces/WebSocket/close/close-multiple.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-nested.html",
         "url": "/websockets/interfaces/WebSocket/close/close-nested.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-nested.html",
+        "url": "/websockets/interfaces/WebSocket/close/close-nested.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-replace.html",
         "url": "/websockets/interfaces/WebSocket/close/close-replace.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-replace.html",
+        "url": "/websockets/interfaces/WebSocket/close/close-replace.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-return.html",
         "url": "/websockets/interfaces/WebSocket/close/close-return.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-return.html",
+        "url": "/websockets/interfaces/WebSocket/close/close-return.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/001.html",
         "url": "/websockets/interfaces/WebSocket/constants/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/001.html",
+        "url": "/websockets/interfaces/WebSocket/constants/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/002.html",
         "url": "/websockets/interfaces/WebSocket/constants/002.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/002.html",
+        "url": "/websockets/interfaces/WebSocket/constants/002.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/003.html",
         "url": "/websockets/interfaces/WebSocket/constants/003.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/003.html",
+        "url": "/websockets/interfaces/WebSocket/constants/003.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/004.html",
         "url": "/websockets/interfaces/WebSocket/constants/004.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/004.html",
+        "url": "/websockets/interfaces/WebSocket/constants/004.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/005.html",
         "url": "/websockets/interfaces/WebSocket/constants/005.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/005.html",
+        "url": "/websockets/interfaces/WebSocket/constants/005.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/constants/006.html",
         "url": "/websockets/interfaces/WebSocket/constants/006.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/constants/006.html",
+        "url": "/websockets/interfaces/WebSocket/constants/006.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/001.html",
         "url": "/websockets/interfaces/WebSocket/events/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/001.html",
+        "url": "/websockets/interfaces/WebSocket/events/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/002.html",
         "url": "/websockets/interfaces/WebSocket/events/002.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/002.html",
+        "url": "/websockets/interfaces/WebSocket/events/002.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/003.html",
         "url": "/websockets/interfaces/WebSocket/events/003.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/003.html",
+        "url": "/websockets/interfaces/WebSocket/events/003.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/004.html",
         "url": "/websockets/interfaces/WebSocket/events/004.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/004.html",
+        "url": "/websockets/interfaces/WebSocket/events/004.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/006.html",
         "url": "/websockets/interfaces/WebSocket/events/006.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/006.html",
+        "url": "/websockets/interfaces/WebSocket/events/006.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/007.html",
         "url": "/websockets/interfaces/WebSocket/events/007.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/007.html",
+        "url": "/websockets/interfaces/WebSocket/events/007.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/008.html",
         "url": "/websockets/interfaces/WebSocket/events/008.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/008.html",
+        "url": "/websockets/interfaces/WebSocket/events/008.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/009.html",
         "url": "/websockets/interfaces/WebSocket/events/009.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/009.html",
+        "url": "/websockets/interfaces/WebSocket/events/009.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/010.html",
         "url": "/websockets/interfaces/WebSocket/events/010.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/010.html",
+        "url": "/websockets/interfaces/WebSocket/events/010.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/011.html",
         "url": "/websockets/interfaces/WebSocket/events/011.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/011.html",
+        "url": "/websockets/interfaces/WebSocket/events/011.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/012.html",
         "url": "/websockets/interfaces/WebSocket/events/012.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/012.html",
+        "url": "/websockets/interfaces/WebSocket/events/012.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/013.html",
         "url": "/websockets/interfaces/WebSocket/events/013.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/013.html",
+        "url": "/websockets/interfaces/WebSocket/events/013.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/014.html",
         "url": "/websockets/interfaces/WebSocket/events/014.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/014.html",
+        "url": "/websockets/interfaces/WebSocket/events/014.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/015.html",
         "url": "/websockets/interfaces/WebSocket/events/015.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/015.html",
+        "url": "/websockets/interfaces/WebSocket/events/015.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/016.html",
         "url": "/websockets/interfaces/WebSocket/events/016.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/016.html",
+        "url": "/websockets/interfaces/WebSocket/events/016.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/017.html",
         "url": "/websockets/interfaces/WebSocket/events/017.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/017.html",
+        "url": "/websockets/interfaces/WebSocket/events/017.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/018.html",
         "url": "/websockets/interfaces/WebSocket/events/018.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/018.html",
+        "url": "/websockets/interfaces/WebSocket/events/018.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/019.html",
         "url": "/websockets/interfaces/WebSocket/events/019.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/019.html",
+        "url": "/websockets/interfaces/WebSocket/events/019.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/events/020.html",
         "url": "/websockets/interfaces/WebSocket/events/020.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/events/020.html",
+        "url": "/websockets/interfaces/WebSocket/events/020.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/extensions/001.html",
         "url": "/websockets/interfaces/WebSocket/extensions/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/extensions/001.html",
+        "url": "/websockets/interfaces/WebSocket/extensions/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/protocol/protocol-initial.html",
         "url": "/websockets/interfaces/WebSocket/protocol/protocol-initial.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/protocol/protocol-initial.html",
+        "url": "/websockets/interfaces/WebSocket/protocol/protocol-initial.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/001.html",
         "url": "/websockets/interfaces/WebSocket/readyState/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/001.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/002.html",
         "url": "/websockets/interfaces/WebSocket/readyState/002.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/002.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/002.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/003.html",
         "url": "/websockets/interfaces/WebSocket/readyState/003.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/003.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/003.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/004.html",
         "url": "/websockets/interfaces/WebSocket/readyState/004.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/004.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/004.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/005.html",
         "url": "/websockets/interfaces/WebSocket/readyState/005.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/005.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/005.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/006.html",
         "url": "/websockets/interfaces/WebSocket/readyState/006.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/006.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/006.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/007.html",
         "url": "/websockets/interfaces/WebSocket/readyState/007.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/007.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/007.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/readyState/008.html",
         "url": "/websockets/interfaces/WebSocket/readyState/008.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/readyState/008.html",
+        "url": "/websockets/interfaces/WebSocket/readyState/008.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/001.html",
         "url": "/websockets/interfaces/WebSocket/send/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/001.html",
+        "url": "/websockets/interfaces/WebSocket/send/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/002.html",
         "url": "/websockets/interfaces/WebSocket/send/002.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/002.html",
+        "url": "/websockets/interfaces/WebSocket/send/002.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/003.html",
         "url": "/websockets/interfaces/WebSocket/send/003.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/003.html",
+        "url": "/websockets/interfaces/WebSocket/send/003.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/004.html",
         "url": "/websockets/interfaces/WebSocket/send/004.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/004.html",
+        "url": "/websockets/interfaces/WebSocket/send/004.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/005.html",
         "url": "/websockets/interfaces/WebSocket/send/005.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/005.html",
+        "url": "/websockets/interfaces/WebSocket/send/005.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/006.html",
         "url": "/websockets/interfaces/WebSocket/send/006.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/006.html",
+        "url": "/websockets/interfaces/WebSocket/send/006.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/007.html",
         "url": "/websockets/interfaces/WebSocket/send/007.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/007.html",
+        "url": "/websockets/interfaces/WebSocket/send/007.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/008.html",
         "url": "/websockets/interfaces/WebSocket/send/008.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/008.html",
+        "url": "/websockets/interfaces/WebSocket/send/008.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/009.html",
         "url": "/websockets/interfaces/WebSocket/send/009.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/009.html",
+        "url": "/websockets/interfaces/WebSocket/send/009.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/010.html",
         "url": "/websockets/interfaces/WebSocket/send/010.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/010.html",
+        "url": "/websockets/interfaces/WebSocket/send/010.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/011.html",
         "url": "/websockets/interfaces/WebSocket/send/011.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/011.html",
+        "url": "/websockets/interfaces/WebSocket/send/011.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/send/012.html",
         "url": "/websockets/interfaces/WebSocket/send/012.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/send/012.html",
+        "url": "/websockets/interfaces/WebSocket/send/012.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/001.html",
         "url": "/websockets/interfaces/WebSocket/url/001.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/001.html",
+        "url": "/websockets/interfaces/WebSocket/url/001.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/002.html",
         "url": "/websockets/interfaces/WebSocket/url/002.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/002.html",
+        "url": "/websockets/interfaces/WebSocket/url/002.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/003.html",
         "url": "/websockets/interfaces/WebSocket/url/003.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/003.html",
+        "url": "/websockets/interfaces/WebSocket/url/003.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/004.html",
         "url": "/websockets/interfaces/WebSocket/url/004.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/004.html",
+        "url": "/websockets/interfaces/WebSocket/url/004.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/005.html",
         "url": "/websockets/interfaces/WebSocket/url/005.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/005.html",
+        "url": "/websockets/interfaces/WebSocket/url/005.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/006.html",
         "url": "/websockets/interfaces/WebSocket/url/006.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/006.html",
+        "url": "/websockets/interfaces/WebSocket/url/006.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/url/resolve.html",
         "url": "/websockets/interfaces/WebSocket/url/resolve.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/url/resolve.html",
+        "url": "/websockets/interfaces/WebSocket/url/resolve.html?wss"
+      },
       {
         "path": "websockets/opening-handshake/001.html",
         "url": "/websockets/opening-handshake/001.html"
       },
+      {
+        "path": "websockets/opening-handshake/001.html",
+        "url": "/websockets/opening-handshake/001.html?wss"
+      },
       {
         "path": "websockets/opening-handshake/003-sets-origin.worker.js",
         "url": "/websockets/opening-handshake/003-sets-origin.worker"
@@ -32813,22 +33441,42 @@
         "path": "websockets/opening-handshake/003.html",
         "url": "/websockets/opening-handshake/003.html"
       },
+      {
+        "path": "websockets/opening-handshake/003.html",
+        "url": "/websockets/opening-handshake/003.html?wss"
+      },
       {
         "path": "websockets/opening-handshake/005.html",
         "url": "/websockets/opening-handshake/005.html"
       },
+      {
+        "path": "websockets/opening-handshake/005.html",
+        "url": "/websockets/opening-handshake/005.html?wss"
+      },
       {
         "path": "websockets/security/001.html",
         "url": "/websockets/security/001.html"
       },
+      {
+        "path": "websockets/security/001.html",
+        "url": "/websockets/security/001.html?wss"
+      },
       {
         "path": "websockets/security/002.html",
         "url": "/websockets/security/002.html"
       },
+      {
+        "path": "websockets/security/002.html",
+        "url": "/websockets/security/002.html?wss"
+      },
       {
         "path": "websockets/unload-a-document/001.html",
         "url": "/websockets/unload-a-document/001.html"
       },
+      {
+        "path": "websockets/unload-a-document/001.html",
+        "url": "/websockets/unload-a-document/001.html?wss"
+      },
       {
         "path": "websockets/unload-a-document/003.html",
         "url": "/websockets/unload-a-document/003.html"
@@ -33321,6 +33969,10 @@
         "path": "workers/constructors/Worker/unresolvable-url.html",
         "url": "/workers/constructors/Worker/unresolvable-url.html"
       },
+      {
+        "path": "workers/constructors/Worker/use-base-url.html",
+        "url": "/workers/constructors/Worker/use-base-url.html"
+      },
       {
         "path": "workers/interfaces.worker.js",
         "url": "/workers/interfaces.worker"
@@ -33838,19 +34490,19 @@
         "url": "/cors/status-async.htm"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html",
+        "path": "custom-elements/v0/concepts/custom-elements-type-allowed-chars-first-char.html",
         "timeout": "long",
-        "url": "/custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html"
+        "url": "/custom-elements/v0/concepts/custom-elements-type-allowed-chars-first-char.html"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-allowed-chars.html",
+        "path": "custom-elements/v0/concepts/custom-elements-type-allowed-chars.html",
         "timeout": "long",
-        "url": "/custom-elements/concepts/custom-elements-type-allowed-chars.html"
+        "url": "/custom-elements/v0/concepts/custom-elements-type-allowed-chars.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
+        "path": "custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
         "timeout": "long",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
+        "url": "/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
       },
       {
         "path": "dom/nodes/Document-characterSet-normalization.html",
@@ -35117,61 +35769,121 @@
         "timeout": "long",
         "url": "/websockets/binary/002.html"
       },
+      {
+        "path": "websockets/binary/002.html",
+        "timeout": "long",
+        "url": "/websockets/binary/002.html?wss"
+      },
       {
         "path": "websockets/binary/004.html",
         "timeout": "long",
         "url": "/websockets/binary/004.html"
       },
+      {
+        "path": "websockets/binary/004.html",
+        "timeout": "long",
+        "url": "/websockets/binary/004.html?wss"
+      },
       {
         "path": "websockets/constructor/013.html",
         "timeout": "long",
         "url": "/websockets/constructor/013.html"
       },
+      {
+        "path": "websockets/constructor/013.html",
+        "timeout": "long",
+        "url": "/websockets/constructor/013.html?wss"
+      },
       {
         "path": "websockets/constructor/014.html",
         "timeout": "long",
         "url": "/websockets/constructor/014.html"
       },
+      {
+        "path": "websockets/constructor/014.html",
+        "timeout": "long",
+        "url": "/websockets/constructor/014.html?wss"
+      },
       {
         "path": "websockets/cookies/005.html",
         "timeout": "long",
         "url": "/websockets/cookies/005.html"
       },
+      {
+        "path": "websockets/cookies/005.html",
+        "timeout": "long",
+        "url": "/websockets/cookies/005.html?wss"
+      },
       {
         "path": "websockets/cookies/007.html",
         "timeout": "long",
         "url": "/websockets/cookies/007.html"
       },
+      {
+        "path": "websockets/cookies/007.html",
+        "timeout": "long",
+        "url": "/websockets/cookies/007.html?wss"
+      },
       {
         "path": "websockets/extended-payload-length.html",
         "timeout": "long",
         "url": "/websockets/extended-payload-length.html"
       },
+      {
+        "path": "websockets/extended-payload-length.html",
+        "timeout": "long",
+        "url": "/websockets/extended-payload-length.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html",
         "timeout": "long",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html",
+        "timeout": "long",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html?wss"
+      },
       {
         "path": "websockets/interfaces/WebSocket/close/close-connecting.html",
         "timeout": "long",
         "url": "/websockets/interfaces/WebSocket/close/close-connecting.html"
       },
+      {
+        "path": "websockets/interfaces/WebSocket/close/close-connecting.html",
+        "timeout": "long",
+        "url": "/websockets/interfaces/WebSocket/close/close-connecting.html?wss"
+      },
       {
         "path": "websockets/keeping-connection-open/001.html",
         "timeout": "long",
         "url": "/websockets/keeping-connection-open/001.html"
       },
+      {
+        "path": "websockets/keeping-connection-open/001.html",
+        "timeout": "long",
+        "url": "/websockets/keeping-connection-open/001.html?wss"
+      },
       {
         "path": "websockets/opening-handshake/002.html",
         "timeout": "long",
         "url": "/websockets/opening-handshake/002.html"
       },
+      {
+        "path": "websockets/opening-handshake/002.html",
+        "timeout": "long",
+        "url": "/websockets/opening-handshake/002.html?wss"
+      },
       {
         "path": "websockets/unload-a-document/002.html",
         "timeout": "long",
         "url": "/websockets/unload-a-document/002.html"
       },
+      {
+        "path": "websockets/unload-a-document/002.html",
+        "timeout": "long",
+        "url": "/websockets/unload-a-document/002.html?wss"
+      },
       {
         "path": "websockets/unload-a-document/004.html",
         "timeout": "long",
@@ -35182,6 +35894,11 @@
         "timeout": "long",
         "url": "/websockets/unload-a-document/005.html"
       },
+      {
+        "path": "websockets/unload-a-document/005.html",
+        "timeout": "long",
+        "url": "/websockets/unload-a-document/005.html?wss"
+      },
       {
         "path": "webstorage/event_basic.html",
         "timeout": "long",
@@ -35213,142 +35930,28 @@
         "url": "/webstorage/storage_session_setitem_quotaexceedederr.html"
       }
     ],
-    "wdspec": []
+    "wdspec": [
+      {
+        "path": "webdriver/navigation.py",
+        "url": "/webdriver/navigation.py"
+      }
+    ]
   },
   "local_changes": {
     "deleted": [
       "web-animations/keyframe-effect/getComputedTiming-currentIteration.html",
-      "web-animations/keyframe-effect/getComputedTiming-progress.html"
+      "web-animations/keyframe-effect/getComputedTiming-progress.html",
+      "web-animations/keyframe-effect/setFrames.html"
     ],
     "deleted_reftests": {},
     "items": {
       "testharness": {
-        "DOM-parsing/createContextualFragment.html": [
-          {
-            "path": "DOM-parsing/createContextualFragment.html",
-            "url": "/DOM-parsing/createContextualFragment.html"
-          }
-        ],
-        "DOM-parsing/innerhtml-01.xhtml": [
-          {
-            "path": "DOM-parsing/innerhtml-01.xhtml",
-            "url": "/DOM-parsing/innerhtml-01.xhtml"
-          }
-        ],
-        "DOM-parsing/innerhtml-03.xhtml": [
-          {
-            "path": "DOM-parsing/innerhtml-03.xhtml",
-            "url": "/DOM-parsing/innerhtml-03.xhtml"
-          }
-        ],
-        "DOM-parsing/innerhtml-04.html": [
-          {
-            "path": "DOM-parsing/innerhtml-04.html",
-            "url": "/DOM-parsing/innerhtml-04.html"
-          }
-        ],
-        "DOM-parsing/innerhtml-05.xhtml": [
-          {
-            "path": "DOM-parsing/innerhtml-05.xhtml",
-            "url": "/DOM-parsing/innerhtml-05.xhtml"
-          }
-        ],
-        "DOM-parsing/innerhtml-06.html": [
-          {
-            "path": "DOM-parsing/innerhtml-06.html",
-            "url": "/DOM-parsing/innerhtml-06.html"
-          }
-        ],
-        "DOM-parsing/innerhtml-07.html": [
-          {
-            "path": "DOM-parsing/innerhtml-07.html",
-            "url": "/DOM-parsing/innerhtml-07.html"
-          }
-        ],
-        "DOM-parsing/insert_adjacent_html.html": [
-          {
-            "path": "DOM-parsing/insert_adjacent_html.html",
-            "url": "/DOM-parsing/insert_adjacent_html.html"
-          }
-        ],
-        "DOM-parsing/insert_adjacent_html.xhtml": [
-          {
-            "path": "DOM-parsing/insert_adjacent_html.xhtml",
-            "url": "/DOM-parsing/insert_adjacent_html.xhtml"
-          }
-        ],
-        "DOM-parsing/outerhtml-01.html": [
-          {
-            "path": "DOM-parsing/outerhtml-01.html",
-            "url": "/DOM-parsing/outerhtml-01.html"
-          }
-        ],
-        "DOM-parsing/outerhtml-02.html": [
-          {
-            "path": "DOM-parsing/outerhtml-02.html",
-            "url": "/DOM-parsing/outerhtml-02.html"
-          }
-        ],
-        "DOM-parsing/xml-serialization.xhtml": [
-          {
-            "path": "DOM-parsing/xml-serialization.xhtml",
-            "url": "/DOM-parsing/xml-serialization.xhtml"
-          }
-        ],
-        "IndexedDB/idbcursor_update_index8.htm": [
-          {
-            "path": "IndexedDB/idbcursor_update_index8.htm",
-            "url": "/IndexedDB/idbcursor_update_index8.htm"
-          }
-        ],
-        "IndexedDB/idbcursor_update_objectstore9.htm": [
-          {
-            "path": "IndexedDB/idbcursor_update_objectstore9.htm",
-            "url": "/IndexedDB/idbcursor_update_objectstore9.htm"
-          }
-        ],
-        "XMLHttpRequest/open-url-multi-window-6.htm": [
-          {
-            "path": "XMLHttpRequest/open-url-multi-window-6.htm",
-            "url": "/XMLHttpRequest/open-url-multi-window-6.htm"
-          }
-        ],
         "html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html": [
           {
             "path": "html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html",
             "url": "/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html"
           }
         ],
-        "html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html": [
-          {
-            "path": "html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html",
-            "url": "/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html"
-          }
-        ],
-        "html/semantics/document-metadata/the-base-element/base_about_blank.html": [
-          {
-            "path": "html/semantics/document-metadata/the-base-element/base_about_blank.html",
-            "url": "/html/semantics/document-metadata/the-base-element/base_about_blank.html"
-          }
-        ],
-        "html/semantics/document-metadata/the-base-element/base_href_invalid.html": [
-          {
-            "path": "html/semantics/document-metadata/the-base-element/base_href_invalid.html",
-            "url": "/html/semantics/document-metadata/the-base-element/base_href_invalid.html"
-          }
-        ],
-        "html/semantics/document-metadata/the-base-element/base_srcdoc.html": [
-          {
-            "path": "html/semantics/document-metadata/the-base-element/base_srcdoc.html",
-            "url": "/html/semantics/document-metadata/the-base-element/base_srcdoc.html"
-          }
-        ],
-        "html/semantics/embedded-content/the-iframe-element/iframe-load-event.html": [
-          {
-            "path": "html/semantics/embedded-content/the-iframe-element/iframe-load-event.html",
-            "url": "/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html"
-          }
-        ],
         "html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html": [
           {
             "path": "html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html",
@@ -35996,52 +36599,52 @@
         "url": "/compat/webkit-text-fill-color-property-006.html"
       }
     ],
-    "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html": [
+    "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html": [
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html"
       }
     ],
-    "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html": [
+    "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html": [
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html"
       }
     ],
-    "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html": [
+    "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html": [
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html"
       }
     ],
-    "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html": [
+    "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html": [
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html",
+        "path": "custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html",
         "references": [
           [
-            "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
+            "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
             "=="
           ]
         ],
-        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html"
+        "url": "/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html"
       }
     ],
     "html/dom/elements/global-attributes/dir_auto-EN-L-ref.html": [
@@ -38228,6 +38831,30 @@
         "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html"
       }
     ],
+    "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html": [
+      {
+        "path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html",
+        "references": [
+          [
+            "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html"
+      }
+    ],
+    "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html": [
+      {
+        "path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html",
+        "references": [
+          [
+            "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html"
+      }
+    ],
     "html/rendering/replaced-elements/images/space.html": [
       {
         "path": "html/rendering/replaced-elements/images/space.html",
@@ -41745,7 +42372,7 @@
       }
     ]
   },
-  "rev": "26663baa852c0b42b91e7e72d3aa940e43371571",
+  "rev": "55905788bebbdfacb49c94e579e93c19531e0199",
   "url_base": "/",
   "version": 3
 }
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index e3a59c2dd1f9..9150087f2434 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-601a47cb4b0c94cfdd961dc9c0448861004462a2
\ No newline at end of file
+a7be89195297e42f273679bcd2bbfb1518320ce1
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/DOM.event.flow.html b/testing/web-platform/tests/DOMEvents/tests/approved/DOM.event.flow.html
deleted file mode 100644
index c4d1fcfc0212..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/DOM.event.flow.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Event dispatch and DOM event flow </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";    
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent"); 
-    var TBODY = document.getElementById("table-body");
-    var TABLE = document.getElementById("table");
-    var BODY = document.body;
-    var HTML = document.documentElement;                
-    var CurrentTargets = [window, document, HTML, BODY, TABLE, TBODY, PARENT, TARGET];
-    var ExpectResult = CurrentTargets.concat([TARGET, PARENT, TBODY, TABLE, BODY, HTML, document, window]);
-    var ActualResult = [];
-    var ExpectPhases = [1,1,1,1,1,1,1,2,2,3,3,3,3,3,3,3,];
-    var ActualPhases = [];
-    
-    var description = "Test Description: Dispatch an event in a DOM tree using the DOM event flow.";
-    
-    test(function()
-    {
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].addEventListener(EVENT, TestEvent, true);
-            CurrentTargets[i].addEventListener(EVENT, TestEvent, false);
-        }
-        
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);               
-        TARGET.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult, "ActualResult");
-        assert_array_equals(ActualPhases, ExpectPhases, "ActualPhases");
-        
-    }, description);
-         
-    function TestEvent(evt)
-    {
-        ActualResult.push(evt.currentTarget);         
-        ActualPhases.push(evt.eventPhase);          
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/EventListener.eventHandler.html b/testing/web-platform/tests/DOMEvents/tests/approved/EventListener.eventHandler.html
deleted file mode 100644
index 992ff1cc9735..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/EventListener.eventHandler.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> EventLister member: handleEvent() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var TestResult = false;
-
-    var description = "Test Description: " + 
-                      "handleEvent - This method shall be called whenever an event occurs of the event type for " +
-                      "which the EventListener interface was registered.";
-    
-    var EventListener = {};
-    EventListener.handleEvent = function(evt) 
-    {
-        if ((EVENT == evt.type) && (TARGET == evt.target) && (this === EventListener))
-        {
-            TestResult = true;    
-        }
-        else
-        {
-            TestResult = false;
-        }
-    }
-
-    test(function()
-    {
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-        
-        TARGET.addEventListener(EVENT, EventListener, true);
-        TARGET.dispatchEvent(evt);
-        TARGET.removeEventListener(EVENT, EventListener, true);
-
-        assert_true(TestResult);
-
-    }, description);
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html b/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html
deleted file mode 100644
index d8ab8d4f26a5..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Event.defaultPrevented is reset after dipatchEvent() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-   
-<input id="target" type="hidden" value=""/>
-        
-<script>
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PreState;
-    var PosState;
-    
-    var description = "Test Description: " + 
-                      "As the final step of the event dispatch, the implementation must reset the event " +
-                      "object's default-action-prevention state. ";
-
-    test(function()
-    {         
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-        
-        TARGET.addEventListener(EVENT, TestEvent, true);
-        TARGET.dispatchEvent(evt);
-        
-        PosState = evt.defaultPrevented;
-
-        assert_array_equals([evt.target, PreState, PosState], [TARGET, true, false]);
-
-    }, description);
-    
-    function TestEvent(evt) 
-    {
-        evt.preventDefault();
-        PreState = evt.defaultPrevented;
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html b/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html
deleted file mode 100644
index e8555bd78b98..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Multiple dispatchEvent() and stopPropagation() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<div id="parent" style="display: none">          
-    <input id="target" type="hidden" value=""/>
-</div>
-        
-<script>
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent");
-    var ExpectResult = [TARGET, PARENT, PARENT, document, window];
-    var ActualResult = [];
-    
-    var description = "Test Description: " + 
-                      "An event object may be properly dispatched multiple times while also allowing to prevent the event objects " +
-                      "propagation prior to the event dispatch.";
-
-    test(function()
-    {         
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-        
-        TARGET.addEventListener(EVENT, TestEvent, false);
-        PARENT.addEventListener(EVENT, TestEvent, false);
-        document.addEventListener(EVENT, TestEvent, false);
-        window.addEventListener(EVENT, TestEvent, false);
-        
-        TARGET.dispatchEvent(evt);
-        PARENT.dispatchEvent(evt);
-        document.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult);
-
-    }, description);
-    
-    function TestEvent(evt)
-    {
-        ActualResult.push(evt.currentTarget);
-        
-        if (PARENT == evt.currentTarget)
-        {
-            evt.stopPropagation();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html b/testing/web-platform/tests/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
deleted file mode 100644
index 329bc04c871c..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> ProcessingInstruction.data and DOMCharacterDataModified event </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<iframe id="helper" style="display: none"></iframe>
-        
-<script>
-    var description = "Test Description: " + 
-                      "DOMCharacterDataModified event fires after ProcessingInstruction.data have been modified, " +
-                      "but the node itself has not been inserted or deleted. The proximal event target of this " +
-                      "event shall be the ProcessingInstruction node.";
-    
-    var t = async_test(description);
-    
-    var HELPER = document.getElementById("helper");
-    
-    HELPER.onload = t.step_func(function()
-    {
-        assert_true(HELPER.contentWindow.TestResult);
-        t.done();
-    });
-    
-    HELPER.src = "./support/ProcessingInstruction.DOMCharacterDataModified.xml";
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html b/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html
deleted file mode 100644
index 4a2af9d19290..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> MouseEvent: Default action and synthetic click event </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<div style="display: none">
-    <input type="checkbox" id="target">
-    <button id="button"> Click Here </button>
-</div>
-
-<script>
-    setup({explicit_done:true});
-    var EVENT = "click";
-    var TARGET = document.getElementById("target");
-    var BUTTON = document.getElementById("button");
-    var state;
-
-    var description = "Test Description: " + 
-                      "MouseEvent: Default action is performed when a synthetic click event is dispatched on a checkbox element";
-    
-    BUTTON.addEventListener(EVENT, TestEvent, true);
-    TARGET.addEventListener(EVENT, TestEvent, true);
-    
-    window.onload = function()
-    {
-        state = TARGET.checked;
-        BUTTON.click();
-    }
-    
-    function TestEvent(evt)
-    {
-        if (BUTTON == evt.target)
-        {
-            var e;
-            test(function()
-            {
-                BUTTON.removeEventListener(EVENT, TestEvent, true);
-                
-                e = document.createEvent("MouseEvent");
-                e.initMouseEvent(EVENT,  /* type */
-                                 false,  /* bubbles */
-                                 true,   /* cancelable */
-                                 window, /* view */
-                                 1,      /* detail */
-                                 0,      /* screenX */
-                                 0,      /* screenY */
-                                 0,      /* clientX */
-                                 0,      /* clientY */
-                                 false,  /* ctrlKey */
-                                 false,  /* altKey */
-                                 false,  /* shiftKey */
-                                 false,  /* metaKey */
-                                 0,      /* button */
-                                 null    /* relatedTarget */);
-                                 
-                assert_array_equals([TARGET.checked, e.type, e.bubbles], [state, EVENT, false]);
-                                   
-            }, "Checkbox state is unchanged before the synthetic click event is dispatched");
-            
-            TARGET.dispatchEvent(e);
-        }
-        else if (TARGET == evt.target)
-        {
-            test(function()
-            {
-                assert_array_equals([TARGET.checked, evt.type, evt.bubbles], [!state, EVENT, false]);
-                
-            }, description);
-            
-            done();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/domnodeinserted.html b/testing/web-platform/tests/DOMEvents/tests/approved/domnodeinserted.html
deleted file mode 100644
index 934a7eaaf7cb..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/domnodeinserted.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<title>MutationEvent: DOMNodeInserted Event Type</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id=log></div>
-
-<div id="target" style="display: none"></div>
-
-<script>
-var EVENT = "DOMNodeInserted";
-var TARGET;
-var NODE;
-
-var t = async_test("Test Description: DOMNodeInserted event fires when a node has been added as a child of another node.");
-
-TARGET = document.getElementById("target");
-
-TARGET.addEventListener(EVENT, t.step_func(function(evt)
-{
-    assert_equals(evt.type, EVENT);
-    t.done();
-}), true);
-                    
-NODE = document.createElement("INPUT");
-TARGET.appendChild(NODE);
-</script>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/stopImmediatePropagation.effect.html b/testing/web-platform/tests/DOMEvents/tests/approved/stopImmediatePropagation.effect.html
deleted file mode 100644
index 99facb969d4e..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/stopImmediatePropagation.effect.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Event.stopImmediatePropagation() immediate effect </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";    
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent"); 
-    var TBODY = document.getElementById("table-body");
-    var TABLE = document.getElementById("table");
-    var BODY = document.body;
-    var HTML = document.documentElement;                
-    var CurrentTargets = [window, document, HTML, BODY, TABLE, TBODY, PARENT, TARGET];
-    var ExpectResult = [window, window, document, document, HTML, HTML, BODY, BODY, TABLE];
-    var ActualResult = [];
-    var ExpectListeners = [0,1,0,1,0,1,0,1,0];
-    var ActualListeners = [];
-
-    var description = "Test Description: " + 
-                      "stopImmediatePropagation() prevents other event listeners from being triggered and, unlike " + 
-                      "Event.stopPropagation(), its effect must be immediate. Once it has been called, further calls " + 
-                      "to this method have no additional effect.";
-
-    test(function()
-    {
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].addEventListener(EVENT, function(e){TestEvent(e, 0)}, true);
-            CurrentTargets[i].addEventListener(EVENT, function(e){TestEvent(e, 1)}, true);
-        }
-       
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);            
-        TARGET.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult, "ActualResult");
-        assert_array_equals(ActualListeners, ExpectListeners, "ActualListeners");
-        
-    }, description);
-         
-    function TestEvent(evt, i)
-    {
-        ActualResult.push(evt.currentTarget);         
-        ActualListeners.push(i);
-        if ((1 == evt.eventPhase) && (TABLE == evt.currentTarget) && (0 == i))
-        {
-            evt.stopImmediatePropagation();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/stopPropagation.deferred.effect.html b/testing/web-platform/tests/DOMEvents/tests/approved/stopPropagation.deferred.effect.html
deleted file mode 100644
index 658722006489..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/approved/stopPropagation.deferred.effect.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Event.stopPropagation() deferred effect </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";    
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent"); 
-    var TBODY = document.getElementById("table-body");
-    var TABLE = document.getElementById("table");
-    var BODY = document.body;
-    var HTML = document.documentElement;                
-    var CurrentTargets = [window, document, HTML, BODY, TABLE, TBODY, PARENT, TARGET];
-    var ExpectResult = [window, window, document, document, HTML, HTML, BODY, BODY, TABLE, TABLE];
-    var ActualResult = [];
-    var ExpectListeners = [0,1,0,1,0,1,0,1,0,1];
-    var ActualListeners = [];
-
-    var description = "Test Description: " + 
-                      "stopPropagation() prevents other event listeners from being triggered but its effect must be " +
-                      "deferred until all event listeners attached on the Event.currentTarget have been triggered.";
-
-    test(function()
-    {
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].addEventListener(EVENT, function(e){TestEvent(e, 0)}, true);
-            CurrentTargets[i].addEventListener(EVENT, function(e){TestEvent(e, 1)}, true);
-        }
-       
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);            
-        TARGET.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult, "ActualResult");
-        assert_array_equals(ActualListeners, ExpectListeners, "ActualListeners");
-        
-    }, description);
-         
-    function TestEvent(evt, i)
-    {
-        ActualResult.push(evt.currentTarget);         
-        ActualListeners.push(i);
-        if ((1 == evt.eventPhase) && (TABLE == evt.currentTarget) && (0 == i))
-        {
-            evt.stopPropagation();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html b/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html
deleted file mode 100644
index a2e44c9c8cf7..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> Event.defaultPrevented is reset after dipatchEvent() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<input id="target" type="hidden" value=""/>
-
-<script>
-
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PreState;
-    var PosState;
-
-    var description = "Test Description: " +
-                      "As the final step of the event dispatch, the implementation must reset the event " +
-                      "object's default-action-prevention state. ";
-
-    test(function()
-    {
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-
-        TARGET.addEventListener(EVENT, TestEvent, true);
-        TARGET.dispatchEvent(evt);
-
-        PosState = evt.defaultPrevented;
-
-        assert_array_equals([evt.target, PreState, PosState], [TARGET, true, false]);
-
-    }, description);
-
-    function TestEvent(evt)
-    {
-        evt.preventDefault();
-        PreState = evt.defaultPrevented;
-    }
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/style01.css b/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/style01.css
deleted file mode 100644
index 205e5bd7f592..000000000000
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/style01.css
+++ /dev/null
@@ -1,3 +0,0 @@
-BODY {
-	PADDING-BOTTOM: 0px; BACKGROUND-COLOR: #eef0eb; MARGIN: 0px; PADDING-LEFT: 0px; PADDING-RIGHT: 0px; PADDING-TOP: 0px
-}
diff --git a/testing/web-platform/tests/FileAPI/blob/Blob-constructor.html b/testing/web-platform/tests/FileAPI/blob/Blob-constructor.html
index 799091d55ac1..9c2b0a138c9f 100644
--- a/testing/web-platform/tests/FileAPI/blob/Blob-constructor.html
+++ b/testing/web-platform/tests/FileAPI/blob/Blob-constructor.html
@@ -23,22 +23,28 @@ test(function() {
   assert_equals(String(blob), '[object Blob]');
   assert_equals(blob.size, 0);
   assert_equals(blob.type, "");
-}, "no-argument Blob constructor");
+}, "Blob constructor with no arguments");
 test(function() {
   assert_throws(new TypeError(), function() { var blob = Blob(); });
-}, "no-argument Blob constructor without 'new'");
+}, "Blob constructor with no arguments, without 'new'");
 test(function() {
   var blob = new Blob;
   assert_true(blob instanceof Blob);
   assert_equals(blob.size, 0);
   assert_equals(blob.type, "");
-}, "no-argument Blob constructor without brackets");
+}, "Blob constructor without brackets");
+test(function() {
+  var blob = new Blob(undefined);
+  assert_true(blob instanceof Blob);
+  assert_equals(String(blob), '[object Blob]');
+  assert_equals(blob.size, 0);
+  assert_equals(blob.type, "");
+}, "Blob constructor with undefined as first argument");
 
 // blobParts argument (WebIDL).
 test(function() {
   var args = [
     null,
-    undefined,
     true,
     false,
     0,
diff --git a/testing/web-platform/tests/README.md b/testing/web-platform/tests/README.md
index d207a8bd15cf..32d6503c773c 100644
--- a/testing/web-platform/tests/README.md
+++ b/testing/web-platform/tests/README.md
@@ -27,12 +27,13 @@ To get the tests running, you need to set up the test domains in your
 following entries are required:
 
 ```
-127.0.0.1	web-platform.test
-127.0.0.1	www.web-platform.test
-127.0.0.1	www1.web-platform.test
-127.0.0.1	www2.web-platform.test
-127.0.0.1	xn--n8j6ds53lwwkrqhv28a.web-platform.test
-127.0.0.1	xn--lve-6lad.web-platform.test
+127.0.0.1   web-platform.test
+127.0.0.1   www.web-platform.test
+127.0.0.1   www1.web-platform.test
+127.0.0.1   www2.web-platform.test
+127.0.0.1   xn--n8j6ds53lwwkrqhv28a.web-platform.test
+127.0.0.1   xn--lve-6lad.web-platform.test
+0.0.0.0     nonexistent-origin.web-platform.test
 ```
 
 Because web-platform-tests uses git submodules, you must ensure that
diff --git a/testing/web-platform/tests/XMLHttpRequest/OWNERS b/testing/web-platform/tests/XMLHttpRequest/OWNERS
index 27421d921a01..5962543a2fe6 100644
--- a/testing/web-platform/tests/XMLHttpRequest/OWNERS
+++ b/testing/web-platform/tests/XMLHttpRequest/OWNERS
@@ -4,7 +4,6 @@
 @caitp
 @Manishearth
 @plehegar
-@foolip
 @jungkees
 @ibelem
 @mathiasbynens
diff --git a/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm b/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm
index e57b8c42a9cd..86e55f33a006 100644
--- a/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm
+++ b/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm
@@ -30,18 +30,29 @@
           assert_throws("SyntaxError", function() { client.setRequestHeader(name, 'x-value') })
         }, "setRequestHeader should throw with header name " + format_value(invalid_headers[i]) + ".")
       }
+      function try_byte_string(name) {
+        test(function() {
+          var client = new XMLHttpRequest()
+          client.open("GET", "...")
+          assert_throws(new TypeError(), function() { client.setRequestHeader(name, 'x-value') })
+        }, "setRequestHeader should throw with header name " + format_value(invalid_byte_strings[i]) + ".")
+      }
       var invalid_headers = ["(", ")", "<", ">", "@", ",", ";", ":", "\\",
                              "\"", "/", "[", "]", "?", "=", "{", "}", " ",
                              /* HT already tested in the loop below */
-                             "\u007f", "ﾃｽﾄ", "", "t\rt", "t\nt", "t: t", "t:t",
+                             "\u007f", "", "t\rt", "t\nt", "t: t", "t:t",
                              "t<t", "t t", " tt", ":tt", "\ttt", "\vtt", "t\0t",
-                             "t\"t", "t,t", "t;t", "()[]{}", "a?B", "X-ﾃｽﾄ", "a=B"]
+                             "t\"t", "t,t", "t;t", "()[]{}", "a?B", "a=B"]
+      var invalid_byte_strings = ["ﾃｽﾄ", "X-ﾃｽﾄ"]
       for (var i = 0; i < 32; ++i) {
         invalid_headers.push(String.fromCharCode(i))
       }
       for (var i = 0; i < invalid_headers.length; ++i) {
         try_name(invalid_headers[i])
       }
+      for (var i = 0; i < invalid_byte_strings.length; ++i) {
+        try_byte_string(invalid_byte_strings[i])
+      }
 
     </script>
   </body>
diff --git a/testing/web-platform/tests/common/OWNERS b/testing/web-platform/tests/common/OWNERS
index 1da08cf49835..d755a17cbadc 100644
--- a/testing/web-platform/tests/common/OWNERS
+++ b/testing/web-platform/tests/common/OWNERS
@@ -1,4 +1,3 @@
 @zqzhang
-@foolip
 @dontcallmedom
 @deniak
diff --git a/testing/web-platform/tests/common/form-submission.py b/testing/web-platform/tests/common/form-submission.py
new file mode 100644
index 000000000000..eb9c654444bd
--- /dev/null
+++ b/testing/web-platform/tests/common/form-submission.py
@@ -0,0 +1,12 @@
+def main(request, response):
+    if request.headers.get('Content-Type') == 'application/x-www-form-urlencoded':
+        if request.body == 'foo=bara':
+            return 'OK'
+        else:
+            return 'FAIL'
+    else:
+        if request.POST.first('foo') == 'bar':
+            return 'OK'
+        else:
+            return 'FAIL'
+
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
index 57889e5966ce..19cf6811c57d 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
@@ -32,7 +32,7 @@ form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that allowed form actions work correctly. If this test passes, you will see a page indicating a form was POSTed.</p>
+    <p>Tests that allowed form actions work correctly.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
     </body>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
index 33ce163af244..0960a8a02f24 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
@@ -31,7 +31,7 @@ form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that blocking form actions works correctly. If this test passes, a CSP violation will be generated, and will not see a page indicating a form was POSTed.</p>
+    <p>Tests that blocking form actions works correctly.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20&apos;none&apos;"></script>
 
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html
index 2f2804b64bba..a7d3e584b837 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html
@@ -33,7 +33,8 @@ form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that allowed form actions work correctly. If this test passes, you will see a page indicating a form was POSTed.</p>
+    <p>Tests that allowed form actions work correctly
+        with GET and a redirect.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
     </body>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html
index 559e159f0570..0910eb419641 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html
@@ -33,7 +33,8 @@ form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that allowed form actions work correctly. If this test passes, you will see a page indicating a form was POSTed.</p>
+    <p>Tests that disallowed form actions are blocked
+        with GET and redirects.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20&apos;none&apos;
 "></script>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html
index 1d9d5693ac14..e311817eb597 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html
@@ -33,7 +33,7 @@ form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that blocking form redirect works correctly. If this test passes, a CSP violation will be generated, and will not see a page indicating a form was POSTed.</p>
+    <p>Tests that blocking a POST form with a redirect works correctly. If this test passes, a CSP violation will be generated.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20'self'"></script>
 </body>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html
index ac103981c3cf..41618d4ef770 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html
@@ -14,14 +14,14 @@ script-src 'self' 'unsafe-inline' 'none'; connect-src 'self';
 </head>
 
 <body>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'none'">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self'">
     <p>This test checks that Content Security Policy delivered via a meta element is not enforced if the element is outside the document&apos;s head.</p>
     <script>
-        alert_assert("PASS (1/1)");
-
+        var aa = "PASS (1/1)";
     </script>
+    <script src="metaHelper.js"></script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    <script src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/metaHelper.js b/testing/web-platform/tests/content-security-policy/blink-contrib-2/metaHelper.js
new file mode 100644
index 000000000000..9191a39c73be
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/metaHelper.js
@@ -0,0 +1,5 @@
+if (typeof aa != 'undefined') {
+  alert_assert(aa);
+} else {
+  alert_assert("Failed - allowed inline script blocked by meta policy outside head.");
+}
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html
index 59179c716151..eb60d5d4cffc 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html
@@ -6,7 +6,7 @@
     <title>plugintypes-notype-data</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS: object tag onerror handler fired"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
     <!-- enforcing policy:
 plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';
@@ -15,7 +15,7 @@ plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; conn
 
 <body>
     Given a `plugin-types` directive, plugins have to declare a type explicitly. No declared type, no load. This test passes if there&apos;s a CSP report and &quot;FAIL!&quot; isn&apos;t logged.
-    <object data="data:application/x-webkit-test-netscape" onload="log('FAIL');" onerror="log('PASS');"></object>
+    <object data="data:application/x-webkit-test-netscape" onload="log('FAIL');" onerror="log('PASS: object tag onerror handler fired');"></object>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=plugin-types+application/x-invalid-type"></script>
 </body>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
index 8a064c701727..bd1e0365c2e1 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    </script>
     <!-- enforcing policy:
 script-src 'self' 'nonce-nonceynonce' 'sha256-dWTP4Di8KBjaiXvQ5mRquI9OoBSo921ahYxLfYSiuT8='; connect-src 'self';
 -->
@@ -34,12 +33,9 @@ script-src 'self' 'nonce-nonceynonce' 'sha256-dWTP4Di8KBjaiXvQ5mRquI9OoBSo921ahY
       var scriptContent2 = "window.finish('" + nonMatchingContent + "');";
 
       var script1 = document.createElement('script');
-      script1.innerHTML = scriptContent1;
       var script2 = document.createElement('script');
-      script2.innerHTML = scriptContent2;
 
-      script1.test = async_test("Inline script with hash in CSP");
-      script2.test = async_test("Inline script without hash in CSP");
+      script1.test = async_test("Only matching content runs even with NFC normalization.");
 
       var failure = function() {
         assert_unreached();
@@ -51,16 +47,18 @@ script-src 'self' 'nonce-nonceynonce' 'sha256-dWTP4Di8KBjaiXvQ5mRquI9OoBSo921ahY
             script1.test.done();
           });
         } else {
-          assert_unreached();
+	  script1.test.step(function() {
+            assert_unreached("nonMatchingContent script ran");
+	  });
         }
       }
 
       script1.onerror = failure;
-      script2.onerror = script2.test.step_func(function() {
-        script2.test.done();
-      });
-      document.body.appendChild(script1);
+
       document.body.appendChild(script2);
+      script2.textContent = scriptContent2;
+      document.body.appendChild(script1);
+      script1.textContent = scriptContent1;
     </script>
 
     <p>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html
index 18ad1d4f66c4..4815ca100132 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html
@@ -6,49 +6,16 @@
     <title>scriptnonce-basic-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script nonce='noncynonce'>
-        function log(msg) {
-            test(function() {
-                assert_unreached(msg)
-            });
-        }
-
-    </script>
-    <script nonce='noncynonce'>
-        var t_alert = async_test('Expecting alerts: ["PASS (1/2)","PASS (2/2)"]');
-        var expected_alerts = ["PASS (1/2)", "PASS (2/2)"];
-
-        function alert_assert(msg) {
-            t_alert.step(function() {
-                if (msg.match(/^FAIL/i)) {
-                    assert_unreached(msg);
-                    t_alert.done();
-                }
-                for (var i = 0; i < expected_alerts.length; i++) {
-                    if (expected_alerts[i] == msg) {
-                        assert_true(expected_alerts[i] == msg);
-                        expected_alerts.splice(i, 1);
-                        if (expected_alerts.length == 0) {
-                            t_alert.done();
-                        }
-                        return;
-                    }
-                }
-                assert_unreached('unexpected alert: ' + msg);
-                t_log.done();
-            });
-        }
-
-    </script>
+    <script src='../support/alertAssert.sub.js?alerts=["PASS (closely-quoted nonce)","PASS (nonce w/whitespace)"]'></script>
     <!-- enforcing policy:
 script-src 'self' 'unsafe-inline' 'nonce-noncynonce'; connect-src 'self';
 -->
     <script nonce="noncynonce">
-        alert_assert('PASS (1/2)');
+        alert_assert('PASS (closely-quoted nonce)');
 
     </script>
     <script nonce="   noncynonce    ">
-        alert_assert('PASS (2/2)');
+        alert_assert('PASS (nonce w/whitespace)');
 
     </script>
     <script nonce="noncynonce noncynonce">
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html
index be7ef1a81981..282b1850257d 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html
@@ -34,7 +34,7 @@
 
     </script>
     <!-- enforcing policy:
-style-src 'sha1-eYyYGmKWdhpUewohaXk9o8IaLSw=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self';
+style-src 'sha256-pAKi9r4/WB7fHydbE3F3t8i8602ij2JN8zHJpL2T5BM=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self';
 -->
 </head>
 
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
index 3f0aff7db89a..2b519e85ec24 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: stylehash-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: style-src 'self' 'sha1-eYyYGmKWdhpUewohaXk9o8IaLSw=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: style-src 'self' 'sha256-pAKi9r4/WB7fHydbE3F3t8i8602ij2JN8zHJpL2T5BM=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html
index 0562e0fd5479..2beb00d020c2 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html
@@ -15,16 +15,27 @@ connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe
 
 <body>
     <script>
-        try {
-            var es = navigator.sendBeacon("http://{{host}}:{{ports[http][0]}}/cors/resources/status.py");
-            log("Pass");
-        } catch (e) {
-            log("Fail");
-        }
+ 	if (typeof navigator.sendBeacon != 'function') {
+            t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
+            t_log.phase = t_log.phases.HAS_RESULT;
+            t_log.done();
+        } else {
+	    try {
+       	       var es = navigator.sendBeacon("http://{{host}}:{{ports[http][0]}}/cors/resources/status.py");
+       	       log("Pass");
+       	    } catch (e) {
+       	       log("Fail");
+       	    }
+            var report =  document.createElement("script");
+	    report.src = "../support/checkReport.sub.js?reportExists=false";
+	    report.async = true;
+            report.defer = true;
+	    document.body.appendChild(report);
+
+	}
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
index c459790d88a2..fdde9e760b26 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
@@ -15,16 +15,26 @@ connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe
 
 <body>
     <script>
-        try {
-            var es = navigator.sendBeacon("http://www1.{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/echo-report.php");
-            log("Fail");
-        } catch (e) {
-            log("Pass");
-        }
+       if (typeof navigator.sendBeacon != 'function') {
+            t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
+            t_log.phase = t_log.phases.HAS_RESULT;
+            t_log.done();
+        } else {
+	    try {
+	    var es = navigator.sendBeacon("http://www1.{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/echo-report.php");
+         	log("Fail");
+            } catch (e) {
+            	log("Pass");
+            }
+            var report =  document.createElement("script");
+            report.src = "../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;";
+            report.async = true;
+            report.defer = true;
+            document.body.appendChild(report);
+	}
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html
index b60487bcef5a..3d03100e366b 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html
@@ -18,13 +18,24 @@ connect-src 'self'; script-src 'self' 'unsafe-inline';
     <p>The beacon should not follow the redirect to http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png and send a CSP violation report.</p>
     <p>Verify that a CSP connect-src directive blocks redirects.</p>
     <script>
-        navigator.sendBeacon(
-            "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png",
-            "ping");
+	if (typeof navigator.sendBeacon != 'function') {
+	    var t = async_test();
+            t.set_status(t.NOTRUN, "No navigator.sendBeacon, cannot run test.");
+            t.phase = t.phases.HAS_RESULT;
+            t.done();
+        } else {
+            navigator.sendBeacon(
+                "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png",
+                "ping");
+            var report =  document.createElement("script");
+            report.src = "../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;";
+            report.async = true;
+            report.defer = true;
+            document.body.appendChild(report);
+        }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/resources/worker-importscripts.js b/testing/web-platform/tests/content-security-policy/blink-contrib/resources/worker-importscripts.js
index ca9f2eca48ed..65ec6f44624b 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/resources/worker-importscripts.js
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/resources/worker-importscripts.js
@@ -2,5 +2,5 @@ try {
     importScripts("/content-security-policy/blink-contrib/resources/post-message.js");
     postMessage("importScripts allowed");
 } catch (e) {
-    postMessage("importScripts blocked: " + e);
+    postMessage("importScripts blocked");
 }
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
index 007d66c1fcb1..17da111a84c3 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
@@ -16,6 +16,11 @@ connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe
 
 <body>
     <script>
+    if(typeof SharedWorker != 'function') {
+        t_alert.set_status(t_alert.NOTRUN, "No SharedWorker, cannot run test.");
+        t_alert.phase = t_alert.phases.HAS_RESULT;
+ 	t_alert.done();
+    } else {
         try {
             var worker = new SharedWorker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js');
             worker.port.onmessage = function(event) {
@@ -24,10 +29,15 @@ connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe
         } catch (e) {
             alert_assert(e);
         }
+        var report =  document.createElement("script");
+        report.src = "../support/checkReport.sub.js?reportExists=false";
+        report.async = true;
+        report.defer = true;
+        document.body.appendChild(report);
+    }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
index f049b933632a..63225bf275e5 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
@@ -22,6 +22,11 @@ connect-src *; script-src 'self' 'unsafe-inline';
     should be sent since the worker's policy doesn't specify
     a report-uri.</p>
     <script>
+    if(typeof SharedWorker != 'function') {
+        t_alert.set_status(t_alert.NOTRUN, "No SharedWorker, cannot run test.");
+        t_alert.phase = t_alert.phases.HAS_RESULT;
+        t_alert.done();
+    } else {
         try {
             var worker = new SharedWorker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js');
             worker.port.onmessage = function(event) {
@@ -30,10 +35,16 @@ connect-src *; script-src 'self' 'unsafe-inline';
         } catch (e) {
             alert_assert(e);
         }
+        var report =  document.createElement("script");
+        report.src = "../support/checkReport.sub.js?reportExists=false";
+        report.async = true;
+        report.defer = true;
+        document.body.appendChild(report);
+    }
+
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html
index d3240e385dec..9ec49c03025e 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html
@@ -23,7 +23,7 @@ script-src 'self' 'unsafe-inline' 'unsafe-eval' 'unsafe-inline' 127.0.0.1:8000;
             worker.onmessage = function(event) {
                 result = event.data;
                 test(function() {
-                    assert_equals(result, 'importScripts blocked: NetworkError: Failed to execute \'importScripts\' on \'WorkerGlobalScope\': The script at \'http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/post-message.js\' failed to load.')
+                    assert_equals(result, 'importScripts blocked')
                 });
                 log("TEST COMPLETE");
             };
diff --git a/testing/web-platform/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html b/testing/web-platform/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html
index d8908b17b3dd..8ed6b157a814 100644
--- a/testing/web-platform/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html
@@ -17,6 +17,10 @@ child-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src
     <script>
         try {
             var foo = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/post-message.js');
+	    foo.onerror = function(event) {
+		event.preventDefault();
+		alert_assert("PASS");
+	    }
             foo.onmessage = function(event) {
                 alert_assert("FAIL");
             };
diff --git a/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html b/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html
new file mode 100644
index 000000000000..933986800254
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>no default src doesn't behave exactly like *</title>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]">    </script>
+    <script src='positiveTest.js'></script>
+    <!-- enforcing policy: foobar; report-uri ...
+    -->
+</head>
+<body>
+    <h1>no default src doesn't behave exactly like *</h1>
+    This page has a CSP header but an unknown directive.
+    This should have no impact on an img loaded from a data:
+    uri, or an inline script, although that would be blocked by a default-src policy of *.
+    <br>
+    <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKgAAABACAIAAAABPqsMAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoMCC8h3if5rgAAAB10RVh0Q29tbWVudABDcmVhdGVkIHdpdGggVGhlIEdJTVDvZCVuAAAGD0lEQVR42u2aa0yTVxiA39ILxa4KIkKrVCCIitzrqkAXQiXDSFjQHyZDBRRdtoDzgooao5uaoInID4hRJFC8RBOzxQuKigyYokuDSB0WlaJQlQrITRCwte1+nKVhpbT9aGUue59fb84573dO+uR7v/drS4OfAPkf4oQfAYpHUDyC4hEUj6B4BMUjKB5B8QiKR1A8guIRFI+geATFIygeQfEIikdQPEIVxmd1GsN+w9hBrV7bN9Kn7FHWqmqLHxY3vW2ycIWtS7Yeiz9G4h0VO47eO2rj1p4cz7WhayW+kuCZwdNdpjsznIe0Q53vO1X9qsbOxrr2uprWmrb+Nofn/lvQPqs/W5oVb0KBrCDrVpZGpzE7++iHR8Ezg0ms6FIsPL7Qho+Ali3O3h+zn81gW1n5M82BuVjqqZEpyjyVeMrs1CL+IqN1AAj0CBTNElm9YGFiYc7SHKvmHJ6Lpd7K/cF0YvK5/KV+S3eLd/tP9weAlNAUaYO0qrXKJGtd2DoS6A16J5oTGZG9llnYKDEgcUPEBhI/636WL8uvelHV1t82rB1mM9geHA8fV58QzxAhTxjjE+PAXCz15ku92cLIZXFr1tWEe4UDwLk/z635dc3oWWe6s3q72o3tBgD7qvYdiD0AAH0jfbxc3sjHkfF2LF9dvsx/GQDcbLmZdCHJwkrH5mKpp8CAZiC7IpvEUd5RJrMrFqwg1pU9ykO/H2rpbQEAV7brygUrLVxz8ezFJNh2cxtVc/bkonhq3Ht5jwReX3iNV+elDVIDGKQNUpNxs0x1nkoCZY+S6mHsyUXxE30oGP7R/3tP9Y7ziyNP91J5KQCUNpTqDXoAkPhKBNME412ne6ibBEEzg6iewZ5cFE8NY4XveN8xejw1LJV0cxXPK169ewUAL9+9vP38NgA40ZxSQ1OtlpDCxMI50+ZMrPxMIBfFU4DD5ByOO2zyoRPSwtJIUPyw2DhojNPC0mhg/jU67488AxgAQMgTNv/YfPXbq5miTNEskQvDxep57MnFrt56V890YvK4vFif2D1f7QlwDyCDcafjKl9UkjhmTkx1WjUA9Az38HP5H3Qfxvb5saWx1a3VZjfdsmRL7te5pGAY0Rl0ii7FnbY7l55cqnxRSZ4ajs1F8WbEW8bkXU6aJCXFvEBWsKl80+iVBcsLMr7MAIDT8tOpl8Yt+JGzIw9KDkp8JWYLg7JHmXUr68rTKw7PRfEUxJ98cHJz+Wbjbc1lcdXb1RwmBwCEhcJ6df3oxUKesO67OgAY0g55HfUa0AxYuLJgmmD53OVigTiCFxHgHkCn0UfP7rq960jtkU+Ri+LH/ZGmf6S/pbelVlVb0lDS2Nk4ejY9PL3omyIAkHfIw06EjU2Xfy8P8QwBgI1XNxbVF9l4EheGi5AvTJibkB6R7jHFAwAMYBAXi016C4fn4jPe1p807q6/G+0dbWMTHl0cTfVIbmy3suQy8jZxUXFx1cVVk5OLXb0lAtwDbLROXgWNvaHt9I70ZlzPILFYIJ60XBRvCcvfytm/ntDU9fc/AEjdnrTcTwrjv2udTqOnhKaQOOlC0uWnl8dbmTA3oSy5DABSQlP2/rZXZ9BR2mjejHkksNwbOjwX73jzxPvH87l8AOh433Gt+ZqFlTeUN9SDagDgc/nx/vGUdpnCnJIXn0fiB+0PJi0X73jrdfvso7Mf9R8trNQZdGfkZ3ZG7yRZ15uvG6dUW1W1qtp6db2iS9HW36YeUA9qBrV6LYfJ8XPzk/hKMkWZfm5+ZLHJS4E9udjVT7Crd3dxb89qZ9FZABB0POhx12PL6+fPmN+U0QQAGp2Gn8vvHu6m9JWR2bbcnlws9RNkdchqYl32WmbVOgA8efvk/qv7AMCis5KDkyntpdFpcu7mJP+SPIFz2pOLpd5SnS9pKLExpeRhSeTsSABYH74+X5ZPBgV5gijvqAheRKBHoI+rD4/L47K4TDpzWDv8ZvCNoktR3Vp9vvF8+0D72Avak4ulHsFSj6B4BMUjKB5B8QiKR1A8guIRFI+geATFo3gExSMoHkHxCIpHUDyC4hEUj6B45HPmL9so2ZKs94sNAAAAAElFTkSuQmCC'>
+    <script>
+        var allowedScriptRan = true;
+    </script>
+
+    <div id='log'></div>
+
+    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html.sub.headers
new file mode 100644
index 000000000000..a7337acceb93
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/generic/no-default-src.sub.html.sub.headers
@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: no-default-src={{$id:uuid()}}; Path=/content-security-policy/generic/
+Content-Security-Policy: foobar; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.html
index c93af3b80c19..597ac7f8fa7e 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.html
@@ -52,10 +52,17 @@
         source_test.step(function() {
             source_test.set_status(source_test.FAIL);
         });
+
+        setTimeout(function() { 
+          if(source_test.phase != source_test.phases.COMPLETE) {
+		source_test.step( function () { assert_unreached("Onerror event never fired for track element."); });
+		source_test.done();
+	   }
+        }, 2 * 1000);
     </script>
 
   <script async defer src="../support/checkReport.sub.js?reportField=violated-directive&reportValue=media-src%20%27self%27">
   </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
index f12f8ffc56ff..b83511930416 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
@@ -55,8 +55,8 @@
     </video>
         
     <video id="videoObject2" width="320" height="240" controls
-           onerror="media_error_handler(src_test)"
-           onloadeddata="media_loaded(src_test)"
+           onerror="media_error_handler(src_redir_test)"
+           onloadeddata="media_loaded(src_redir_test)"
            src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
         
   <script async defer src="../support/checkReport.sub.js?reportExists=false">
diff --git a/testing/web-platform/tests/content-security-policy/support/alertAssert.sub.js b/testing/web-platform/tests/content-security-policy/support/alertAssert.sub.js
index 6ca2849ca31b..607d0d4212ca 100644
--- a/testing/web-platform/tests/content-security-policy/support/alertAssert.sub.js
+++ b/testing/web-platform/tests/content-security-policy/support/alertAssert.sub.js
@@ -1,5 +1,9 @@
 // note, this template substitution is XSS, but no way to avoid it in this framework
 var expected_alerts = {{GET[alerts]}};
+var timeout= "{{GET[timeout]}}";
+if (timeout == "") {
+  timeout = 2;
+}
 
 if(expected_alerts.length == 0) {
   function alert_assert(msg) {
@@ -7,7 +11,13 @@ if(expected_alerts.length == 0) {
  }
 } else {
  var t_alert = async_test('Expecting alerts: {{GET[alerts]}}');
- function alert_assert(msg) {
+ setTimeout(function() {
+   if(t_alert.phase != t_alert.phases.COMPLETE) {
+     t_alert.step(function() { assert_unreached('Alert timeout, expected alerts ' + expected_alerts  + ' not fired.') });
+     t_alert.done();
+    }
+ }, timeout * 100); 
+ var alert_assert = function (msg) {
      t_alert.step(function () {
          if(msg && msg instanceof Error) {
              msg = msg.message;
@@ -29,5 +39,5 @@ if(expected_alerts.length == 0) {
          assert_unreached('unexpected alert: ' + msg);
          t_log.done();
      });
- }
+ }.bind(this);
 }
diff --git a/testing/web-platform/tests/content-security-policy/support/logTest.sub.js b/testing/web-platform/tests/content-security-policy/support/logTest.sub.js
index d797475d2a67..6bbdb43f72d8 100644
--- a/testing/web-platform/tests/content-security-policy/support/logTest.sub.js
+++ b/testing/web-platform/tests/content-security-policy/support/logTest.sub.js
@@ -1,5 +1,9 @@
 // note, this template substitution is XSS, but no way to avoid it in this framework
 var expected_logs = {{GET[logs]}};
+var timeout = "{{GET[timeout]}}";
+if (timeout == "") {
+  timeout = 2;
+}
 
 if (expected_logs.length == 0) {
     function log_assert(msg) {
@@ -7,6 +11,12 @@ if (expected_logs.length == 0) {
     }
 } else {
     var t_log = async_test('Expecting logs: {{GET[logs]}}');
+    setTimeout(function() {
+      if(t_log.phase != t_log.phases.COMPLETE){ 
+        t_log.step(function () { assert_unreached('Logging timeout, expected logs ' + expected_logs + ' not sent.') });
+        t_log.done();
+      }
+    }, timeout * 1000);
     function log(msg) {
         //cons/**/ole.log(msg);
         t_log.step(function () {
diff --git a/testing/web-platform/tests/cors/credentials-flag.htm b/testing/web-platform/tests/cors/credentials-flag.htm
index dc2b3ed8f98e..bacd43c4ed59 100644
--- a/testing/web-platform/tests/cors/credentials-flag.htm
+++ b/testing/web-platform/tests/cors/credentials-flag.htm
@@ -17,6 +17,7 @@ var url = CROSSDOMAIN + 'resources/cors-cookie.py?ident='
  * widthCredentials
  */
 // XXX Do some https tests here as well
+
 test(function () {
     var client = new XMLHttpRequest()
     client.open('GET', CROSSDOMAIN, false)
diff --git a/testing/web-platform/tests/cssom-view/elementScroll.html b/testing/web-platform/tests/cssom-view/elementScroll.html
new file mode 100644
index 000000000000..6227d6654575
--- /dev/null
+++ b/testing/web-platform/tests/cssom-view/elementScroll.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>cssom-view - elementScroll</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+    section {
+        width: 300px;
+        height: 300px;
+        /*position: absolute;*/
+        top: 16px;
+        left: 16px;
+        border: inset gray 3px;
+        overflow: scroll;
+        background: white;
+    }
+
+    div {
+        width: 400px;
+    }
+
+</style>
+
+<section id="section">
+    <div>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ultricies tortor eu augue eleifend malesuada. Duis id condimentum urna. Duis vulputate urna a dignissim sodales. Aenean et magna id dui rutrum suscipit. Etiam metus mauris, congue ac suscipit dapibus, mattis non neque. Donec porttitor eros sed mauris tristique, non condimentum augue feugiat. Suspendisse iaculis faucibus nunc at porttitor. Integer convallis enim in feugiat molestie. Ut eget tincidunt mi, vel malesuada lectus. Quisque fermentum neque a sapien interdum consectetur. Nam tincidunt leo sit amet tortor ornare, sit amet ultrices ante semper. Fusce malesuada mi vitae venenatis sagittis. Duis eget urna quam.
+
+    Sed lacinia aliquam tortor quis elementum. Cras vitae mauris erat. Vestibulum posuere justo et dolor condimentum feugiat. Sed at magna nunc. Suspendisse est nunc, ultrices sed enim lobortis, vulputate rutrum mauris. Fusce ultrices eget erat blandit porta. Sed eros nulla, tristique eget porta a, viverra vel velit. Praesent sit amet odio eleifend, tempor arcu ut, elementum tellus. Suspendisse lorem tortor, sodales eget nulla a, rhoncus lobortis magna. Phasellus purus ante, rhoncus a ipsum nec, condimentum lacinia purus. Cras lobortis posuere nisi, vitae dapibus ante feugiat et. Quisque ornare nisi quis erat congue viverra. Vestibulum a nunc odio.
+
+    Sed id venenatis tortor. Curabitur sit amet mauris eget mi semper rutrum vel et odio. Phasellus eu sapien in sem ultricies pretium eu sit amet magna. Nulla finibus nec lorem ac semper. Nulla eleifend eros id fringilla pellentesque. Proin eleifend, sem vel lobortis viverra, massa augue viverra felis, quis ultricies sapien ipsum at magna. Duis rutrum tempus lobortis. Aliquam quis nulla eget velit viverra pretium. Maecenas venenatis nec nisl at pulvinar. Duis in sodales lectus, ac porta augue.
+
+    Sed sed ante aliquam, rutrum nisl quis, fermentum tellus. Proin ac leo molestie, euismod mauris sed, consequat nunc. Vivamus ut leo a nunc pharetra accumsan a non lorem. Aliquam iaculis mattis augue, in eleifend est accumsan vel. Pellentesque efficitur pulvinar leo vel ornare. Pellentesque non fermentum enim, ut efficitur elit. Duis risus quam, congue vel nulla a, blandit egestas erat. Suspendisse at sodales dolor. Vivamus auctor, lorem et ultrices venenatis, erat ex mollis nisi, quis maximus libero quam a libero.
+
+    Curabitur elit lacus, bibendum non tempus a, bibendum sit amet ante. Mauris eget nibh quis leo rhoncus consequat. Integer iaculis sed sapien eu pellentesque. In aliquet elementum lorem, ut consequat elit ultrices id. Phasellus vestibulum ex ex, ac sagittis tortor convallis et. Curabitur placerat id lectus at aliquam. Morbi sed nisl sem. Nam sit amet arcu maximus, volutpat nisl ac, dignissim neque. Etiam nec efficitur libero. Quisque tristique pulvinar est, eget dictum ex vehicula non. Nam dignissim non felis a iaculis. Nullam vel dolor vitae libero aliquet congue. Donec mi eros, semper non lectus at, commodo ullamcorper ligula. Donec commodo, sem vel lacinia porttitor, elit orci maximus felis, eget eleifend est velit id lorem.
+    </div>
+</section>
+
+<script>
+    setup({explicit_done:true});
+    window.onload = function () {
+        var section = document.getElementById("section");
+
+        test(function () {
+            assert_equals(section.scrollTop, 0, "initial scrollTop should be 0");
+            assert_equals(section.scrollLeft, 0, "initial scrollLeft should be 0");
+
+            section.scrollTop  = 30;
+            section.scrollLeft = 40;
+
+            assert_equals(section.scrollTop, 30, "changed scrollTop should be 40");
+            assert_equals(section.scrollLeft, 40, "changed scrollLeft should be 40");
+        },  "Element scrollTop/Left getter/setter test");
+
+        test(function () {
+            section.scroll(50, 60);
+
+            assert_equals(section.scrollLeft, 50, "changed scrollLeft should be 60");
+            assert_equals(section.scrollTop, 60, "changed scrollTop should be 50");
+        },  "Element scroll test");
+
+        test(function () {
+            section.scrollTo(80, 70);
+
+            assert_equals(section.scrollLeft, 80, "changed scrollLeft should be 70");
+            assert_equals(section.scrollTop, 70, "changed scrollTop should be 80");
+        }, "Element scrollTo test");
+
+        test(function () {
+            var left = section.scrollLeft;
+            var top = section.scrollTop;
+
+            section.scrollBy(10, 20);
+
+            assert_equals(section.scrollLeft, left + 10, "increment of scrollLeft should be 10")
+            assert_equals(section.scrollTop, top + 20, "increment of scrollTop should be 20")
+        })
+
+        test(function () {
+            section.scrollTop  = 1000;
+            section.scrollLeft = 1000;
+
+            assert_equals(section.scrollTop, 636, "changed scrollTop should be 636");
+            assert_equals(section.scrollLeft, 100, "changed scrollLeft should be 100");
+
+        }, "Element scroll maximum test");
+
+        done();
+    };
+</script>
diff --git a/testing/web-platform/tests/custom-elements/OWNERS b/testing/web-platform/tests/custom-elements/OWNERS
index 4671167903fc..a8b25e79c2d9 100644
--- a/testing/web-platform/tests/custom-elements/OWNERS
+++ b/testing/web-platform/tests/custom-elements/OWNERS
@@ -1,3 +1,9 @@
-@deepak-sa
-@sgrekhov
 @alsemenov
+@deepak-sa
+@domenic
+@dominiccooney
+@hayatoito
+@kojiishi
+@rniwa
+@sgrekhov
+@takayoshikochi
diff --git a/testing/web-platform/tests/custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html b/testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-allowed-chars-first-char.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html
rename to testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-allowed-chars-first-char.html
diff --git a/testing/web-platform/tests/custom-elements/concepts/custom-elements-type-allowed-chars.html b/testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-allowed-chars.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/concepts/custom-elements-type-allowed-chars.html
rename to testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-allowed-chars.html
diff --git a/testing/web-platform/tests/custom-elements/concepts/custom-elements-type-naming.html b/testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-naming.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/concepts/custom-elements-type-naming.html
rename to testing/web-platform/tests/custom-elements/v0/concepts/custom-elements-type-naming.html
diff --git a/testing/web-platform/tests/custom-elements/creating-and-passing-registries/new-registry-test.html b/testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/new-registry-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/creating-and-passing-registries/new-registry-test.html
rename to testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/new-registry-test.html
diff --git a/testing/web-platform/tests/custom-elements/creating-and-passing-registries/no-registry-test.html b/testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/no-registry-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/creating-and-passing-registries/no-registry-test.html
rename to testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/no-registry-test.html
diff --git a/testing/web-platform/tests/custom-elements/creating-and-passing-registries/share-registry-create-document.html b/testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/share-registry-create-document.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/creating-and-passing-registries/share-registry-create-document.html
rename to testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/share-registry-create-document.html
diff --git a/testing/web-platform/tests/custom-elements/creating-and-passing-registries/share-registry-import-document.html b/testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/share-registry-import-document.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/creating-and-passing-registries/share-registry-import-document.html
rename to testing/web-platform/tests/custom-elements/v0/creating-and-passing-registries/share-registry-import-document.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html
diff --git a/testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html b/testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html
rename to testing/web-platform/tests/custom-elements/v0/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/changing-is-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/changing-is-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/changing-is-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/changing-is-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-is-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-is-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-local-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-local-name.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-namespace.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-namespace.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-node-document.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-node-document.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-prototype.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-constructor-prototype.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-prototype.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-prototype.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-prototype.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-prototype.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-is-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-is-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-local-name-and-is-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-local-name-and-is-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-local-name.html b/testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-local-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/custom-element-type-local-name.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/custom-element-type-local-name.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-is-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-is-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-namespace.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-namespace.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-is-a-type.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-is-a-type.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-unresolved.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-extension-unresolved.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-is-a-local-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/create-element-type-is-a-local-name.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element-ns.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element-ns.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html b/testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/extensions-to-document-interface/created-callback-create-element.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html b/testing/web-platform/tests/custom-elements/v0/instantiating/non-configurable-constructor-property.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/non-configurable-constructor-property.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html b/testing/web-platform/tests/custom-elements/v0/instantiating/prototype-is-interface-prototype-object.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/prototype-is-interface-prototype-object.html
diff --git a/testing/web-platform/tests/custom-elements/instantiating-custom-elements/unchanged-attribute.html b/testing/web-platform/tests/custom-elements/v0/instantiating/unchanged-attribute.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/instantiating-custom-elements/unchanged-attribute.html
rename to testing/web-platform/tests/custom-elements/v0/instantiating/unchanged-attribute.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-default-namespace.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-default-namespace.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-duplicate-definition.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-duplicate-definition.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-invalid-type.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-invalid-type.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-local-name-lowercased.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-local-name-lowercased.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-name-is-null.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-name-is-null.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-no-interface-for-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-no-interface-for-name.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace-name-is-null.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace-name-is-null.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-svg-namespace.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html b/testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-type-name-lowercased.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html
rename to testing/web-platform/tests/custom-elements/v0/registering/definition-construction-algorithm-type-name-lowercased.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html b/testing/web-platform/tests/custom-elements/v0/registering/element-registration-algorithm-no-registry.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html
rename to testing/web-platform/tests/custom-elements/v0/registering/element-registration-algorithm-no-registry.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html b/testing/web-platform/tests/custom-elements/v0/registering/extensions-to-document-interface/custom-element-name.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html
rename to testing/web-platform/tests/custom-elements/v0/registering/extensions-to-document-interface/custom-element-name.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html b/testing/web-platform/tests/custom-elements/v0/registering/extensions-to-document-interface/custom-element-prototype.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html
rename to testing/web-platform/tests/custom-elements/v0/registering/extensions-to-document-interface/custom-element-prototype.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-html-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-html-element.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-html-unknown-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-html-unknown-element.html
diff --git a/testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html b/testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-svg-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html
rename to testing/web-platform/tests/custom-elements/v0/registering/unresolved-elements-interface-svg-element.html
diff --git a/testing/web-platform/tests/custom-elements/resources/blank.html b/testing/web-platform/tests/custom-elements/v0/resources/blank.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/blank.html
rename to testing/web-platform/tests/custom-elements/v0/resources/blank.html
diff --git a/testing/web-platform/tests/custom-elements/resources/import-master-async.html b/testing/web-platform/tests/custom-elements/v0/resources/import-master-async.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/import-master-async.html
rename to testing/web-platform/tests/custom-elements/v0/resources/import-master-async.html
diff --git a/testing/web-platform/tests/custom-elements/resources/import-master.html b/testing/web-platform/tests/custom-elements/v0/resources/import-master.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/import-master.html
rename to testing/web-platform/tests/custom-elements/v0/resources/import-master.html
diff --git a/testing/web-platform/tests/custom-elements/resources/import.html b/testing/web-platform/tests/custom-elements/v0/resources/import.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/import.html
rename to testing/web-platform/tests/custom-elements/v0/resources/import.html
diff --git a/testing/web-platform/tests/custom-elements/resources/register-and-create-custom-element.html b/testing/web-platform/tests/custom-elements/v0/resources/register-and-create-custom-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/register-and-create-custom-element.html
rename to testing/web-platform/tests/custom-elements/v0/resources/register-and-create-custom-element.html
diff --git a/testing/web-platform/tests/custom-elements/resources/x-element.html b/testing/web-platform/tests/custom-elements/v0/resources/x-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/x-element.html
rename to testing/web-platform/tests/custom-elements/v0/resources/x-element.html
diff --git a/testing/web-platform/tests/custom-elements/resources/x-mathml-element.html b/testing/web-platform/tests/custom-elements/v0/resources/x-mathml-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/x-mathml-element.html
rename to testing/web-platform/tests/custom-elements/v0/resources/x-mathml-element.html
diff --git a/testing/web-platform/tests/custom-elements/resources/x-svg-element.html b/testing/web-platform/tests/custom-elements/v0/resources/x-svg-element.html
similarity index 100%
rename from testing/web-platform/tests/custom-elements/resources/x-svg-element.html
rename to testing/web-platform/tests/custom-elements/v0/resources/x-svg-element.html
diff --git a/testing/web-platform/tests/custom-elements/testcommon.js b/testing/web-platform/tests/custom-elements/v0/testcommon.js
similarity index 100%
rename from testing/web-platform/tests/custom-elements/testcommon.js
rename to testing/web-platform/tests/custom-elements/v0/testcommon.js
diff --git a/testing/web-platform/tests/dom/OWNERS b/testing/web-platform/tests/dom/OWNERS
index 6e450949e119..fad498154e49 100644
--- a/testing/web-platform/tests/dom/OWNERS
+++ b/testing/web-platform/tests/dom/OWNERS
@@ -1,5 +1,4 @@
 @ayg
-@foolip
 @jdm
 @Ms2ger
 @plehegar
diff --git a/testing/web-platform/tests/dom/events/Event-defaultPrevented-after-dispatch.html b/testing/web-platform/tests/dom/events/Event-defaultPrevented-after-dispatch.html
new file mode 100644
index 000000000000..decf7e9927ff
--- /dev/null
+++ b/testing/web-platform/tests/dom/events/Event-defaultPrevented-after-dispatch.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Event.defaultPrevented is not reset after dipatchEvent()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id=log></div>
+<input id="target" type="hidden" value=""/>
+<script>
+test(function() {
+    var EVENT = "foo";
+    var TARGET = document.getElementById("target");
+    var evt = document.createEvent("Event");
+    evt.initEvent(EVENT, true, true);
+
+    TARGET.addEventListener(EVENT, this.step_func(function(e) {
+        e.preventDefault();
+        assert_true(e.defaultPrevented, "during dispatch");
+    }), true);
+    TARGET.dispatchEvent(evt);
+
+    assert_true(evt.defaultPrevented, "after dispatch");
+    assert_equals(evt.target, TARGET);
+});
+</script>
diff --git a/testing/web-platform/tests/dom/events/ProgressEvent.html b/testing/web-platform/tests/dom/events/ProgressEvent.html
index 2b2f7bc51b7f..aa947e3f2cea 100644
--- a/testing/web-platform/tests/dom/events/ProgressEvent.html
+++ b/testing/web-platform/tests/dom/events/ProgressEvent.html
@@ -18,8 +18,8 @@ test(function() {
   assert_true("initEvent" in ev)
 }, "Default event values.")
 test(function() {
-  assert_throws("NotSupportedError", function() {
-    document.createEvent("ProgressEvent")
-  })
-}, "document.createEvent() should not work with ProgressEvent.")
+  var e = document.createEvent("ProgressEvent");
+  var eProto = Object.getPrototypeOf(e);
+  assert_equals(eProto, ProgressEvent.prototype);
+}, "document.createEvent() should work with ProgressEvent.");
 </script>
diff --git a/testing/web-platform/tests/dom/lists/DOMTokenList-coverage-for-attributes.html b/testing/web-platform/tests/dom/lists/DOMTokenList-coverage-for-attributes.html
new file mode 100644
index 000000000000..fc44213caa8a
--- /dev/null
+++ b/testing/web-platform/tests/dom/lists/DOMTokenList-coverage-for-attributes.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>DOMTokenList coverage for attributes</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+"use strict";
+
+var pairs = [
+  // Defined in DOM
+  {attr: "classList", sup: ["anyElement"]},
+  // Defined in HTML
+  {attr: "dropzone", sup: ["anyHTMLElement"]},
+  {attr: "headers", sup: ["td", "th"]},
+  {attr: "htmlFor", sup: ["output"]},
+  {attr: "ping", sup: ["a", "area"]},
+  {attr: "relList", sup: ["a", "area", "link"]},
+  {attr: "sandbox", sup: ["iframe"]},
+  {attr: "sizes", sup: ["link"]}
+];
+var namespaces = [
+  "http://www.w3.org/1999/xhtml",
+  "http://www.w3.org/2000/svg",
+  "http://www.w3.org/1998/Math/MathML",
+  "http://example.com/",
+  ""
+];
+
+var elements = ["a", "area", "link", "iframe", "output", "td", "th"];
+function testAttr(pair, new_el){
+  return (pair.attr === "classList" || (new_el.namespaceURI === "http://www.w3.org/1999/xhtml" && (pair.attr === "dropzone" || pair.sup.indexOf(new_el.localName) != -1)));
+}
+
+pairs.forEach(function(pair) {
+  namespaces.forEach(function(ns) {
+    elements.forEach(function(el) {
+      var new_el = document.createElementNS(ns, el);
+      if (testAttr(pair, new_el)) {
+        test(function() {
+          assert_class_string(new_el[pair.attr], "DOMTokenList");
+        }, new_el.localName + "." + pair.attr + " in " + new_el.namespaceURI + " namespace should be DOMTokenList.");
+      }
+      else {
+        test(function() {
+          assert_equals(new_el[pair.attr], undefined);
+       }, new_el.localName + "." + pair.attr + " in " + new_el.namespaceURI + " namespace should be undefined.");
+      }
+    });
+  });
+});
+
+</script>
diff --git a/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html b/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html
index a982f23d8615..d64bf3640d7e 100644
--- a/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html
+++ b/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html
@@ -123,7 +123,7 @@ test(function() {
         var doc = document.implementation.createDocument(namespace, qualifiedName, doctype)
         assert_equals(doc.compatMode, "CSS1Compat")
         assert_equals(doc.characterSet, "UTF-8")
-        assert_equals(doc.contentType, namespace == htmlNamespace ? "text/html"
+        assert_equals(doc.contentType, namespace == htmlNamespace ? "application/xhtml+xml"
                                  : namespace == svgNamespace ?  "image/svg+xml"
                                  : "application/xml")
         assert_equals(doc.URL, "about:blank")
diff --git a/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html b/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
index 48300589b855..746792fb78b3 100644
--- a/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
+++ b/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<title>document.characterSet and inputEncoding normalization tests</title>
+<title>document.characterSet (inputEncoding and charset as aliases) normalization tests</title>
 <link rel=author title="Aryeh Gregor" href=ayg@aryeh.name>
 <meta name=timeout content=long>
 <div id=log></div>
@@ -11,7 +11,7 @@
 
 // Taken straight from https://encoding.spec.whatwg.org/
 var encodingMap = {
-  "utf-8": [
+  "UTF-8": [
     "unicode-1-1-utf-8",
     "utf-8",
     "utf8",
@@ -21,13 +21,13 @@ var encodingMap = {
     "utf-16le",
     "utf-16be",
   ],
-  "ibm866": [
+  "IBM866": [
     "866",
     "cp866",
     "csibm866",
     "ibm866",
   ],
-  "iso-8859-2": [
+  "ISO-8859-2": [
     "csisolatin2",
     "iso-8859-2",
     "iso-ir-101",
@@ -38,7 +38,7 @@ var encodingMap = {
     "l2",
     "latin2",
   ],
-  "iso-8859-3": [
+  "ISO-8859-3": [
     "csisolatin3",
     "iso-8859-3",
     "iso-ir-109",
@@ -49,7 +49,7 @@ var encodingMap = {
     "l3",
     "latin3",
   ],
-  "iso-8859-4": [
+  "ISO-8859-4": [
     "csisolatin4",
     "iso-8859-4",
     "iso-ir-110",
@@ -60,7 +60,7 @@ var encodingMap = {
     "l4",
     "latin4",
   ],
-  "iso-8859-5": [
+  "ISO-8859-5": [
     "csisolatincyrillic",
     "cyrillic",
     "iso-8859-5",
@@ -70,7 +70,7 @@ var encodingMap = {
     "iso_8859-5",
     "iso_8859-5:1988",
   ],
-  "iso-8859-6": [
+  "ISO-8859-6": [
     "arabic",
     "asmo-708",
     "csiso88596e",
@@ -86,7 +86,7 @@ var encodingMap = {
     "iso_8859-6",
     "iso_8859-6:1987",
   ],
-  "iso-8859-7": [
+  "ISO-8859-7": [
     "csisolatingreek",
     "ecma-118",
     "elot_928",
@@ -100,7 +100,7 @@ var encodingMap = {
     "iso_8859-7:1987",
     "sun_eu_greek",
   ],
-  "iso-8859-8": [
+  "ISO-8859-8": [
     "csiso88598e",
     "csisolatinhebrew",
     "hebrew",
@@ -113,12 +113,12 @@ var encodingMap = {
     "iso_8859-8:1988",
     "visual",
   ],
-  "iso-8859-8-i": [
+  "ISO-8859-8-I": [
     "csiso88598i",
     "iso-8859-8-i",
     "logical",
   ],
-  "iso-8859-10": [
+  "ISO-8859-10": [
     "csisolatin6",
     "iso-8859-10",
     "iso-ir-157",
@@ -127,17 +127,17 @@ var encodingMap = {
     "l6",
     "latin6",
   ],
-  "iso-8859-13": [
+  "ISO-8859-13": [
     "iso-8859-13",
     "iso8859-13",
     "iso885913",
   ],
-  "iso-8859-14": [
+  "ISO-8859-14": [
     "iso-8859-14",
     "iso8859-14",
     "iso885914",
   ],
-  "iso-8859-15": [
+  "ISO-8859-15": [
     "csisolatin9",
     "iso-8859-15",
     "iso8859-15",
@@ -145,17 +145,18 @@ var encodingMap = {
     "iso_8859-15",
     "l9",
   ],
-  "iso-8859-16": [
+  "ISO-8859-16": [
     "iso-8859-16",
   ],
-  "koi8-r": [
+  "KOI8-R": [
     "cskoi8r",
     "koi",
     "koi8",
     "koi8-r",
     "koi8_r",
   ],
-  "koi8-u": [
+  "KOI8-U": [
+    "koi8-ru",
     "koi8-u",
   ],
   "macintosh": [
@@ -247,7 +248,7 @@ var encodingMap = {
     "x-mac-cyrillic",
     "x-mac-ukrainian",
   ],
-  "gbk": [
+  "GBK": [
     "chinese",
     "csgb2312",
     "csiso58gb231280",
@@ -261,26 +262,23 @@ var encodingMap = {
   "gb18030": [
     "gb18030",
   ],
-  "hz-gb-2312": [
-    "hz-gb-2312",
-  ],
-  "big5": [
+  "Big5": [
     "big5",
     "big5-hkscs",
     "cn-big5",
     "csbig5",
     "x-x-big5",
   ],
-  "euc-jp": [
+  "EUC-JP": [
     "cseucpkdfmtjapanese",
     "euc-jp",
     "x-euc-jp",
   ],
-  "iso-2022-jp": [
+  "ISO-2022-JP": [
     "csiso2022jp",
     "iso-2022-jp",
   ],
-  "shift_jis": [
+  "Shift_JIS": [
     "csshiftjis",
     "ms932",
     "ms_kanji",
@@ -290,7 +288,7 @@ var encodingMap = {
     "windows-31j",
     "x-sjis",
   ],
-  "euc-kr": [
+  "EUC-KR": [
     "cseuckr",
     "csksc56011987",
     "euc-kr",
@@ -304,6 +302,7 @@ var encodingMap = {
   ],
   "replacement": [
     "csiso2022kr",
+    "hz-gb-2312",
     "iso-2022-cn",
     "iso-2022-cn-ext",
     "iso-2022-kr",
@@ -342,16 +341,6 @@ Object.keys(encodingMap).forEach(function(name) {
   }
 });
 
-function expected_case(encoding_label) {
-  if (encoding_label === 'big5') {
-    return 'Big5';
-  }
-  if (encoding_label === 'shift_jis') {
-    return 'Shift_JIS';
-  }
-  return encoding_label.toUpperCase();
-}
-
 Object.keys(encodingMap).forEach(function(name) {
   encodingMap[name].forEach(function(label) {
     var iframe = document.createElement("iframe");
@@ -361,20 +350,16 @@ Object.keys(encodingMap).forEach(function(name) {
                        " has label " + format_value(label) + " (inputEncoding)");
     var t3 = async_test("Name " + format_value(name) +
                        " has label " + format_value(label) + " (charset)");
-    /*
-    iframe.src = "data:text/html,<!doctype html>" +
-                 '<meta charset="' + label + '">';
-    */
     iframe.src = "encoding.py?label=" + label;
     iframe.onload = function() {
       t.step(function() {
-        assert_equals(iframe.contentDocument.characterSet, expected_case(name));
+        assert_equals(iframe.contentDocument.characterSet, name);
       });
       t2.step(function() {
-        assert_equals(iframe.contentDocument.inputEncoding, expected_case(name));
+        assert_equals(iframe.contentDocument.inputEncoding, name);
       });
       t3.step(function() {
-        assert_equals(iframe.contentDocument.charset, expected_case(name));
+        assert_equals(iframe.contentDocument.charset, name);
       });
       document.body.removeChild(iframe);
       t.done();
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html
index 12df40147b76..828643741633 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html
@@ -2,14 +2,14 @@
 <title>BMP document.contentType === 'image/bmp'</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<iframe style="display:none"></iframe>
 <div id=log></div>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "image/bmp");
   }), false);
   iframe.src = "../resources/t.bmp";
+  document.body.appendChild(iframe);
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html
index 1e405828417a..0eb35edd5e70 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/css");
   }), false);
   iframe.src = "../resources/style.css";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html
index 383fa9cca192..79c63644d849 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/plain");
   }), false);
   iframe.src = "data:;,<!DOCTYPE html>";
+  document.body.appendChild(iframe);
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html
index 0c4d42d5ece1..2e82c7c1faac 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/html");
   }), false);
   iframe.src = "data:text/html;charset=utf-8,<!DOCTYPE html>";
+  document.body.appendChild(iframe);
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html
index a848b7a851c2..8dd66dae59d8 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "image/gif");
   }), false);
   iframe.src = "../resources/t.gif";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html
index 818e37f1e77d..2b2d7263eb05 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/html");
   }), false);
   iframe.src = "../resources/blob.htm";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html
index 34706967003c..956589615ac1 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html
@@ -3,14 +3,14 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/html");
     assert_equals(iframe.contentDocument.documentElement.textContent, "text/html");
   }), false);
   iframe.src = "javascript:document.contentType";
+  document.body.appendChild(iframe);
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html
index c41c38a87209..13f57ec8b9ed 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "image/jpeg");
   }), false);
   iframe.src = "../resources/t.jpg";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html
index a0c63d1fc433..87885efba64e 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/xml");
   }), false);
   iframe.src = "../support/contenttype_setter.py?type=text&subtype=xml";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html
index f147269edee8..33870147fc3d 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/html");
   }), false);
   iframe.src = "../support/contenttype_setter.py?type=text&subtype=html&mimeHead=text%2Fxml";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html
index 15cc7a66b2ae..a214ad3e98b8 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "image/png");
   }), false);
   iframe.src = "../resources/t.png";
+  document.body.appendChild(iframe);
 });
 </script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html
index c25bdc30d691..f40f641fb02e 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "text/plain");
   }), false);
   iframe.src = "../resources/blob.txt";
+  document.body.appendChild(iframe);
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html
index 4256621cf9e7..c382de8490bf 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html
@@ -3,13 +3,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
-<iframe style="display:none"></iframe>
 <script>
 async_test(function() {
-  var iframe = document.getElementsByTagName('iframe')[0];
+  var iframe = document.createElement('iframe');
   iframe.addEventListener('load', this.step_func_done(function() {
     assert_equals(iframe.contentDocument.contentType, "application/xml");
   }), false);
   iframe.src = "../resources/blob.xml";
+  document.body.appendChild(iframe);
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/createDocument.html b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/createDocument.html
index 1e4a22d712a9..78a952de4a2b 100644
--- a/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/createDocument.html
+++ b/testing/web-platform/tests/dom/nodes/Document-contentType/contentType/createDocument.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
-<title>document.implementation.createDocument: document.contentType === 'application/xml'</title>
+<title>document.implementation.createDocument: document.contentType === 'application/xhtml+xml'</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
 <script>
 test(function() {
   var doc = document.implementation.createDocument("http://www.w3.org/1999/xhtml", "html", null);
-  assert_equals(doc.contentType, "application/xml");
+  assert_equals(doc.contentType, "application/xhtml+xml");
 });
 </script>
diff --git a/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html b/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
index 4b407a9b856c..add66bf9a011 100644
--- a/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
+++ b/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
@@ -20,7 +20,7 @@ function testDoc(doc, contentType) {
   if (doc.contentType !== undefined) {
     // Sanity check
     assert_equals(doc.contentType, contentType,
-                  "Wrong MIME type -- incorrect server config?");
+                  "Wrong MIME type returned from doc.contentType");
   }
 
   var expectedNamespace = contentType == "text/html" ||
@@ -54,6 +54,23 @@ test(function() {
           "application/xml");
 }, "Created element's namespace in created MathML document");
 
+// Second also test document created by DOMParser
+test(function() {
+  testDoc(new DOMParser().parseFromString("", "text/html"), "text/html");
+}, "Created element's namespace in created HTML document by DOMParser ('text/html')");
+test(function() {
+  testDoc(new DOMParser().parseFromString("<root/>", "text/xml"), "text/xml");
+}, "Created element's namespace in created XML document by DOMParser ('text/xml')");
+test(function() {
+  testDoc(new DOMParser().parseFromString("<root/>", "application/xml"), "application/xml");
+}, "Created element's namespace in created XML document by DOMParser ('application/xml')");
+test(function() {
+  testDoc(new DOMParser().parseFromString("<html/>", "application/xhtml+xml"), "application/xhtml+xml");
+}, "Created element's namespace in created XHTML document by DOMParser ('application/xhtml+xml')");
+test(function() {
+  testDoc(new DOMParser().parseFromString("<math/>", "image/svg+xml"), "image/svg+xml");
+}, "Created element's namespace in created SVG document by DOMParser ('image/svg+xml')");
+
 // Now for various externally-loaded files.  Note: these lists must be kept
 // synced with the lists in generate.py in the subdirectory, and that script
 // must be run whenever the lists are updated.  (We could keep the lists in a
diff --git a/testing/web-platform/tests/dom/nodes/Element-hasAttributes.html b/testing/web-platform/tests/dom/nodes/Element-hasAttributes.html
new file mode 100644
index 000000000000..fbb9c233b700
--- /dev/null
+++ b/testing/web-platform/tests/dom/nodes/Element-hasAttributes.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<meta charset="utf-8">
+<title></title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+
+<button></button>
+<div id="foo"></div>
+<p data-foo=""></p>
+
+<script>
+test(function() {
+    var buttonElement = document.getElementsByTagName('button')[0];
+    assert_equals(buttonElement.hasAttributes(), false, 'hasAttributes() on empty element must return false.');
+
+    var emptyDiv = document.createElement('div');
+    assert_equals(emptyDiv.hasAttributes(), false, 'hasAttributes() on dynamically created empty element must return false.');
+
+}, 'element.hasAttributes() must return false when the element does not have attribute.');
+
+test(function() {
+    var divWithId = document.getElementById('foo');
+    assert_equals(divWithId.hasAttributes(), true, 'hasAttributes() on element with id attribute must return true.');
+
+    var divWithClass = document.createElement('div');
+    divWithClass.setAttribute('class', 'foo');
+    assert_equals(divWithClass.hasAttributes(), true, 'hasAttributes() on dynamically created element with class attribute must return true.');
+
+    var pWithCustomAttr = document.getElementsByTagName('p')[0];
+    assert_equals(pWithCustomAttr.hasAttributes(), true, 'hasAttributes() on element with custom attribute must return true.');
+
+    var divWithCustomAttr = document.createElement('div');
+    divWithCustomAttr.setAttribute('data-custom', 'foo');
+    assert_equals(divWithCustomAttr.hasAttributes(), true, 'hasAttributes() on dynamically created element with custom attribute must return true.');
+
+}, 'element.hasAttributes() must return true when the element has attribute.');
+
+</script>
+</body>
diff --git a/testing/web-platform/tests/dom/nodes/Node-cloneNode.html b/testing/web-platform/tests/dom/nodes/Node-cloneNode.html
index a80f82cdc3d0..9fb939f7e657 100644
--- a/testing/web-platform/tests/dom/nodes/Node-cloneNode.html
+++ b/testing/web-platform/tests/dom/nodes/Node-cloneNode.html
@@ -151,10 +151,10 @@ test(function() {
     create_element_and_check("sup",       HTMLElement);
     create_element_and_check("table",     HTMLTableElement);
     create_element_and_check("tbody",     HTMLTableSectionElement);
-    create_element_and_check("td",        HTMLTableDataCellElement);
+    create_element_and_check("td",        HTMLTableCellElement);
     create_element_and_check("template",  HTMLTemplateElement);
     create_element_and_check("textarea",  HTMLTextAreaElement);
-    create_element_and_check("th",        HTMLTableHeaderCellElement);
+    create_element_and_check("th",        HTMLTableCellElement);
     create_element_and_check("time",      HTMLTimeElement);
     create_element_and_check("title",     HTMLTitleElement);
     create_element_and_check("tr",        HTMLTableRowElement);
diff --git a/testing/web-platform/tests/dom/nodes/Node-isSameNode.html b/testing/web-platform/tests/dom/nodes/Node-isSameNode.html
new file mode 100644
index 000000000000..884fdd504900
--- /dev/null
+++ b/testing/web-platform/tests/dom/nodes/Node-isSameNode.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Node.prototype.isSameNode</title>
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-issamenode">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+
+test(function() {
+
+  var doctype1 = document.implementation.createDocumentType("qualifiedName", "publicId", "systemId");
+  var doctype2 = document.implementation.createDocumentType("qualifiedName", "publicId", "systemId");
+
+  assert_true(doctype1.isSameNode(doctype1), "self-comparison");
+  assert_false(doctype1.isSameNode(doctype2), "same properties");
+  assert_false(doctype1.isSameNode(null), "with null other node");
+}, "doctypes should be comapred on reference");
+
+test(function() {
+
+  var element1 = document.createElementNS("namespace", "prefix:localName");
+  var element2 = document.createElementNS("namespace", "prefix:localName");
+
+  assert_true(element1.isSameNode(element1), "self-comparison");
+  assert_false(element1.isSameNode(element2), "same properties");
+  assert_false(element1.isSameNode(null), "with null other node");
+
+}, "elements should be compared on reference");
+
+test(function() {
+
+  var element1 = document.createElement("element");
+  element1.setAttributeNS("namespace", "prefix:localName", "value");
+
+  var element2 = document.createElement("element");
+  element2.setAttributeNS("namespace", "prefix:localName", "value");
+
+  assert_true(element1.isSameNode(element1), "self-comparison");
+  assert_false(element1.isSameNode(element2), "same properties");
+  assert_false(element1.isSameNode(null), "with null other node");
+
+}, "elements should be compared on reference");
+
+test(function() {
+
+  var pi1 = document.createProcessingInstruction("target", "data");
+  var pi2 = document.createProcessingInstruction("target", "data");
+
+  assert_true(pi1.isSameNode(pi1), "self-comparison");
+  assert_false(pi1.isSameNode(pi2), "different target");
+  assert_false(pi1.isSameNode(null), "with null other node");
+
+}, "processing instructions should be compared on reference");
+
+test(function() {
+
+  var text1 = document.createTextNode("data");
+  var text2 = document.createTextNode("data");
+
+  assert_true(text1.isSameNode(text1), "self-comparison");
+  assert_false(text1.isSameNode(text2), "same properties");
+  assert_false(text1.isSameNode(null), "with null other node");
+
+}, "text nodes should be compared on reference");
+
+test(function() {
+
+  var comment1 = document.createComment("data");
+  var comment2 = document.createComment("data");
+
+  assert_true(comment1.isSameNode(comment1), "self-comparison");
+  assert_false(comment1.isSameNode(comment2), "same properties");
+  assert_false(comment1.isSameNode(null), "with null other node");
+
+}, "comments should be compared on reference");
+
+test(function() {
+
+  var documentFragment1 = document.createDocumentFragment();
+  var documentFragment2 = document.createDocumentFragment();
+
+  assert_true(documentFragment1.isSameNode(documentFragment1), "self-comparison");
+  assert_false(documentFragment1.isSameNode(documentFragment2), "same properties");
+  assert_false(documentFragment1.isSameNode(null), "with null other node");
+
+}, "document fragments should be compared on reference");
+
+test(function() {
+
+  var document1 = document.implementation.createDocument("", "");
+  var document2 = document.implementation.createDocument("", "");
+
+  assert_true(document1.isSameNode(document1), "self-comparison");
+  assert_false(document1.isSameNode(document2), "another empty XML document");
+  assert_false(document1.isSameNode(null), "with null other node");
+
+}, "documents should not be compared on reference");
+
+</script>
diff --git a/testing/web-platform/tests/domparsing/OWNERS b/testing/web-platform/tests/domparsing/OWNERS
index 113c79d205d0..8aeebafa5f5e 100644
--- a/testing/web-platform/tests/domparsing/OWNERS
+++ b/testing/web-platform/tests/domparsing/OWNERS
@@ -2,4 +2,3 @@
 @ChrisParis
 @deniak
 @jdm
-@Ms2ger
diff --git a/testing/web-platform/tests/encoding/OWNERS b/testing/web-platform/tests/encoding/OWNERS
index 9467eae8ec5a..4917e26650ae 100644
--- a/testing/web-platform/tests/encoding/OWNERS
+++ b/testing/web-platform/tests/encoding/OWNERS
@@ -1,3 +1,2 @@
-@foolip
 @inexorabletash
 @sideshowbarker
diff --git a/testing/web-platform/tests/encoding/textdecoder-fatal-single-byte.html b/testing/web-platform/tests/encoding/textdecoder-fatal-single-byte.html
new file mode 100644
index 000000000000..74bad255daf9
--- /dev/null
+++ b/testing/web-platform/tests/encoding/textdecoder-fatal-single-byte.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>Encoding API: Fatal flag for single byte encodings</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+var singleByteEncodings = [
+     {encoding: 'IBM866', bad: []},
+     {encoding: 'ISO-8859-2', bad: []},
+     {encoding: 'ISO-8859-3', bad: [0xA5, 0xAE, 0xBE, 0xC3, 0xD0, 0xE3, 0xF0]},
+     {encoding: 'ISO-8859-4', bad: []},
+     {encoding: 'ISO-8859-5', bad: []},
+     {encoding: 'ISO-8859-6', bad: [0xA1, 0xA2, 0xA3, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBC, 0xBD, 0xBE, 0xC0, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF]},
+     {encoding: 'ISO-8859-7', bad: [0xAE, 0xD2, 0xFF]},
+     {encoding: 'ISO-8859-8', bad: [0xA1, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xFB, 0xFC, 0xFF]},
+     {encoding: 'ISO-8859-8-I', bad: [0xA1, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xFB, 0xFC, 0xFF]},
+     {encoding: 'ISO-8859-10', bad: []},
+     {encoding: 'ISO-8859-13', bad: []},
+     {encoding: 'ISO-8859-14', bad: []},
+     {encoding: 'ISO-8859-15', bad: []},
+     {encoding: 'ISO-8859-16', bad: []},
+     {encoding: 'KOI8-R', bad: []},
+     {encoding: 'KOI8-U', bad: []},
+     {encoding: 'macintosh', bad: []},
+     {encoding: 'windows-874', bad: [0xDB, 0xDC, 0xDD, 0xDE, 0xFC, 0xFD, 0xFE, 0xFF]},
+     {encoding: 'windows-1250', bad: []},
+     {encoding: 'windows-1251', bad: []},
+     {encoding: 'windows-1252', bad: []},
+     {encoding: 'windows-1253', bad: [0xAA, 0xD2, 0xFF]},
+     {encoding: 'windows-1254', bad: []},
+     {encoding: 'windows-1255', bad: [0xCA, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xFB, 0xFC, 0xFF]},
+     {encoding: 'windows-1256', bad: []},
+     {encoding: 'windows-1257', bad: [0xA1, 0xA5]},
+     {encoding: 'windows-1258', bad: []},
+     {encoding: 'x-mac-cyrillic', bad: []},
+];
+
+singleByteEncodings.forEach(function(t) {
+    for (var i = 0; i < 256; ++i) {
+        if (t.bad.indexOf(i) != -1) {
+            test(function() {
+                assert_throws(new TypeError(), function() {
+                    new TextDecoder(t.encoding, {fatal: true}).decode(new Uint8Array([i]));
+                });
+            }, 'Throw due to fatal flag: ' + t.encoding + ' doesn\'t have a pointer ' + i);
+        }
+        else {
+            test(function() {
+                assert_equals(typeof new TextDecoder(t.encoding, {fatal: true}).decode(new Uint8Array([i])), "string");
+            }, 'Not throw: ' + t.encoding + ' has a pointer ' + i);
+        }
+    }
+});
+
+</script>
diff --git a/testing/web-platform/tests/fetch/api/credentials/cookies.js b/testing/web-platform/tests/fetch/api/credentials/cookies.js
index 9c394d6fb384..c635053497ec 100644
--- a/testing/web-platform/tests/fetch/api/credentials/cookies.js
+++ b/testing/web-platform/tests/fetch/api/credentials/cookies.js
@@ -34,8 +34,10 @@ function cookies(desc, credentials1, credentials2 ,cookies) {
       }
       //clean cookies
       return fetch(url + urlCleanParameters, {"credentials": "include"});
-    }).catch(function() {
-      fetch(url + urlCleanParameters, {"credentials": "include"});
+    }).catch(function(e) {
+      return fetch(url + urlCleanParameters, {"credentials": "include"}).then(function() {
+         return Promise.reject(e);
+      });
     });
   }, desc);
 }
diff --git a/testing/web-platform/tests/fetch/api/resources/data.json b/testing/web-platform/tests/fetch/api/resources/data.json
new file mode 100644
index 000000000000..76519fa8cc27
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/resources/data.json
@@ -0,0 +1 @@
+{"key": "value"}
diff --git a/testing/web-platform/tests/fetch/api/resources/utils.js b/testing/web-platform/tests/fetch/api/resources/utils.js
index f97050dc8797..a0235fef99f0 100644
--- a/testing/web-platform/tests/fetch/api/resources/utils.js
+++ b/testing/web-platform/tests/fetch/api/resources/utils.js
@@ -72,3 +72,11 @@ function validateStreamFromString(reader, expectedValue, retrievedArrayBuffer) {
     validateBufferFromString(retrievedArrayBuffer, expectedValue, "Retrieve and verify stream");
   });
 }
+
+// From streams tests
+function delay(milliseconds)
+{
+  return new Promise(function(resolve) {
+    step_timeout(resolve, milliseconds);
+  });
+}
diff --git a/testing/web-platform/tests/fetch/api/response/response-cancel-stream.html b/testing/web-platform/tests/fetch/api/response/response-cancel-stream.html
new file mode 100644
index 000000000000..2a02e1f60ac9
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-cancel-stream.html
@@ -0,0 +1,66 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Response consume blob and http bodies</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script src="../resources/utils.js"></script>
+    <script>
+
+promise_test(function(test) {
+    return new Response(new Blob([], { "type" : "text/plain" })).body.cancel();
+}, "Cancelling a starting blob Response stream");
+
+promise_test(function(test) {
+    var response = new Response(new Blob(["This is data"], { "type" : "text/plain" }));
+    var reader = response.body.getReader();
+    reader.read();
+    return reader.cancel();
+}, "Cancelling a loading blob Response stream");
+
+promise_test(function(test) {
+    var response = new Response(new Blob(["T"], { "type" : "text/plain" }));
+    var reader = response.body.getReader();
+
+    var closedPromise = reader.closed.then(function() {
+        return reader.cancel();
+    });
+    reader.read();
+    return closedPromise;
+}, "Cancelling a closed blob Response stream");
+
+promise_test(function(test) {
+    return fetch(RESOURCES_DIR + "trickle.py?ms=30&count=100").then(function(response) {
+        return response.body.cancel();
+    });
+}, "Cancelling a starting Response stream");
+
+promise_test(function() {
+    return fetch(RESOURCES_DIR + "trickle.py?ms=30&count=100").then(function(response) {
+        var reader = response.body.getReader();
+        return reader.read().then(function() {
+            return reader.cancel();
+        });
+    });
+}, "Cancelling a loading Response stream");
+
+promise_test(function() {
+    return fetch(RESOURCES_DIR + "top.txt").then(function(response) {
+        var reader = response.body.getReader();
+        var closedPromise = reader.closed.then(function() {
+            return reader.cancel();
+        });
+        reader.read();
+        return closedPromise;
+    });
+}, "Cancelling a closed Response stream");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-consume-stream.html b/testing/web-platform/tests/fetch/api/response/response-consume-stream.html
new file mode 100644
index 000000000000..ee332e1783cb
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-consume-stream.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Response consume</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="../resources/utils.js"></script>
+  </head>
+  <body>
+    <script>
+
+promise_test(function(test) {
+    var body = "";
+    var response = new Response("");
+    return validateStreamFromString(response.body.getReader(), "");
+}, "Read empty text response's body as readableStream");
+
+promise_test(function(test) {
+    var response = new Response(new Blob([], { "type" : "text/plain" }));
+    return validateStreamFromString(response.body.getReader(), "");
+}, "Read empty blob response's body as readableStream");
+
+var formData = new FormData();
+formData.append("name", "value");
+var textData = JSON.stringify("This is response's body");
+var blob = new Blob([textData], { "type" : "text/plain" });
+
+promise_test(function(test) {
+    var response = new Response(blob);
+    return validateStreamFromString(response.body.getReader(), textData);
+}, "Read blob response's body as readableStream");
+
+promise_test(function(test) {
+    var response = new Response(textData);
+    return validateStreamFromString(response.body.getReader(), textData);
+}, "Read text response's body as readableStream");
+
+promise_test(function(test) {
+    var response = new Response(formData);
+    return validateStreamFromString(response.body.getReader(), "name=value");
+}, "Read form data response's body as readableStream");
+
+test(function() {
+    assert_equals(Response.error().body, null);
+}, "Getting an error Response stream");
+
+promise_test(function(test) {
+    assert_equals(Response.redirect(301).body, null);
+}, "Getting a redirect Response stream");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-1.html b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-1.html
new file mode 100644
index 000000000000..e9db8f77b9ba
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-1.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Consuming Response body after getting a ReadableStream</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+
+function createResponseWithReadableStream(callback) {
+    return fetch("../resources/data.json").then(function(response) {
+        var reader = response.body.getReader();
+        reader.releaseLock();
+        return callback(response);
+    });
+}
+
+promise_test(function() {
+    return createResponseWithReadableStream(function(response) {
+        return response.blob().then(function(blob) {
+            assert_true(blob instanceof Blob);
+        });
+    });
+}, "Getting blob after getting the Response body - not disturbed, not locked");
+
+promise_test(function() {
+    return createResponseWithReadableStream(function(response) {
+        return response.text().then(function(text) {
+            assert_true(text.length > 0);
+        });
+    });
+}, "Getting text after getting the Response body - not disturbed, not locked");
+
+promise_test(function() {
+    return createResponseWithReadableStream(function(response) {
+        return response.json().then(function(json) {
+            assert_true(typeof json === "object");
+        });
+    });
+}, "Getting json after getting the Response body - not disturbed, not locked");
+
+promise_test(function() {
+    return createResponseWithReadableStream(function(response) {
+        return response.arrayBuffer().then(function(arrayBuffer) {
+            assert_true(arrayBuffer.byteLength > 0);
+        });
+    });
+}, "Getting arrayBuffer after getting the Response body - not disturbed, not locked");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-2.html b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-2.html
new file mode 100644
index 000000000000..a1e2f3f24f30
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-2.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Consuming Response body after getting a ReadableStream</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+
+function createResponseWithLockedReadableStream(callback) {
+    return fetch("../resources/data.json").then(function(response) {
+        var reader = response.body.getReader();
+        return callback(response);
+    });
+}
+
+promise_test(function(test) {
+    return createResponseWithLockedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.blob());
+    });
+}, "Getting blob after getting a locked Response body");
+
+promise_test(function(test) {
+    return createResponseWithLockedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.text());
+    });
+}, "Getting text after getting a locked Response body");
+
+promise_test(function(test) {
+    return createResponseWithLockedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.json());
+    });
+}, "Getting json after getting a locked Response body");
+
+promise_test(function(test) {
+    return createResponseWithLockedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.arrayBuffer());
+    });
+}, "Getting arrayBuffer after getting a locked Response body");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-3.html b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-3.html
new file mode 100644
index 000000000000..8d9212514f3f
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-3.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Consuming Response body after getting a ReadableStream</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+
+function createResponseWithDisturbedReadableStream(callback) {
+    return fetch("../resources/data.json").then(function(response) {
+        var reader = response.body.getReader();
+        reader.read();
+        return callback(response);
+    });
+}
+
+promise_test(function(test) {
+    return createResponseWithDisturbedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.blob());
+    });
+}, "Getting blob after reading the Response body");
+
+promise_test(function(test) {
+    return createResponseWithDisturbedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.text());
+    });
+}, "Getting text after reading the Response body");
+
+promise_test(function(test) {
+    return createResponseWithDisturbedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.json());
+    });
+}, "Getting json after reading the Response body");
+
+promise_test(function(test) {
+    return createResponseWithDisturbedReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.arrayBuffer());
+    });
+}, "Getting arrayBuffer after reading the Response body");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-4.html b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-4.html
new file mode 100644
index 000000000000..e74699211d80
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-4.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Consuming Response body after getting a ReadableStream</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+
+function createResponseWithCancelledReadableStream(callback) {
+    return fetch("../resources/data.json").then(function(response) {
+        response.body.cancel();
+        return callback(response);
+    });
+}
+
+promise_test(function(test) {
+    return createResponseWithCancelledReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.blob());
+    });
+}, "Getting blob after cancelling the Response body");
+
+promise_test(function(test) {
+    return createResponseWithCancelledReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.text());
+    });
+}, "Getting text after cancelling the Response body");
+
+promise_test(function(test) {
+    return createResponseWithCancelledReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.json());
+    });
+}, "Getting json after cancelling the Response body");
+
+promise_test(function(test) {
+    return createResponseWithCancelledReadableStream(function(response) {
+        return promise_rejects(test, new TypeError(), response.arrayBuffer());
+    });
+}, "Getting arrayBuffer after cancelling the Response body");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-5.html b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-5.html
new file mode 100644
index 000000000000..546b7b88801e
--- /dev/null
+++ b/testing/web-platform/tests/fetch/api/response/response-stream-disturbed-5.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Consuming Response body after getting a ReadableStream</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+    <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+
+promise_test(function() {
+    return fetch("../resources/data.json").then(function(response) {
+        response.blob();
+        assert_not_equals(response.body, null);
+        assert_throws(new TypeError(), function() { response.body.getReader(); });
+    });
+}, "Getting a body reader after consuming as blob");
+
+promise_test(function() {
+    return fetch("../resources/data.json").then(function(response) {
+        response.text();
+        assert_not_equals(response.body, null);
+        assert_throws(new TypeError(), function() { response.body.getReader(); });
+    });
+}, "Getting a body reader after consuming as text");
+
+promise_test(function() {
+    return fetch("../resources/data.json").then(function(response) {
+        response.json();
+        assert_not_equals(response.body, null);
+        assert_throws(new TypeError(), function() { response.body.getReader(); });
+    });
+}, "Getting a body reader after consuming as json");
+
+promise_test(function() {
+    return fetch("../resources/data.json").then(function(response) {
+        response.arrayBuffer();
+        assert_not_equals(response.body, null);
+        assert_throws(new TypeError(), function() { response.body.getReader(); });
+    });
+}, "Getting a body reader after consuming as arrayBuffer");
+
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/html-media-capture/OWNERS b/testing/web-platform/tests/html-media-capture/OWNERS
index 29bb4ff0811a..b45f53558b6e 100644
--- a/testing/web-platform/tests/html-media-capture/OWNERS
+++ b/testing/web-platform/tests/html-media-capture/OWNERS
@@ -1,3 +1,2 @@
-@foolip
 @haoxli
 @zqzhang
diff --git a/testing/web-platform/tests/html/OWNERS b/testing/web-platform/tests/html/OWNERS
index 1419ab7b547b..c98635fc6843 100644
--- a/testing/web-platform/tests/html/OWNERS
+++ b/testing/web-platform/tests/html/OWNERS
@@ -1,5 +1,5 @@
+@ayg
 @Ms2ger
-@foolip
 @gsnedders
 @jdm
 @jgraham
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html b/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
index fcb7288c8f8d..ace09e57454f 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
@@ -6,9 +6,9 @@
 <div id="log"></div>
 <script>
 test(function () {
-  assert_throws('NotSupportedError', function() {
-    document.createEvent('PopStateEvent');
-  }, 'document.createEvent("PopStateEvent") should not be supported');
+  var e = document.createEvent('PopStateEvent');
+  var eProto = Object.getPrototypeOf(e);
+  assert_equals(eProto, PopStateEvent.prototype);
 }, 'document.createEvent');
 
 test(function () {
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.body.html
similarity index 73%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.body.html
index 90ca7e59a034..07f1edf939c6 100644
--- a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html
+++ b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.body.html
@@ -118,4 +118,52 @@ test(function() {
   doc.appendChild(doc.createElementNS("http://example.org/test", "frameset"));
   assert_equals(doc.body, null);
 }, "Non-HTML frameset as the root node");
+
+test(function() {
+  assert_not_equals(document.body, null);
+  assert_true(document.body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+  assert_equals(document.body.tagName, "BODY");
+}, "existing document's body");
+
+
+var originalBody = document.body;
+test(function() {
+  assert_throws(new TypeError(), function() {
+    document.body = "text"
+  })
+  assert_equals(document.body, originalBody);
+}, "Setting document.body to a string.")
+test(function() {
+  assert_throws("HierarchyRequestError", function() {
+    document.body = document.createElement("div")
+  })
+  assert_equals(document.body, originalBody);
+}, "Setting document.body to a div element.")
+test(function() {
+  var doc = createDocument();
+  assert_throws("HierarchyRequestError", function() {
+    doc.body = doc.createElement("body")
+  })
+  assert_equals(doc.body, null);
+}, "Setting document.body when there's no root element.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument();
+
+  var new_body = doc.createElement("body");
+  assert_true(new_body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+  assert_equals(new_body.tagName, "BODY");
+
+  doc.body = new_body;
+  assert_equals(doc.body, new_body);
+}, "Setting document.body to a new body element.");
+test(function() {
+  var doc = document.implementation.createHTMLDocument();
+
+  var new_frameset = doc.createElement("frameset");
+  assert_true(new_frameset instanceof HTMLFrameSetElement, "should be HTMLFrameSetElement");
+  assert_equals(new_frameset.tagName, "FRAMESET");
+
+  doc.body = new_frameset;
+  assert_equals(doc.body, new_frameset, "test6-3, append frameset to a new document");
+}, "Setting document.body to a new frameset element.");
 </script>
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html
deleted file mode 100644
index f3a1638116c0..000000000000
--- a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<title>Setting document.body to incorrect values</title>
-<link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-body">
-<link rel="help" href="https://heycam.github.io/webidl/#es-interface">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<script>
-var originalBody = document.body;
-test(function() {
-  assert_throws(new TypeError(), function() {
-    document.body = "text"
-  })
-}, "Should throw a TypeError when trying to set document.body to a string.")
-test(function() {
-  assert_throws("HierarchyRequestError", function() {
-    document.body = document.createElement("div")
-  })
-}, "Should throw a HierarchyRequestError when trying to set document.body to a div element.")
-test(function() {
-  var doc = document.implementation.createHTMLDocument("")
-  doc.removeChild(doc.documentElement)
-  assert_throws("HierarchyRequestError", function() {
-    doc.body = document.createElement("body")
-  })
-}, "Should throw a HierarchyRequestError when trying to set document.body when there's no root element.")
-test(function() {
-  assert_equals(document.body, originalBody);
-}, "document.body has not changed")
-</script>
diff --git a/testing/web-platform/tests/html/dom/elements-embedded.js b/testing/web-platform/tests/html/dom/elements-embedded.js
index 1c45e5ba7016..18ca94e9be36 100644
--- a/testing/web-platform/tests/html/dom/elements-embedded.js
+++ b/testing/web-platform/tests/html/dom/elements-embedded.js
@@ -115,7 +115,7 @@ var embeddedElements = {
     media: "string"
   },
   track: {
-    kind: {type: "enum", keywords: ["subtitles", "captions", "descriptions", "chapters", "metadata"], defaultVal: "captions"},
+    kind: {type: "enum", keywords: ["subtitles", "captions", "descriptions", "chapters", "metadata"], defaultVal: "subtitles", invalidVal: "metadata"},
     src: "url",
     srclang: "string",
     label: "string",
diff --git a/testing/web-platform/tests/html/dom/elements-metadata.js b/testing/web-platform/tests/html/dom/elements-metadata.js
index 1a8285bc3384..f1fdd321bebe 100644
--- a/testing/web-platform/tests/html/dom/elements-metadata.js
+++ b/testing/web-platform/tests/html/dom/elements-metadata.js
@@ -9,7 +9,7 @@ var metadataElements = {
   link: {
     // Conforming
     href: "url",
-    crossOrigin: {type: "enum", keywords: ["anonymous", "use-credentials"], nonCanon:{"": "anonymous"}},
+    crossOrigin: {type: "enum", keywords: ["anonymous", "use-credentials"], nonCanon:{"": "anonymous"}, isNullable: true, defaultVal: null, invalidVal: "anonymous"},
     rel: "string",
     relList: {type: "tokenlist", domAttrName: "rel"},
     media: "string",
diff --git a/testing/web-platform/tests/html/dom/elements-tabular.js b/testing/web-platform/tests/html/dom/elements-tabular.js
index 9feff99f105f..ac38b335c379 100644
--- a/testing/web-platform/tests/html/dom/elements-tabular.js
+++ b/testing/web-platform/tests/html/dom/elements-tabular.js
@@ -74,6 +74,8 @@ var tabularElements = {
     colSpan: {type: "unsigned long", defaultVal: 1},
     rowSpan: {type: "unsigned long", defaultVal: 1},
     headers: "settable tokenlist",
+    scope: {type: "enum", keywords: ["row", "col", "rowgroup", "colgroup"]},
+    abbr: "string",
 
     // HTMLTableCellElement (Obsolete)
     align: "string",
@@ -85,15 +87,14 @@ var tabularElements = {
     noWrap: "boolean",
     vAlign: "string",
     bgColor: {type: "string", treatNullAsEmptyString: true},
-
-    // HTMLTableDataCellElement (Obsolete)
-    abbr: "string",
   },
   th: {
     // HTMLTableCellElement (Conforming)
     colSpan: {type: "unsigned long", defaultVal: 1},
     rowSpan: {type: "unsigned long", defaultVal: 1},
     headers: "settable tokenlist",
+    scope: {type: "enum", keywords: ["row", "col", "rowgroup", "colgroup"]},
+    abbr: "string",
 
     // HTMLTableCellElement (Obsolete)
     align: "string",
@@ -105,15 +106,6 @@ var tabularElements = {
     noWrap: "boolean",
     vAlign: "string",
     bgColor: {type: "string", treatNullAsEmptyString: true},
-
-    // HTMLTableHeaderCellElement (Conforming)
-    // TODO: double-check that the way we're treating missing value
-    // defaults is consistent here.  scope has an auto state with no
-    // associated keyword, which is the missing value default -- is this
-    // the right syntax for that?
-    scope: {type: "enum", keywords: ["row", "col", "rowgroup", "colgroup"]},
-    abbr: "string",
-    sorted: "string",
   },
 };
 
diff --git a/testing/web-platform/tests/html/dom/interfaces.html b/testing/web-platform/tests/html/dom/interfaces.html
index 1988bd49d3f9..9886e7538f43 100644
--- a/testing/web-platform/tests/html/dom/interfaces.html
+++ b/testing/web-platform/tests/html/dom/interfaces.html
@@ -1557,23 +1557,15 @@ interface HTMLTableRowElement : HTMLElement {
   // also has obsolete members
 };
 
-interface HTMLTableDataCellElement : HTMLTableCellElement {
-  // also has obsolete members
-};
-
-interface HTMLTableHeaderCellElement : HTMLTableCellElement {
-           attribute DOMString scope;
-           attribute DOMString abbr;
-           attribute DOMString sorted;
-  void sort();
-};
-
 interface HTMLTableCellElement : HTMLElement {
-           attribute unsigned long colSpan;
-           attribute unsigned long rowSpan;
-  [PutForwards=value] readonly attribute DOMTokenList headers;
+  [CEReactions] attribute unsigned long colSpan;
+  [CEReactions] attribute unsigned long rowSpan;
+  [CEReactions, SameObject, PutForwards=value] readonly attribute DOMTokenList headers;
   readonly attribute long cellIndex;
 
+  [CEReactions] attribute DOMString scope; // only conforming for th elements
+  [CEReactions] attribute DOMString abbr;  // only conforming for th elements
+
   // also has obsolete members
 };
 
@@ -1960,6 +1952,15 @@ interface HTMLTemplateElement : HTMLElement {
   readonly attribute DocumentFragment content;
 };
 
+interface HTMLSlotElement : HTMLElement {
+  /*[CEReactions]*/ attribute DOMString name;
+  sequence<Node> assignedNodes(optional AssignedNodesOptions options);
+};
+
+dictionary AssignedNodesOptions {
+  boolean flatten = false;
+};
+
 typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
 
 interface HTMLCanvasElement : HTMLElement {
@@ -3128,10 +3129,6 @@ partial interface HTMLTableCellElement {
   [TreatNullAs=EmptyString] attribute DOMString bgColor;
 };
 
-partial interface HTMLTableDataCellElement {
-           attribute DOMString abbr;
-};
-
 partial interface HTMLTableRowElement {
            attribute DOMString align;
            attribute DOMString ch;
@@ -3204,60 +3201,8 @@ window.onload = function() {
     Transferable: [],
     Document: ['iframe.contentDocument', 'new Document()'],
     XMLDocument: ['document.implementation.createDocument(null, "", null)'],
-    HTMLElement: [
-      'document.createElement("noscript")',
-      'document.createElement("section")',
-      'document.createElement("nav")',
-      'document.createElement("article")',
-      'document.createElement("aside")',
-      'document.createElement("hgroup")',
-      'document.createElement("header")',
-      'document.createElement("footer")',
-      'document.createElement("address")',
-      'document.createElement("dt")',
-      'document.createElement("dd")',
-      'document.createElement("figure")',
-      'document.createElement("figcaption")',
-      'document.createElement("em")',
-      'document.createElement("strong")',
-      'document.createElement("small")',
-      'document.createElement("s")',
-      'document.createElement("cite")',
-      'document.createElement("dfn")',
-      'document.createElement("abbr")',
-      'document.createElement("code")',
-      'document.createElement("var")',
-      'document.createElement("samp")',
-      'document.createElement("kbd")',
-      'document.createElement("sub")',
-      'document.createElement("sup")',
-      'document.createElement("i")',
-      'document.createElement("b")',
-      'document.createElement("u")',
-      'document.createElement("mark")',
-      'document.createElement("ruby")',
-      'document.createElement("rt")',
-      'document.createElement("rp")',
-      'document.createElement("bdi")',
-      'document.createElement("bdo")',
-      'document.createElement("wbr")',
-      'document.createElement("summary")',
-      'document.createElement("acronym")',
-      'document.createElement("plaintext")',
-    ],
-    HTMLUnknownElement: [
-      'document.createElement("blink")',
-      'document.createElement("quasit")',
-      'document.createElement("bgsound")',
-      'document.createElement("isindex")',
-      'document.createElement("multicol")',
-      'document.createElement("nextid")',
-      'document.createElement("rb")',
-      'document.createElement("spacer")',
-      'document.createElement("basefont")',
-      'document.createElement("directory")',
-      'document.createElement("mod")',
-    ],
+    HTMLElement: ['document.createElement("noscript")'], // more tests in html/semantics/interfaces.js
+    HTMLUnknownElement: ['document.createElement("bgsound")'], // more tests in html/semantics/interfaces.js
     HTMLHtmlElement: ['document.createElement("html")'],
     HTMLHeadElement: ['document.createElement("head")'],
     HTMLTitleElement: ['document.createElement("title")'],
@@ -3267,14 +3212,7 @@ window.onload = function() {
     HTMLStyleElement: ['document.createElement("style")'],
     HTMLScriptElement: ['document.createElement("script")'],
     HTMLBodyElement: ['document.createElement("body")'],
-    HTMLHeadingElement: [
-      'document.createElement("h1")',
-      'document.createElement("h2")',
-      'document.createElement("h3")',
-      'document.createElement("h4")',
-      'document.createElement("h5")',
-      'document.createElement("h6")',
-    ],
+    HTMLHeadingElement: ['document.createElement("h1")'],
     HTMLParagraphElement: ['document.createElement("p")'],
     HTMLHRElement: ['document.createElement("hr")'],
     HTMLPreElement: [
@@ -3324,6 +3262,8 @@ window.onload = function() {
     DataCue: [],
     TimeRanges: ['document.createElement("video").buffered'],
     TrackEvent: ['new TrackEvent("addtrack"; {track:document.createElement("track").track})'],
+    HTMLTemplateElement: ['document.createElement("template")'],
+    HTMLSlotElement: ['document.createElement("slot")'],
     HTMLCanvasElement: ['document.createElement("canvas")'],
     CanvasRenderingContext2D: ['document.createElement("canvas").getContext("2d")'],
     CanvasGradient: [],
@@ -3344,9 +3284,10 @@ window.onload = function() {
       'document.createElement("tfoot")',
     ],
     HTMLTableRowElement: ['document.createElement("tr")'],
-    HTMLTableDataCellElement: ['document.createElement("td")'],
-    HTMLTableHeaderCellElement: ['document.createElement("th")'],
-    HTMLTableCellElement: [],
+    HTMLTableCellElement: [
+      'document.createElement("td")',
+      'document.createElement("th")',
+    ],
     HTMLFormElement: ['document.createElement("form")'],
     HTMLFieldsetElement: ['document.createElement("fieldset")'],
     HTMLLegendElement: ['document.createElement("legend")'],
@@ -3364,7 +3305,6 @@ window.onload = function() {
     HTMLMeterElement: ['document.createElement("meter")'],
     ValidityState: ['document.createElement("input").validity'],
     HTMLDetailsElement: ['document.createElement("details")'],
-    HTMLCommandElement: ['document.createElement("command")'],
     HTMLMenuElement: ['document.createElement("menu")'],
     Window: ['window'],
     BarProp: [],
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
index 8e2fbe7b0020..38364cd3e654 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
@@ -8,11 +8,46 @@
 <div id="log"></div>
 <script>
 test(function() {
-  document.documentElement.removeChild(document.body);
+  document.fgColor = "green";
+  document.bgColor = "green";
+  document.linkColor = "green";
+  document.vlinkColor = "green";
+  document.alinkColor = "green";
+
+  var body = document.documentElement.removeChild(document.body);
+
+  // When there is no body element, the color attributes return an
+  // empty string upon getting.
   assert_equals(document.fgColor, "");
   assert_equals(document.bgColor, "");
   assert_equals(document.linkColor, "");
   assert_equals(document.vlinkColor, "");
   assert_equals(document.alinkColor, "");
-})
+
+  // Re-add body and reset color attributes.
+  document.body = body;
+  document.fgColor = "";
+  document.bgColor = "";
+  document.linkColor = "";
+  document.vlinkColor = "";
+  document.alinkColor = "";
+}, "getting document color attributes with no body");
+
+test(function() {
+  var body = document.documentElement.removeChild(document.body);
+
+  // When there is no body element, setting the color attributes has no effect.
+  document.fgColor = "red";
+  document.bgColor = "red";
+  document.linkColor = "red";
+  document.vlinkColor = "red";
+  document.alinkColor = "red";
+  assert_equals(document.fgColor, "");
+  assert_equals(document.bgColor, "");
+  assert_equals(document.linkColor, "");
+  assert_equals(document.vlinkColor, "");
+  assert_equals(document.alinkColor, "");
+
+  document.body = body;
+}, "setting document color attributes with no body");
 </script>
diff --git a/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html
new file mode 100644
index 000000000000..cdc4647534ac
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Verify that canvases are scaled up to their computed size</title>
+<link rel="match" href="canvas_scale_ref.html">
+<style>
+canvas {
+  width: 20px;
+  height: 20px;
+}
+div {
+  line-height: 0;
+}
+</style>
+<div><canvas width="16" height="16" data-color="#FF00FF"></canvas><canvas width="16" height="16" data-color="#00FF00"></canvas></div>
+<div><canvas width="16" height="16" data-color="#0000FF"></canvas><canvas width="16" height="16" data-color="#FF00FF"></canvas></div>
+<script>
+var canvases = document.getElementsByTagName('canvas');
+for (var i = 0; i < canvases.length; i++) {
+  var ctx = canvases[i].getContext('2d');
+  ctx.fillStyle = canvases[i].getAttribute('data-color');
+  ctx.fillRect(0, 0, 16, 16);
+}
+</script>
diff --git a/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html
new file mode 100644
index 000000000000..2d1756f856a9
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<style>
+span {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+}
+div {
+  line-height: 0;
+}
+</style>
+<div><span style="background-color: #FF00FF"></span><span style="background-color: #00FF00"></span></div>
+<div><span style="background-color: #0000FF"></span><span style="background-color: #FF00FF"></span></div>
diff --git a/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html
new file mode 100644
index 000000000000..b7398f8d59c5
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="match" href="canvas_without_context_ref.html">
+<style>
+  div {
+    background-color: green;
+    width: 20px;
+    height: 20px;
+  }
+</style>
+</head>
+<body>
+<div><canvas width="20" height="20"></canvas></div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html
new file mode 100644
index 000000000000..ae0c9c8c8e05
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<style>
+  div {
+    background-color: green;
+    width: 20px;
+    height: 20px;
+  }
+</style>
+</head>
+<body>
+<div></div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-0/submit-entity-body.html b/testing/web-platform/tests/html/semantics/forms/form-submission-0/submit-entity-body.html
new file mode 100644
index 000000000000..a94244c7e67a
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/form-submission-0/submit-entity-body.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+var simple_tests = [
+  {
+    name: "form submission should navigate to url with x-www-form-urlencoded",
+    input: "<input name=foo value=bara>",
+    enctype: "application/x-www-form-urlencoded"
+  },
+  {
+    name: "form submission should navigate to url with multipart/form-data",
+    input: "<textarea name=foo>bar</textarea>",
+    enctype: "multipart/form-data"
+  },
+];
+simple_tests.forEach(function(test_obj) {
+  test_obj.test = async_test(test_obj.name);
+});
+function run_simple_test() {
+  if (simple_tests.length == 0) {
+    return;
+  }
+  var test_obj = simple_tests.pop();
+  var t = test_obj.test;
+  var testframe = document.getElementById("testframe");
+  var testdocument = testframe.contentWindow.document;
+  testdocument.body.innerHTML =
+    "<form id=testform method=post action=\"form-submission.py\" enctype=\"" + test_obj.enctype + "\">" +
+    test_obj.input +
+    "</form>";
+  testframe.onload = function() {
+    t.step(function (){
+      var response = testframe.contentDocument.documentElement.textContent;
+      assert_equals(response, "OK");
+    });
+    t.done();
+    run_simple_test();
+  };
+  testdocument.getElementById("testform").submit();
+}
+</script>
+<iframe id=testframe src="/common/blank.html" onload="run_simple_test();"></iframe>
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html
index 051859d5acab..8eaec42e9cf0 100644
--- a/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html
@@ -90,7 +90,7 @@
     assert_true(click_fired, "input event should fire after click event");
     assert_false(change_fired, "input event should fire before change event");
     assert_true(e.bubbles, "input event should bubble")
-    assert_true(e.isTrusted, "click()-initiated input event should be trusted");
+    assert_false(e.isTrusted, "click()-initiated input event shouldn't be trusted");
     assert_false(e.cancelable, "input event should not be cancelable");
   });
 
@@ -99,7 +99,7 @@
     assert_true(click_fired, "change event should fire after click event");
     assert_true(input_fired, "change event should fire after input event");
     assert_true(e.bubbles, "change event should bubble")
-    assert_true(e.isTrusted, "click()-initiated change event should be trusted");
+    assert_false(e.isTrusted, "click()-initiated change event shouldn't be trusted");
     assert_false(e.cancelable, "change event should not be cancelable");
   });
 
diff --git a/testing/web-platform/tests/html/semantics/interfaces.html b/testing/web-platform/tests/html/semantics/interfaces.html
index c08fea82e523..c8a9bed85a10 100644
--- a/testing/web-platform/tests/html/semantics/interfaces.html
+++ b/testing/web-platform/tests/html/semantics/interfaces.html
@@ -9,9 +9,16 @@
 <script src=interfaces.js></script>
 <div id="log"></div>
 <script>
-function do_test(local_name, iface) {
+function do_test(local_name, iface, variant) {
   test(function() {
-    var e = document.createElement(local_name), i = "HTML" + iface + "Element";
+    var e;
+    var i = "HTML" + iface + "Element";
+    if (variant === "useNS") {
+      // Use createElementNS here to preserve the case of local_name.
+      e = document.createElementNS("http://www.w3.org/1999/xhtml", local_name);
+    } else {
+      e = document.createElement(local_name);
+    }
     assert_class_string(e, i,
                         "Element " + local_name + " should have " + i +
                         " as its primary interface.");
@@ -27,7 +34,13 @@ function do_test(local_name, iface) {
 }
 
 elements.forEach(function(a) {
-  do_test(a[0], a[1]);
-  do_test(a[0].toUpperCase(), a[1]);
+  do_test(a[0], a[1], "useNS");
+
+  // Only run the createElement variant if the input is all-lowercase, because createElement
+  // case-folds to lowercase. Custom elements are required to use all-lowercase to implement
+  // HTMLElement, otherwise they use HTMLUnknownElement per spec. Example: "foo-BAR".
+  if (a[0] === a[0].toLowerCase()) {
+    do_test(a[0].toUpperCase(), a[1]);
+  }
 })
 </script>
diff --git a/testing/web-platform/tests/html/semantics/interfaces.js b/testing/web-platform/tests/html/semantics/interfaces.js
index bead725fb700..66cfce4859b4 100644
--- a/testing/web-platform/tests/html/semantics/interfaces.js
+++ b/testing/web-platform/tests/html/semantics/interfaces.js
@@ -1,12 +1,17 @@
 var elements = [
+  ["a", "Anchor"],
   ["abbr", ""],
   ["acronym", ""],
   ["address", ""],
   ["applet", "Applet"],
+  ["area", "Area"],
+  ["article", ""],
+  ["aside", ""],
   ["audio", "Audio"],
   ["b", ""],
   ["base", "Base"],
-  ["basefont", "Unknown"],
+  ["basefont", ""],
+  ["bdi", ""],
   ["bdo", ""],
   ["bgsound", "Unknown"],
   ["big", ""],
@@ -22,17 +27,29 @@ var elements = [
   ["code", ""],
   ["col", "TableCol"],
   ["colgroup", "TableCol"],
+  ["command", "Unknown"],
+  ["data", "Data"],
+  ["datalist", "DataList"],
   ["dd", ""],
   ["del", "Mod"],
+  ["details", "Details"],
   ["dfn", ""],
+  ["dialog", "Dialog"],
   ["dir", "Directory"],
+  ["directory", "Unknown"],
   ["div", "Div"],
   ["dl", "DList"],
   ["dt", ""],
   ["em", ""],
   ["embed", "Embed"],
   ["fieldset", "FieldSet"],
+  ["figcaption", ""],
+  ["figure", ""],
   ["font", "Font"],
+  ["foo-BAR", "Unknown"], // not a valid custom element name
+  ["foo-bar", ""], // valid custom element name
+  ["foo", "Unknown"],
+  ["footer", ""],
   ["form", "Form"],
   ["frame", "Frame"],
   ["frameset", "FrameSet"],
@@ -43,6 +60,8 @@ var elements = [
   ["h5", "Heading"],
   ["h6", "Heading"],
   ["head", "Head"],
+  ["header", ""],
+  ["hgroup", ""],
   ["hr", "HR"],
   ["html", "Html"],
   ["i", ""],
@@ -59,11 +78,18 @@ var elements = [
   ["li", "LI"],
   ["link", "Link"],
   ["listing", "Pre"],
+  ["main", ""],
   ["map", "Map"],
+  ["mark", ""],
   ["marquee", "Marquee"],
   ["menu", "Menu"],
+  ["menuitem", "MenuItem"],
   ["meta", "Meta"],
+  ["meter", "Meter"],
+  ["mod", "Unknown"],
   ["multicol", "Unknown"],
+  ["nav", ""],
+  ["nextid", "Unknown"],
   ["nobr", ""],
   ["noembed", ""],
   ["noframes", ""],
@@ -72,15 +98,26 @@ var elements = [
   ["ol", "OList"],
   ["optgroup", "OptGroup"],
   ["option", "Option"],
+  ["output", "Output"],
   ["p", "Paragraph"],
   ["param", "Param"],
+  ["picture", "Picture"],
   ["plaintext", ""],
   ["pre", "Pre"],
+  ["progress", "Progress"],
   ["q", "Quote"],
+  ["quasit", "Unknown"],
+  ["rb", ""],
+  ["rp", ""],
+  ["rt", ""],
+  ["rtc", ""],
+  ["ruby", ""],
   ["s", ""],
   ["samp", ""],
   ["script", "Script"],
+  ["section", ""],
   ["select", "Select"],
+  ["slot", "Slot"],
   ["small", ""],
   ["source", "Source"],
   ["spacer", "Unknown"],
@@ -89,16 +126,19 @@ var elements = [
   ["strong", ""],
   ["style", "Style"],
   ["sub", ""],
+  ["summary", ""],
   ["sup", ""],
   ["table", "Table"],
   ["tbody", "TableSection"],
-  ["td", "TableDataCell"],
+  ["td", "TableCell"],
   ["textarea", "TextArea"],
   ["tfoot", "TableSection"],
-  ["th", "TableHeaderCell"],
+  ["th", "TableCell"],
   ["thead", "TableSection"],
+  ["time", "Time"],
   ["title", "Title"],
   ["tr", "TableRow"],
+  ["track", "Track"],
   ["tt", ""],
   ["u", ""],
   ["ul", "UList"],
@@ -106,35 +146,5 @@ var elements = [
   ["video", "Video"],
   ["wbr", ""],
   ["xmp", "Pre"],
-  ["section", ""],
-  ["nav", ""],
-  ["article", ""],
-  ["aside", ""],
-  ["hgroup", ""],
-  ["header", ""],
-  ["footer", ""],
-  ["time", "Time"],
-  ["mark", ""],
-  ["progress", "Progress"],
-  ["meter", "Meter"],
-  ["ruby", ""],
-  ["rb", ""],
-  ["rt", ""],
-  ["rtc", ""],
-  ["rp", ""],
-  ["figure", ""],
-  ["datalist", "DataList"],
-  ["output", "Output"],
-  ["details", "Details"],
-  ["command", "Command"],
-  ["nextid", "Unknown"],
-  ["bdi", ""],
-  ["data", "Data"],
-  ["a", "Anchor"],
-  ["area", "Area"],
-  ["dialog", "Dialog"],
-  ["figcaption", ""],
-  ["summary", ""],
-  ["track", "Track"],
-  ["foo", "Unknown"]
+  ["å-bar", "Unknown"], // not a valid custom element name
 ];
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html
new file mode 100644
index 000000000000..a2671a78f69c
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>JS is disabled on documents created without a browsing context</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-n-script">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function(t) {
+  var doc = document.implementation.createHTMLDocument();
+  window.fail_test = t.unreached_func('should not have been called');
+
+  var script = doc.createElement('script');
+  script.textContent = 'fail_test();';
+  doc.documentElement.appendChild(script);
+}, 'script on document returned by createHTMLDocument should not execute');
+</script>
diff --git a/testing/web-platform/tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html b/testing/web-platform/tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html
new file mode 100644
index 000000000000..0153a72d3c03
--- /dev/null
+++ b/testing/web-platform/tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<title>innerHTML getter for pre/textarea/listing with initial LF</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id="outer">
+<div id="inner">
+<pre id="pre1">
+x</pre>
+<pre id="pre2">
+
+x</pre>
+<textarea id="textarea1">
+x</textarea>
+<textarea id="textarea2">
+
+x</textarea>
+<listing id="listing1">
+x</listing>
+<listing id="listing2">
+
+x</listing>
+</div>
+</div>
+
+<script>
+var expected_outer = '\n<div id="inner">\n<pre id="pre1">x</pre>\n<pre id="pre2">\n\nx</pre>\n<textarea id="textarea1">x</textarea>\n<textarea id="textarea2">\n\nx</textarea>\n<listing id="listing1">x</listing>\n<listing id="listing2">\n\nx</listing>\n</div>\n';
+var expected_inner = expected_outer.replace('\n<div id="inner">', '').replace('</div>\n', '');
+var expected_1 = 'x';
+var expected_2 = '\nx';
+
+test(function() {
+  assert_equals(outer.innerHTML, expected_outer);
+}, 'outer div');
+
+test(function() {
+  assert_equals(inner.innerHTML, expected_inner);
+}, 'inner div');
+
+['pre', 'textarea', 'listing'].forEach(function(tag) {
+  test(function() {
+    assert_equals(document.getElementById(tag + '1').innerHTML, expected_1);
+  }, tag + '1');
+
+  test(function() {
+    assert_equals(document.getElementById(tag + '2').innerHTML, expected_2);
+  }, tag + '2');
+});
+</script>
diff --git a/testing/web-platform/tests/html/webappapis/animation-frames/callback-invoked.html b/testing/web-platform/tests/html/webappapis/animation-frames/callback-invoked.html
index 1bf49c0335d9..ca34e455a21d 100644
--- a/testing/web-platform/tests/html/webappapis/animation-frames/callback-invoked.html
+++ b/testing/web-platform/tests/html/webappapis/animation-frames/callback-invoked.html
@@ -10,12 +10,8 @@
     <div id="log"></div>
     <script>
       async_test(function (t) {
-        t.step(function() {
-          assert_false(document.hidden, "document.hidden must be exist and be false to run this test properly");
-        });
-        window.requestAnimationFrame(function () {
-          t.step(function() { assert_true(true); t.done(); });
-        });
+        assert_false(document.hidden, "document.hidden must exist and be false to run this test properly");
+        window.requestAnimationFrame(t.step_func_done());
       }, "requestAnimationFrame callback is invoked at least once before the timeout");
     </script>
   </body>
diff --git a/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html b/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html
index f8c6e5ef03b9..f3848b5ad903 100644
--- a/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html
+++ b/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Event handlers processing algorithm</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script
+<script src="/resources/testharnessreport.js"></script>
  <body>
  <div id="foo" style="width: 100px; height: 100px; background-color: black"></div>
  <script>
diff --git a/testing/web-platform/tests/lint.whitelist b/testing/web-platform/tests/lint.whitelist
index 2ab4b9d8513d..86bbf6dbc317 100644
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -14,7 +14,6 @@ INDENT TABS: app-uri/*
 INDENT TABS: conformance-checkers/*
 INDENT TABS: content-security-policy/*
 INDENT TABS: custom-elements/*
-INDENT TABS: DOMEvents/*
 INDENT TABS: html/editing/dnd/*
 INDENT TABS: old-tests/*
 INDENT TABS: pointerlock/*
@@ -32,7 +31,6 @@ TRAILING WHITESPACE: battery-status/*
 TRAILING WHITESPACE: conformance-checkers/*
 TRAILING WHITESPACE: content-security-policy/*
 TRAILING WHITESPACE: custom-elements/*
-TRAILING WHITESPACE: DOMEvents/*
 TRAILING WHITESPACE: html-longdesc/*
 TRAILING WHITESPACE: microdata/*
 TRAILING WHITESPACE: old-tests/*
diff --git a/testing/web-platform/tests/media-source/OWNERS b/testing/web-platform/tests/media-source/OWNERS
index fa70c6cc1d20..93f1b9eb0155 100644
--- a/testing/web-platform/tests/media-source/OWNERS
+++ b/testing/web-platform/tests/media-source/OWNERS
@@ -1,5 +1,5 @@
 @bit
 @acolwell
-@foolip
 @shishimaru
 @sideshowbarker
+@wolenetz
diff --git a/testing/web-platform/tests/media-source/mediasource-preload.html b/testing/web-platform/tests/media-source/mediasource-preload.html
new file mode 100644
index 000000000000..91c4d9988856
--- /dev/null
+++ b/testing/web-platform/tests/media-source/mediasource-preload.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<!-- Copyright © 2016 Chromium authors and World Wide Web Consortium, (Massachusetts Institute of Technology, ERCIM, Keio University, Beihang). -->
+<html>
+    <head>
+        <title>Various MediaSource HTMLMediaElement preload tests.</title>
+        <link rel="author" title="Matthew Wolenetz" href="mailto:wolenetz@chromium.org"/>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+            function attachWithPreloadTest(preload)
+            {
+                async_test(function(test)
+                {
+                    var video = document.createElement("video");
+                    var mediaSource = new MediaSource();
+                    var mediaSourceURL = URL.createObjectURL(mediaSource);
+
+                    video.preload = preload;
+                    document.body.appendChild(video);
+                    test.add_cleanup(function() {
+                        document.body.removeChild(video);
+                        URL.revokeObjectURL(mediaSourceURL);
+                    });
+
+                    mediaSource.addEventListener("sourceopen", test.step_func_done());
+                    video.src = mediaSourceURL;
+                }, "sourceopen occurs with element preload=" + preload);
+            }
+
+            attachWithPreloadTest("auto");
+            attachWithPreloadTest("metadata");
+            attachWithPreloadTest("none");
+
+            function errorWithPreloadTest(preload, bogusURLStyle)
+            {
+                async_test(function(test)
+                {
+                    var mediaSource = new MediaSource();
+                    var bogusURL = URL.createObjectURL(mediaSource);
+
+                    if (bogusURLStyle == "corrupted") {
+                        var goodURL = bogusURL;
+                        test.add_cleanup(function() { URL.revokeObjectURL(goodURL); });
+                        bogusURL += "0";
+                    } else if (bogusURLStyle == "revoked") {
+                        URL.revokeObjectURL(bogusURL);
+                    } else {
+                        assert_unreached("invalid case");
+                    }
+
+                    var video = document.createElement("video");
+                    video.preload = preload;
+                    document.body.appendChild(video);
+                    test.add_cleanup(function() { document.body.removeChild(video); });
+
+                    mediaSource.addEventListener("sourceopen", test.unreached_func("'sourceopen' should not be fired"));
+
+                    video.onerror = test.step_func_done();
+                    video.src = bogusURL;
+                }, "error occurs with bogus blob URL (" + bogusURLStyle + " MediaSource object URL) and element preload=" + preload);
+            }
+
+            errorWithPreloadTest("auto", "revoked");
+            errorWithPreloadTest("metadata", "revoked");
+            errorWithPreloadTest("none", "revoked");
+
+            errorWithPreloadTest("auto", "corrupted");
+            errorWithPreloadTest("metadata", "corrupted");
+            errorWithPreloadTest("none", "corrupted");
+        </script>
+    </body>
+</html>
diff --git a/testing/web-platform/tests/media/OWNERS b/testing/web-platform/tests/media/OWNERS
index 96fa9523d7be..1df5d1ae68f8 100644
--- a/testing/web-platform/tests/media/OWNERS
+++ b/testing/web-platform/tests/media/OWNERS
@@ -1,2 +1 @@
 @hillbrad
-@foolip
diff --git a/testing/web-platform/tests/mediacapture-streams/MediaStream-MediaElement-preload-none.html b/testing/web-platform/tests/mediacapture-streams/MediaStream-MediaElement-preload-none.html
new file mode 100644
index 000000000000..ce97806a85ce
--- /dev/null
+++ b/testing/web-platform/tests/mediacapture-streams/MediaStream-MediaElement-preload-none.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<!-- Copyright © 2016 Chromium authors and World Wide Web Consortium, (Massachusetts Institute of Technology, ERCIM, Keio University, Beihang). -->
+<html>
+    <head>
+        <title>Test that the HTMLMediaElement preload 'none' attribute value is ignored for MediaStream used as srcObject and MediaStream object URLs used as src.</title>>
+        <link rel="author" title="Matthew Wolenetz" href="mailto:wolenetz@chromium.org"/>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="/common/vendor-prefix.js" data-prefixed-objects='[{"ancestors":["navigator"], "name":"getUserMedia"}, {"ancestors":["window"], "name":"MediaStream"}]'></script>
+    </head>
+    <body>
+        <p class="instructions">When prompted, accept to share your audio and video streams.</p>
+        <h1 class="instructions">Description</h1>
+        <p class="instructions">This test checks that the HTMLMediaElement preload 'none' attribute value is ignored for MediaStream used as srcObject and MediaStream object URLs used as src.</p>
+
+        <audio preload="none"></audio>
+        <video preload="none"></video>
+
+        <script>
+            function testPreloadNone(t, mediaElement, setSourceStreamFunc)
+            {
+                // The optional deferred load steps (for preload none) for MediaStream resources should be skipped.
+                mediaElement.addEventListener("suspend", t.unreached_func("'suspend' should not be fired."));
+
+                mediaElement.addEventListener("loadeddata", t.step_func(function()
+                {
+                    assert_equals(mediaElement.networkState, mediaElement.NETWORK_LOADING);
+                    t.done();
+                }));
+
+                setSourceStreamFunc();
+                assert_equals(mediaElement.networkState, mediaElement.NETWORK_NO_SOURCE); // Resource selection is active.
+            }
+
+            async_test(function(t)
+            {
+                var aud = document.querySelector("audio");
+                navigator.getUserMedia({audio:true}, t.step_func(function(stream)
+                {
+                    testPreloadNone(t, aud, t.step_func(function()
+                    {
+                        aud.src = URL.createObjectURL(stream);
+                        t.add_cleanup(function() { URL.revokeObjectURL(aud.src); });
+                    }));
+                }), t.unreached_func("getUserMedia error callback was invoked."));
+            }, "Test that preload 'none' is ignored for MediaStream object URL used as src");
+
+            async_test(function(t)
+            {
+                var vid = document.querySelector("video");
+                navigator.getUserMedia({video:true}, t.step_func(function(stream)
+                {
+                    testPreloadNone(t, vid, t.step_func(function() { vid.srcObject = stream; }));
+                }), t.unreached_func("getUserMedia error callback was invoked."));
+            }, "Test that preload 'none' is ignored for MediaStream used as srcObject");
+        </script>
+    </body>
+</html>
diff --git a/testing/web-platform/tests/mediacapture-streams/OWNERS b/testing/web-platform/tests/mediacapture-streams/OWNERS
index d45847c4eff7..2fec44486be0 100644
--- a/testing/web-platform/tests/mediacapture-streams/OWNERS
+++ b/testing/web-platform/tests/mediacapture-streams/OWNERS
@@ -1,4 +1,3 @@
 @agouaillard
 @alvestrand
 @dontcallmedom
-@foolip
diff --git a/testing/web-platform/tests/performance-timeline/idlharness.html b/testing/web-platform/tests/performance-timeline/idlharness.html
index db93932025f6..0500b3eee5f3 100644
--- a/testing/web-platform/tests/performance-timeline/idlharness.html
+++ b/testing/web-platform/tests/performance-timeline/idlharness.html
@@ -22,20 +22,51 @@ interface Performance {
 </pre>
 
 <pre id='idl'>
+[Exposed=(Window,Worker)]
 interface PerformanceEntry {
-  readonly attribute DOMString name;
-  readonly attribute DOMString entryType;
-  readonly attribute DOMHighResTimeStamp startTime;
-  readonly attribute DOMHighResTimeStamp duration;
+    readonly attribute DOMString           name;
+    readonly attribute DOMString           entryType;
+    readonly attribute DOMHighResTimeStamp startTime;
+    readonly attribute DOMHighResTimeStamp duration;
+    serializer = {attribute};
+};
+
+dictionary PerformanceEntryFilterOptions {
+    DOMString name;
+    DOMString entryType;
+    DOMString initiatorType;
 };
 
 partial interface Performance {
-  PerformanceEntryList getEntries();
-  PerformanceEntryList getEntriesByType(DOMString entryType);
-  PerformanceEntryList getEntriesByName(DOMString name, optional DOMString entryType);
+    PerformanceEntryList getEntries(optional PerformanceEntryFilterOptions filter);
+    PerformanceEntryList getEntriesByType(DOMString type);
+    PerformanceEntryList getEntriesByName(DOMString name,
+                                          optional DOMString type);
 };
 
 typedef sequence &lt;PerformanceEntry> PerformanceEntryList;
+
+dictionary PerformanceObserverInit {
+    required sequence&lt;DOMString> entryTypes;
+};
+
+[Exposed=(Window,Worker)]
+interface PerformanceObserverEntryList {
+    PerformanceEntryList getEntries(optional PerformanceEntryFilterOptions filter);
+    PerformanceEntryList getEntriesByType(DOMString type);
+    PerformanceEntryList getEntriesByName(DOMString name,
+                                          optional DOMString type);
+};
+
+callback PerformanceObserverCallback = void (PerformanceObserverEntryList entries,
+                                             PerformanceObserver observer);
+
+[Constructor(PerformanceObserverCallback callback),
+ Exposed=(Window,Worker)]
+interface PerformanceObserver {
+    void observe(PerformanceObserverInit options);
+    void disconnect();
+};
 </pre>
 
 <script>
diff --git a/testing/web-platform/tests/performance-timeline/performanceobservers.js b/testing/web-platform/tests/performance-timeline/performanceobservers.js
new file mode 100644
index 000000000000..08587694e5ab
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/performanceobservers.js
@@ -0,0 +1,21 @@
+// Compares a performance entry to a predefined one
+// perfEntriesToCheck is an array of performance entries from the user agent
+// expectedEntries is an array of performance entries minted by the test
+function checkEntries(perfEntriesToCheck, expectedEntries) {
+  function findMatch(pe) {
+    // we match based on entryType and name
+    for (var i = expectedEntries.length - 1; i >= 0; i--) {
+      var ex = expectedEntries[i];
+      if (ex.entryType === pe.entryType && ex.name === pe.name) {
+        return ex;
+      }
+    }
+    return null;
+  }
+
+  assert_equals(perfEntriesToCheck.length, expectedEntries.length, "performance entries must match");
+
+  perfEntriesToCheck.forEach(function (pe1) {
+    assert_not_equals(findMatch(pe1), null, "Entry matches");
+  });
+}
diff --git a/testing/web-platform/tests/performance-timeline/po-disconnect.html b/testing/web-platform/tests/performance-timeline/po-disconnect.html
new file mode 100644
index 000000000000..e347c1d31bc0
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-disconnect.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: disconnect</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>PerformanceObservers: disconnect</h1>
+<div id="log"></div>
+<script>
+  async_test(function (t) {
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          assert_unreached("This callback must not be invoked");
+        })
+      );
+    observer.observe({entryTypes: ["mark", "measure", "navigation"]});
+    observer.disconnect();
+    performance.mark("mark1");
+    performance.measure("measure1");
+    t.step_timeout(function () {
+      t.done();
+    }, 2000);
+  }, "disconnected callbacks must not be invoked");
+
+  test(function () {
+    var obs = new PerformanceObserver(function () { return true; });
+    obs.disconnect();
+    obs.disconnect();
+  }, "disconnecting an unconnected observer is a no-op");
+
+  async_test(function (t) {
+    var observer = new PerformanceObserver(
+        t.step_func(function(entryList, obs) {
+          checkEntries(entryList.getEntries(),
+            [{ entryType: "mark", name: "mark1"}]);
+          t.done();
+        })
+      );
+    observer.observe({entryTypes: ["mark"]});
+    performance.mark("mark1");
+    observer.disconnect();
+    performance.mark("mark2");
+  }, "An observer disconnected after a mark must receive the mark");
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/po-getentries.html b/testing/web-platform/tests/performance-timeline/po-getentries.html
new file mode 100644
index 000000000000..556209df6905
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-getentries.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: getEntries*</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="performanceobservers.js"></script>
+<h1>PerformanceObservers: getEntries*</h1>
+<p>
+getEntries, getEntriesByType and getEntriesByName work
+</p>
+<div id="log"></div>
+<script>
+  async_test(function (t) {
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          checkEntries(entryList.getEntries(),
+            [{ entryType: "mark", name: "mark1"}], "getEntries");
+
+          checkEntries(entryList.getEntriesByType("mark"),
+            [{ entryType: "mark", name: "mark1"}], "getEntriesByType");
+          assert_equals(entryList.getEntriesByType("measure").length, 0,
+           "getEntriesByType with no expected entry");
+          assert_equals(entryList.getEntriesByType("234567").length, 0,
+           "getEntriesByType with no expected entry");
+
+          checkEntries(entryList.getEntriesByName("mark1"),
+            [{ entryType: "mark", name: "mark1"}], "getEntriesByName");
+          assert_equals(entryList.getEntriesByName("mark2").length, 0,
+            "getEntriesByName with no expected entry");
+          assert_equals(entryList.getEntriesByName("234567").length, 0,
+            "getEntriesByName with no expected entry");
+
+          checkEntries(entryList.getEntriesByName("mark1", "mark"),
+            [{ entryType: "mark", name: "mark1"}], "getEntriesByName with a type");
+          assert_equals(entryList.getEntriesByName("mark1", "measure").length, 0,
+            "getEntriesByName with a type with no expected entry");
+          assert_equals(entryList.getEntriesByName("mark2", "measure").length, 0,
+            "getEntriesByName with a type with no expected entry");
+          assert_equals(entryList.getEntriesByName("mark1", "234567").length, 0,
+            "getEntriesByName with a type with no expected entry");
+
+          observer.disconnect();
+          t.done();
+        })
+      );
+    observer.observe({entryTypes: ["mark"]});
+    performance.mark("mark1");
+  }, "getEntries, getEntriesByType and getEntriesByName work");
+
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/po-mark-measure.html b/testing/web-platform/tests/performance-timeline/po-mark-measure.html
new file mode 100644
index 000000000000..7455c0e87e73
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-mark-measure.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: mark and measure</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="performanceobservers.js"></script>
+<h1>PerformanceObservers: mark and measure</h1>
+<p>
+Performance.mark() and Performance.measure() will <a href="https://w3c.github.io/performance-timeline/#dfn-queue-a-performanceentry">queue a PerformanceEntry</a>.
+</p>
+<div id="log"></div>
+<script>
+  async_test(function (t) {
+    var stored_entries = [];
+    var observer  = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          stored_entries =
+            stored_entries.concat(entryList.getEntries());
+          if (stored_entries.length >= 4) {
+            checkEntries(stored_entries,
+              [{ entryType: "mark", name: "mark1"},
+              { entryType: "mark", name: "mark2"},
+              { entryType: "measure", name: "measure1"},
+              { entryType: "measure", name: "measure2"}]);
+            observer.disconnect();
+            t.done();
+          }
+        })
+      );
+    observer.observe({entryTypes: ["mark", "measure"]});
+  }, "entries are observable");
+
+  async_test(function (t) {
+    var mark_entries = [];
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          mark_entries =
+            mark_entries.concat(entryList.getEntries());
+          if (mark_entries.length >= 2) {
+            checkEntries(mark_entries,
+              [{ entryType: "mark", name: "mark1"},
+              { entryType: "mark", name: "mark2"}]);
+            observer.disconnect();
+            t.done();
+          }
+        })
+      );
+    observer.observe({entryTypes: ["mark"]});
+    performance.mark("mark1");
+    performance.mark("mark2");
+  }, "mark entries are observable");
+
+  async_test(function (t) {
+    var measure_entries = [];
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          measure_entries =
+            measure_entries.concat(entryList.getEntries());
+          if (measure_entries.length >= 2) {
+            checkEntries(measure_entries,
+              [{ entryType: "measure", name: "measure1"},
+              { entryType: "measure", name: "measure2"}]);
+            observer.disconnect();
+            t.done();
+          }
+        })
+      );
+    observer.observe({entryTypes: ["measure"]});
+    performance.measure("measure1");
+    performance.measure("measure2");
+  }, "measure entries are observable");
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/po-navigation.html b/testing/web-platform/tests/performance-timeline/po-navigation.html
new file mode 100644
index 000000000000..ba3af6495933
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-navigation.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: navigation</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="performanceobservers.js"></script>
+<h1>PerformanceObservers: navigation</h1>
+<p>
+Navigation will <a href="https://w3c.github.io/performance-timeline/#dfn-queue-a-performanceentry">queue a PerformanceEntry</a>.
+</p>
+<div id="log"></div>
+<script>
+  async_test(function (t) {
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          checkEntries(entryList.getEntries(),
+            [{ entryType: "navigation", name: "document"}]);
+          checkEntries(entryList.getEntriesByType("navigation"),
+            [{ entryType: "navigation", name: "document"}]);
+          checkEntries(entryList.getEntriesByName("document"),
+            [{ entryType: "navigation", name: "document"}]);
+          observer.disconnect();
+          t.done();
+        })
+      );
+    observer.observe({entryTypes: ["navigation"]});
+  }, "navigation entry is observable");
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/po-observe.html b/testing/web-platform/tests/performance-timeline/po-observe.html
new file mode 100644
index 000000000000..84edea84ed73
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-observe.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: observe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="performanceobservers.js"></script>
+<h1>PerformanceObservers: observe</h1>
+<div id="log"></div>
+<script>
+  test(function () {
+    var obs = new PerformanceObserver(function () { return true; });
+    assert_throws(new TypeError(), function () {
+      obs.observe({});
+    });
+    assert_throws(new TypeError(), function () {
+      obs.observe({entryType: []});
+    });
+  }, "no entryTypes throws a TypeError");
+  test(function () {
+    var obs = new PerformanceObserver(function () { return true; });
+    assert_throws(new TypeError(), function () {
+      obs.observe({entryTypes: "mark"});
+    });
+    assert_throws(new TypeError(), function () {
+      obs.observe({entryTypes: []});
+    });
+    assert_throws(new TypeError(), function () {
+      obs.observe({entryTypes: ["this-cannot-match-an-entryType"]});
+    });
+    assert_throws(new TypeError(), function () {
+      obs.observe({entryTypes: ["marks","navigate", "resources"]});
+    });
+  }, "Empty sequence entryTypes throws a TypeError");
+
+  test(function () {
+    var obs = new PerformanceObserver(function () { return true; });
+    obs.observe({entryTypes: ["mark","this-cannot-match-an-entryType"]});
+    obs.observe({entryTypes: ["this-cannot-match-an-entryType","mark"]});
+    obs.observe({entryTypes: ["mark"], others: true});
+  }, "Filter unsupported entryType entryType names within the entryTypes sequence");
+
+  async_test(function (t) {
+  var observer = new PerformanceObserver(
+      t.step_func(function (entryList, obs) {
+        assert_equals(observer, obs, "observer is second parameter");
+        checkEntries(entryList.getEntries(),
+          [{ entryType: "measure", name: "measure1"}]);
+        observer.disconnect();
+        t.done();
+      })
+    );
+    performance.clearMarks();
+    observer.observe({entryTypes: ["mark"]});
+    observer.observe({entryTypes: ["measure"]});
+    performance.mark("mark1");
+    performance.measure("measure1");
+  }, "replace observer if already present");
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/po-resource.html b/testing/web-platform/tests/performance-timeline/po-resource.html
new file mode 100644
index 000000000000..1ecaa2853d97
--- /dev/null
+++ b/testing/web-platform/tests/performance-timeline/po-resource.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>PerformanceObservers: resource</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="performanceobservers.js"></script>
+<h1>PerformanceObservers: resource</h1>
+<p>
+New resources will <a href="https://w3c.github.io/performance-timeline/#dfn-queue-a-performanceentry">queue a PerformanceEntry</a>.
+</p>
+<div id="log"></div>
+<script>
+  async_test(function (t) {
+    function path(pathname) {
+      var filename = pathname.substring(pathname.lastIndexOf('/')+1);
+      return pathname.substring(0, pathname.length - filename.length);
+    }
+    var stored_entries = [];
+    var img_location = document.location.origin + path(document.location.pathname)
+       + "resources/square.png?random=";
+    var img1 = img_location + Math.floor(Math.random() * 100);
+    var img2 = img_location + Math.floor(Math.random() * 1000);
+    var observer = new PerformanceObserver(
+        t.step_func(function (entryList, obs) {
+          stored_entries =
+            stored_entries.concat(entryList.getEntriesByType("resource"));
+          if (stored_entries.length >= 2) {
+            checkEntries(stored_entries,
+              [{ entryType: "resource", name: img1},
+               { entryType: "resource", name: img2}]);
+            observer.disconnect();
+            t.done();
+          }
+        })
+      );
+    observer.observe({entryTypes: ["resource"]});
+    var img = document.createElement("img");
+    img.src = img1;
+    document.body.appendChild(img);
+    img = document.createElement("img");
+    img.src = img2;
+    document.body.appendChild(img);
+  }, "resource entries are observable");
+</script>
diff --git a/testing/web-platform/tests/performance-timeline/resources/square.png b/testing/web-platform/tests/performance-timeline/resources/square.png
new file mode 100644
index 000000000000..be211bc37718
Binary files /dev/null and b/testing/web-platform/tests/performance-timeline/resources/square.png differ
diff --git a/testing/web-platform/tests/resources/docs/api.md b/testing/web-platform/tests/resources/docs/api.md
index 1405cfdfecfe..1f50c73a6ee6 100644
--- a/testing/web-platform/tests/resources/docs/api.md
+++ b/testing/web-platform/tests/resources/docs/api.md
@@ -160,7 +160,7 @@ previous Promise Test finishes.
 `promise_rejects` can be used to test Promises that need to reject:
 
 ```js
-promise_rejects(test_object, code, promise)
+promise_rejects(test_object, code, promise, description)
 ```
 
 The `code` argument is equivalent to the same argument to the `assert_throws`
diff --git a/testing/web-platform/tests/resources/testharness.js b/testing/web-platform/tests/resources/testharness.js
index b2198b0f1b2c..52b65ddf19c8 100644
--- a/testing/web-platform/tests/resources/testharness.js
+++ b/testing/web-platform/tests/resources/testharness.js
@@ -540,9 +540,9 @@ policies and contribution forms [3].
         });
     }
 
-    function promise_rejects(test, expected, promise) {
-        return promise.then(test.unreached_func("Should have rejected.")).catch(function(e) {
-            assert_throws(expected, function() { throw e });
+    function promise_rejects(test, expected, promise, description) {
+        return promise.then(test.unreached_func("Should have rejected: " + description)).catch(function(e) {
+            assert_throws(expected, function() { throw e }, description);
         });
     }
 
diff --git a/testing/web-platform/tests/shadow-dom/Document-prototype-adoptNode.html b/testing/web-platform/tests/shadow-dom/Document-prototype-adoptNode.html
new file mode 100644
index 000000000000..e9b07d0c8095
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/Document-prototype-adoptNode.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>DOM and Shadow DOM: Document.prototype.adoptNode</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="The adoptNode(node) method must throw a HierarchyRequestError exception if node is a shadow root.">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-document-adoptnode">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script>
+
+function testAdoptNode(mode) {
+    test(function () {
+        var newDocument = document.implementation.createHTMLDocument();
+        assert_throws({'name': 'HierarchyRequestError'}, function () {
+            var element = document.createElement('div');
+            var shadowRoot = element.attachShadow({mode: mode});
+            newDocument.adoptNode(shadowRoot);
+        });
+    }, 'adoptNode on a shadow root in ' + mode + ' mode must throw a HierarchyRequestError');
+}
+
+testAdoptNode('open');
+testAdoptNode('closed');
+
+</script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/shadow-dom/Document-prototype-currentScript.html b/testing/web-platform/tests/shadow-dom/Document-prototype-currentScript.html
new file mode 100644
index 000000000000..ceecf1ba17ac
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/Document-prototype-currentScript.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>HTML: Document.prototype.currentScript</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="If the script element is in a document, then set the script element's node document's currentScript attribute to the script element.">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script id="outerScriptElement">
+
+var outerScriptElement = document.currentScript;
+
+function testInlineScript(mode)
+{
+    test(function () {
+        var host = document.createElement('div');
+        var shadowRoot = host.attachShadow({mode: mode});
+        var scriptElement = document.createElement('script');
+        scriptElement.textContent = 'assert_equals(document.currentScript, outerScriptElement)';
+        shadowRoot.appendChild(scriptElement);
+
+        assert_equals(document.currentScript, outerScriptElement,
+            'document.currentScript must be set to the currently excusing script element in a document tree before executing a script in a shadow tree');
+        document.body.appendChild(host);
+        assert_equals(document.currentScript, outerScriptElement,
+            'document.currentScript must be set to the currently excusing script element in a document tree after executing a script in a shadow tree');
+
+    }, 'document.currentScript must not to be set to a script element in a shadow tree in ' + mode + ' mode');
+}
+
+testInlineScript('open');
+testInlineScript('closed');
+
+var executeExternalScript = null;
+var testedScriptElement = null;
+function executeNextTest()
+{
+    var testCase = asyncScriptTests.shift();
+    var mode = testCase.mode;
+    if (!testCase)
+        return;
+
+    testCase.test.step(function () {
+        testedScriptElement = document.createElement('script');
+        testedScriptElement.src = 'resources/Document-prototype-currentScript-helper.js';
+
+        if (mode !== null) {
+            var host = document.createElement('div');
+            var shadowRoot = host.attachShadow({mode: mode});
+            shadowRoot.appendChild(testedScriptElement);
+            document.body.appendChild(host);
+        } else {
+            document.body.appendChild(testedScriptElement);
+        }
+
+        if (testCase.remove)
+            testedScriptElement.parentNode.removeChild(testedScriptElement);
+    });
+
+    executeExternalScript = function () {
+        testCase.test.step(function () {
+            assert_equals(document.currentScript, testCase.expected());
+        });
+        testCase.test.done();
+        setTimeout(executeNextTest, 1);
+    }
+}
+
+var asyncScriptTests = [
+    {
+        test: async_test('document.currentScript must be set to a script element that loads an external script in a document tree'),
+        mode: null, remove: false, expected: function () { return testedScriptElement; }},
+    {
+        test: async_test('document.currentScript must be set to a script element that loads an external script in a document tree'),
+        mode: null, remove: true, expected: function () { return testedScriptElement; }},
+    {
+        test: async_test('document.currentScript must not be set to a script element that loads an external script in an open shadow tree'),
+        mode: 'open', remove: false, expected: function () { return null; }},
+    {
+        test: async_test('document.currentScript must not be set to a script element that loads an external script in a closed shadow tree'),
+        mode: 'closed', remove: false, expected: function () { return null; }},
+    {
+        test: async_test('document.currentScript must be set to a script element that loads an external script that was in an open shadow tree and then removed'),
+        mode: 'open', remove: true, expected: function () { return testedScriptElement; }},
+    {
+        test: async_test('document.currentScript must be set to a script element that loads an external script that was in a closed shadow tree and then removed'),
+        mode: 'closed', remove: true, expected: function () { return testedScriptElement; }},
+];
+
+executeNextTest();
+
+</script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/shadow-dom/Document-prototype-importNode.html b/testing/web-platform/tests/shadow-dom/Document-prototype-importNode.html
new file mode 100644
index 000000000000..4566e4e83582
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/Document-prototype-importNode.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>DOM and Shadow DOM: Document.prototype.importNode</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="The importNode(node, deep) method must throw a NotSupportedError exception if node is a shadow root.">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-document-importnode">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script>
+
+function testImportNode(mode) {
+    test(function () {
+        var newDocument = document.implementation.createHTMLDocument();
+        assert_throws({'name': 'NotSupportedError'}, function () {
+            var element = document.createElement('div');
+            var shadowRoot = element.attachShadow({mode: mode});
+            newDocument.importNode(shadowRoot);
+        });
+    }, 'importNode on a shadow root in ' + mode + ' mode must throw a NotSupportedError');
+}
+
+testImportNode('open');
+testImportNode('closed');
+
+</script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/shadow-dom/Node-prototype-cloneNode.html b/testing/web-platform/tests/shadow-dom/Node-prototype-cloneNode.html
new file mode 100644
index 000000000000..6c6b24bc0ee4
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/Node-prototype-cloneNode.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>DOM: cloneNode(deep)</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="If context object is a shadow root, then it must throw a NotSupportedError.">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-node-clonenode">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script>
+
+function testCloneNode(mode) {
+    test(function () {
+        assert_throws({'name': 'NotSupportedError'}, function () {
+            var element = document.createElement('div');
+            var shadowRoot = element.attachShadow({mode: mode});
+            shadowRoot.cloneNode(false);
+        }, 'cloneNode(false) on a shadow root in ' + mode + ' mode must throw a NotSupportedError');
+
+        assert_throws({'name': 'NotSupportedError'}, function () {
+            var element = document.createElement('div');
+            var shadowRoot = element.attachShadow({mode: mode});
+            shadowRoot.cloneNode(false);
+        }, 'cloneNode(true) on a closed shadow root must throw a NotSupportedError');
+
+    }, 'cloneNode on a shadow root in ' + mode + ' mode must throw a NotSupportedError');
+}
+
+testCloneNode('open');
+testCloneNode('closed');
+
+test(function () {
+    var element = document.createElement('div');
+    var shadowRoot = element.attachShadow({mode: 'open'});
+
+    assert_equals(element.cloneNode(false).shadowRoot, null, 'cloneNode(false) on an element with an open shadow root should not clone its shadow root');
+    assert_equals(element.cloneNode(true).shadowRoot, null, 'cloneNode(true) on an element with an open shadow root should not clone its shadow root');
+}, 'cloneNode on an element with an open shadow root should not clone its shadow root');
+
+test(function () {
+    var element = document.createElement('div');
+    var shadowRoot = element.attachShadow({mode: 'closed'});
+
+    assert_true(element.cloneNode(false).attachShadow({mode: 'closed'}) instanceof ShadowRoot,
+        'An element returned by cloneNode(false) on an element with a closed shadow root should allow attachShadow');
+
+    assert_true(element.cloneNode(true).attachShadow({mode: 'closed'}) instanceof ShadowRoot,
+        'An element returned by cloneNode(true) on an element with a closed shadow root should allow attachShadow');
+
+}, 'cloneNode on an element with a closed shadow root should not clone its shadow root');
+
+</script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/shadow-dom/OWNERS b/testing/web-platform/tests/shadow-dom/OWNERS
index fd2132cf82dc..957c6b51b880 100644
--- a/testing/web-platform/tests/shadow-dom/OWNERS
+++ b/testing/web-platform/tests/shadow-dom/OWNERS
@@ -3,3 +3,5 @@
 @sideshowbarker
 @sizuhiko
 @yutak
+@takayoshikochi
+@hayatoito
diff --git a/testing/web-platform/tests/shadow-dom/leaktests/html-collection.html b/testing/web-platform/tests/shadow-dom/leaktests/html-collection.html
new file mode 100644
index 000000000000..4f864fdeb19c
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/leaktests/html-collection.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name='author' title='Google' href='http://www.google.com'>
+<meta name='assert' content='document attributes that returns HTMLCollection should not expose nodes in shadow tree.'>
+<link rel='help' href='https://w3c.github.io/webcomponents/spec/shadow/'>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+<template id='collection-template'>
+  <img>
+  <embed></embed>
+  <plugin></plugin>
+  <applet></applet>
+  <object type='application/x-java-applet'></object>
+  <a href='http://example.com'></a>
+  <a name='test'></a>
+  <form name='test'></form>
+  <script></script>
+</template>
+<div id='doc'></div>
+<div id='host-open'></div>
+<div id='host-closed'></div>
+</body>
+<script>
+'use strict';
+
+function fillTemplate(root, prefix) {
+    var tmpl = document.getElementById('collection-template');
+    root.appendChild(document.importNode(tmpl.content, true));
+    for (var i = 0; i < root.childNodes.length; ++i) {
+	var el = root.childNodes[i];
+	if (el.nodeType != 1)
+	    continue;
+	el.id = prefix + el.tagName.toLowerCase();
+    }
+}
+
+// Construct subtree with 'doc-*' ids.
+var doc = document.getElementById('doc');
+fillTemplate(doc, 'doc-');
+
+// Construct shadow subtree with 'shadow-*' ids.
+var host = document.getElementById('host-open');
+var shadow = host.attachShadow({mode: 'open'});
+fillTemplate(shadow, 'shadow-open-');
+
+host = document.getElementById('host-closed');
+shadow = host.attachShadow({mode: 'closed'});
+fillTemplate(shadow, 'shadow-closed-');
+
+function testCollection(collection) {
+    var elements = document[collection];
+    assert_greater_than(elements.length, 0, 'document.' + collection + ' should have at least 1 element.');
+    for (var i = 0; i < elements.length; ++i) {
+        if (elements[i].id) {
+            assert_equals(elements[i].id.indexOf('shadow-'), -1, 'document.' + collection + ' should not contain elements in shadow tree.');
+        }
+    }
+}
+
+var testParams = [
+    ['document.scripts should not contain shadow nodes', 'scripts'],
+    ['document.all should not contain shadow nodes', 'all'],
+    ['document.forms should not contain shadow nodes', 'forms'],
+    ['document.images should not contain shadow nodes', 'images'],
+    ['document.links should not contain shadow nodes', 'links'],
+    ['document.anchors should not contain shadow nodes', 'anchors'],
+    ['document.embeds should not contain shadow nodes', 'embeds'],
+    ['document.plugins should not contain shadow nodes', 'plugins'],
+    ['document.applets should not contain shadow nodes', 'applets']];
+
+generate_tests(testCollection, testParams);
+
+</script>
+</html>
diff --git a/testing/web-platform/tests/shadow-dom/resources/Document-prototype-currentScript-helper.js b/testing/web-platform/tests/shadow-dom/resources/Document-prototype-currentScript-helper.js
new file mode 100644
index 000000000000..c25693cdb9ce
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/resources/Document-prototype-currentScript-helper.js
@@ -0,0 +1 @@
+executeExternalScript();
diff --git a/testing/web-platform/tests/shadow-dom/styles/shadow-cascade-order.html b/testing/web-platform/tests/shadow-dom/styles/shadow-cascade-order.html
deleted file mode 100644
index 2f90780aa818..000000000000
--- a/testing/web-platform/tests/shadow-dom/styles/shadow-cascade-order.html
+++ /dev/null
@@ -1,403 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Shadow DOM: CSS Style Rule cascading</title>
-<meta name="author" title="Takayoshi Kochi" href="mailto:kochi@google.com">
-<meta name="assert" content="Cascading order test for style rules from various shadow trees.">
-<link rel="help" href="https://github.com/w3c/webcomponents/blob/gh-pages/proposals/Shadow-DOM-Cascade-Order.md">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="log"></div>
-<script>
-
-// Taken from the example in
-// https://github.com/w3c/webcomponents/blob/gh-pages/proposals/Shadow-DOM-Cascade-Order.md
-// https://github.com/w3c/webcomponents/issues/316
-// https://github.com/w3c/webcomponents/blob/gh-pages/proposals/Shadow-DOM-Cascade-Order-in-v1.md
-// with element renamed and style rule location changed.
-//
-// <style>my-item { color: red; }</style>
-// <my-list>
-//   <:shadow>
-//     <style>::slotted(my-item) { color: blue; }</style>
-//     <slot/>
-//   </:shadow>
-//   <my-item style="color: green;">
-//     <:shadow>
-//       <style>:host { color: yellow; }</style>
-//       <slot/>
-//     </:shadow>
-//     ITEM
-//   </my-item>
-// </my-list>
-//
-// There are 4 possible style rules that applies to <my-item> above:
-// 1. document-wide style
-// 2. ::slotted style in the shadow in <my-list>
-// 3. :host style in the shadow in <my-item>
-// 4. inline style within <my-item> itself.
-//
-// It could be possible to nest many more shadow trees in <my-list>,
-// but to prevent the number of combination explosion, such case is covered
-// in another test file.
-//
-// So testing cases where 2 style rules are competing,
-// 4C2 = 6 combinations exist, multiplied by 4, which is the possible
-// combination of applying "!important" for the 2 style rules.
-
-function createMyList(mode, slottedStyle, hostStyle, inlineStyle) {
-    var myList = document.createElement('my-list');
-    var root = myList.attachShadow({'mode': mode});
-    root.innerHTML = '<style>' + slottedStyle + '</style><slot></slot>';
-    var myItem = document.createElement('my-item');
-    if (inlineStyle !== '')
-        myItem.setAttribute('style', inlineStyle);
-    myList.appendChild(myItem);
-    var root2 = myItem.attachShadow({'mode': mode});
-    root2.innerHTML = '<style>' + hostStyle + '</style><slot></slot>';
-    myItem.appendChild(document.createTextNode('ITEM'));
-    return myList;
-}
-
-function testCascadingOrder(mode) {
-    // In all test cases, the rule specified as "color: green" should win.
-    var testCases = [
-        // [A] Cases between document, ::slotteed, :host, and inline
-        {
-            title: 'A1. document vs ::slotted, document rule should win',
-            documentStyle: 'my-item { color: green; }',
-            slottedStyle: '::slotted(my-item) { color: red; }',
-            hostStyle: '',
-            inlineStyle: ''
-        },
-        {
-            title: 'A2. document vs :host, document rule should win',
-            documentStyle: 'my-item { color: green; }',
-            slottedStyle: '',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'A3. document vs inline, inline rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle: '',
-            hostStyle: '',
-            inlineStyle: 'color: green;'
-        },
-        {
-            title: 'A4. ::slotted vs :host, earlier in tree-of-trees rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green; }',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'A5. ::slotted vs inline, inline rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: red; }',
-            hostStyle: '',
-            inlineStyle: 'color: green;'
-        },
-        {
-            title: 'A6. :host vs inline, inline rule should win',
-            documentStyle: '',
-            slottedStyle: '',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: 'color: green;'
-        },
-
-        // [B] Stronger rule is still stronger with !important
-        {
-            title: 'B1. document with !important vs ::slotted, document rule should win',
-            documentStyle: 'my-item { color: green !important; }',
-            slottedStyle: '::slotted(my-item) { color: red; }',
-            hostStyle: '',
-            inlineStyle: ''
-        },
-        {
-            title: 'B2. document with !important vs :host, document rule should win',
-            documentStyle: 'my-item { color: green !important; }',
-            slottedStyle: '',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'B3. document vs inline with !important, inline rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle: '',
-            hostStyle: '',
-            inlineStyle: 'color: green !important;'
-        },
-        {
-            title: 'B4. ::slotted  with !important vs :host, earlier in tree-of-trees rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'B5. ::slotted vs inline with !important, inline rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: '',
-            inlineStyle: 'color: red;'
-        },
-        {
-            title: 'B6. :host vs inline with !important, inline rule should win',
-            documentStyle: '',
-            slottedStyle: '',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: 'color: green !important;'
-        },
-
-        // [C] Weaker rule gets stronger with !important
-        {
-            title: 'C1. document vs ::slotted with !important, ::slotted rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: '',
-            inlineStyle: ''
-        },
-        {
-            title: 'C2. document vs :host with !important, :host rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle: '',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'C3. document with !important vs inline, document rule should win',
-            documentStyle: 'my-item { color: green !important; }',
-            slottedStyle: '',
-            hostStyle: '',
-            inlineStyle: 'color: red;'
-        },
-        {
-            title: 'C4. ::slotted vs :host with !important, later in tree-of-trees rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: ':host { color: red; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'C5. ::slotted with !important vs inline, ::slotted rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: '',
-            inlineStyle: 'color: red;'
-        },
-        {
-            title: 'C6. :host with !important vs inline, :host rule should win',
-            documentStyle: '',
-            slottedStyle: '',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: 'color: red;'
-        },
-
-        // [D] Cases between document, ::slotteed, :host, and inline, both with !important
-        {
-            title: 'D1. document vs ::slotted both with !important, ::slotted rule should win',
-            documentStyle: 'my-item { color: red !important; }',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: '',
-            inlineStyle: ''
-        },
-        {
-            title: 'D2. document vs :host both with !important, :host rule should win',
-            documentStyle: 'my-item { color: red !important; }',
-            slottedStyle: '',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'D3. document vs inline both with !important, inline rule should win',
-            documentStyle: 'my-item { color: red !important; }',
-            slottedStyle: '',
-            hostStyle: '',
-            inlineStyle: 'color: green !important;'
-        },
-        {
-            title: 'D4. ::slotted vs :host both with !important, later in tree-of-trees rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: red !important; }',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: ''
-        },
-        {
-            title: 'D5. ::slotted vs inline both with !important, ::slotted rule should win',
-            documentStyle: '',
-            slottedStyle: '::slotted(my-item) { color: green !important; }',
-            hostStyle: '',
-            inlineStyle: 'color: red !important;'
-        },
-        {
-            title: 'D6. :host vs inline both with !important, :host rule should win',
-            documentStyle: '',
-            slottedStyle: '',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: 'color: red !important;'
-        },
-        // [E] Putting all together
-        {
-            title: 'E1. all style applied, inline rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle: '::slotted(my-item) { color: blue; }',
-            hostStyle: ':host { color: yellow; }',
-            inlineStyle: 'color: green;'
-        },
-        {
-            title: 'E2. all styles with !important applied, rule in the last tree-of-trees should win',
-            documentStyle: 'my-item { color: red !important; }',
-            slottedStyle: '::slotted(my-item) { color: blue !important; }',
-            hostStyle: ':host { color: green !important; }',
-            inlineStyle: 'color: yellow !important;'
-        },
-    ];
-
-    for (var i = 0; i < testCases.length; ++i) {
-        var testCase = testCases[i];
-        var documentStyle = document.createElement('style');
-        documentStyle.appendChild(document.createTextNode(testCase['documentStyle']));
-        document.head.appendChild(documentStyle);
-
-        var myList = createMyList(mode,
-            testCase['slottedStyle'], testCase['hostStyle'], testCase['inlineStyle']);
-        document.body.appendChild(myList);
-
-        test(function () {
-            var myItem = myList.querySelector('my-item');
-            assert_equals(window.getComputedStyle(myItem).color, 'rgb(0, 128, 0)',
-                          testCase['title']);
-        }, testCase['title'] + ' for ' + mode + ' mode.');
-
-        myList.parentNode.removeChild(myList);
-        document.head.removeChild(documentStyle)
-    }
-}
-
-// Open or Closed should not make any difference in style application.
-testCascadingOrder('open');
-testCascadingOrder('closed');
-
-
-// Taken from the example in
-// https://github.com/w3c/webcomponents/blob/gh-pages/proposals/Shadow-DOM-Cascade-Order.md
-// https://github.com/w3c/webcomponents/issues/316
-// https://github.com/w3c/webcomponents/blob/gh-pages/proposals/Shadow-DOM-Cascade-Order-in-v1.md
-// with element renamed and style rule location changed.
-//
-// <style>my-item { color: red; }</style>
-// <my-list>
-//   <:shadow>
-//     <style>::slotted(my-item) { color: blue; }</style>
-//     <div>
-//       <:shadow>
-//         <slot/>
-//       </:shadow>
-//       <slot/>
-//     </div>
-//   </:shadow>
-//   <my-item style="color: green;">
-//     <:shadow>
-//       <style>:host { color: yellow; }</style>
-//       <slot/>
-//     </:shadow>
-//     ITEM
-//   </my-item>
-// </my-list>
-//
-// The difference from the example tree above is that <my-list> has 2 levels of
-// shadow trees, each with ::slotted(my-list) style rules.
-
-function createMyListWith2LevelShadow(mode, slottedStyle1, slottedStyle2, hostStyle) {
-    var myList = document.createElement('my-list');
-    var root = myList.attachShadow({'mode': mode});
-    root.innerHTML = '<style>' + slottedStyle1 + '</style><div><slot></slot></div>';
-    var div = root.querySelector('div');
-    var root2 = div.attachShadow({'mode': mode});
-    root2.innerHTML = '<style>' + slottedStyle2 + '</style><slot></slot>';
-    var myItem = document.createElement('my-item');
-    myList.appendChild(myItem);
-    var root3 = myItem.attachShadow({'mode': mode});
-    root3.innerHTML = '<style>' + hostStyle + '</style><slot></slot>';
-    myItem.appendChild(document.createTextNode('ITEM'));
-    return myList;
-}
-
-function testCascadingOrderWith2LevelShadow(mode) {
-    // In all test cases, the rule specified as "color: green" should win.
-    var testCases = [
-        {
-            title: 'F1. document vs others, document (the first rule in tree-of-trees order) rule should win',
-            documentStyle: 'my-item { color: green; }',
-            slottedStyle1: '::slotted(my-item) { color: red; }',
-            slottedStyle2: '::slotted(my-item) { color: red; }',
-            hostStyle: ':host { color: red; }',
-        },
-        {
-            title: 'F2. document with !important vs others, document rule should win',
-            documentStyle: 'my-item { color: green !important; }',
-            slottedStyle1: '::slotted(my-item) { color: red; }',
-            slottedStyle2: '::slotted(my-item) { color: red; }',
-            hostStyle: ':host { color: red; }',
-        },
-        {
-            title: 'F3. document vs ::slotted with !important, important rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle1: '::slotted(my-item) { color: green !important; }',
-            slottedStyle2: '::slotted(my-item) { color: red; }',
-            hostStyle: ':host { color: red; }',
-        },
-        {
-            title: 'F4. document vs ::slotted with !important, important rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle1: '::slotted(my-item) { color: red; }',
-            slottedStyle2: '::slotted(my-item) { color: green !important; }',
-            hostStyle: ':host { color: red; }',
-        },
-        {
-            title: 'F5. document vs :host with !important, important rule should win',
-            documentStyle: 'my-item { color: red; }',
-            slottedStyle1: '::slotted(my-item) { color: red; }',
-            slottedStyle2: '::slotted(my-item) { color: red; }',
-            hostStyle: ':host { color: green !important; }',
-        },
-        {
-            title: 'F6. all rules with !important, the last rule in tree-of-trees should win',
-            documentStyle: 'my-item { color: red !important; }',
-            slottedStyle1: '::slotted(my-item) { color: red !important; }',
-            slottedStyle2: '::slotted(my-item) { color: red !important; }',
-            hostStyle: ':host { color: green !important ; }',
-        }
-    ];
-
-    for (var i = 0; i < testCases.length; ++i) {
-        var testCase = testCases[i];
-        var documentStyle = document.createElement('style');
-        documentStyle.appendChild(document.createTextNode(testCase['documentStyle']));
-        document.head.appendChild(documentStyle);
-
-        var myList = createMyListWith2LevelShadow(mode,
-            testCase['slottedStyle1'], testCase['slottedStyle2'], testCase['hostStyle']);
-        document.body.appendChild(myList);
-
-        test(function () {
-            var myItem = myList.querySelector('my-item');
-            assert_equals(window.getComputedStyle(myItem).color, 'rgb(0, 128, 0)',
-                          testCase['title']);
-        }, testCase['title'] + ' for ' + mode + ' mode.');
-
-        myList.parentNode.removeChild(myList);
-        document.head.removeChild(documentStyle)
-    }
-}
-
-// Open or Closed should not make any difference in style application.
-testCascadingOrderWith2LevelShadow('open');
-testCascadingOrderWith2LevelShadow('closed');
-
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/streams/byte-length-queuing-strategy.js b/testing/web-platform/tests/streams/byte-length-queuing-strategy.js
index d53b12bcb363..54407af99138 100644
--- a/testing/web-platform/tests/streams/byte-length-queuing-strategy.js
+++ b/testing/web-platform/tests/streams/byte-length-queuing-strategy.js
@@ -12,7 +12,7 @@ test(() => {
 
 test(() => {
 
-  for (let highWaterMark of [-Infinity, NaN, 'foo', {}, () => {}]) {
+  for (const highWaterMark of [-Infinity, NaN, 'foo', {}, () => {}]) {
     const strategy = new ByteLengthQueuingStrategy({ highWaterMark });
     assert_equals(strategy.highWaterMark, highWaterMark, `${highWaterMark} gets set correctly`);
   }
diff --git a/testing/web-platform/tests/streams/count-queuing-strategy.js b/testing/web-platform/tests/streams/count-queuing-strategy.js
index 02ca4c458432..5ae0063f57d0 100644
--- a/testing/web-platform/tests/streams/count-queuing-strategy.js
+++ b/testing/web-platform/tests/streams/count-queuing-strategy.js
@@ -12,7 +12,7 @@ test(() => {
 
 test(() => {
 
-  for (let highWaterMark of [-Infinity, NaN, 'foo', {}, () => {}]) {
+  for (const highWaterMark of [-Infinity, NaN, 'foo', {}, () => {}]) {
     const strategy = new CountQueuingStrategy({ highWaterMark });
     assert_equals(strategy.highWaterMark, highWaterMark, `${highWaterMark} gets set correctly`);
   }
diff --git a/testing/web-platform/tests/streams/readable-streams/bad-strategies.js b/testing/web-platform/tests/streams/readable-streams/bad-strategies.js
index 8fdc83c49102..0c053ab62bcf 100644
--- a/testing/web-platform/tests/streams/readable-streams/bad-strategies.js
+++ b/testing/web-platform/tests/streams/readable-streams/bad-strategies.js
@@ -19,9 +19,10 @@ test(() => {
 
 }, 'Readable stream: throwing strategy.size getter');
 
-test(() => {
+promise_test(t => {
 
-  const theError = new Error('a unique string');
+  const controllerError = { name: 'controller error' };
+  const thrownError = { name: 'thrown error' };
 
   let controller;
   const rs = new ReadableStream(
@@ -32,22 +33,22 @@ test(() => {
     },
     {
       size() {
-        controller.error(theError);
-        throw theError;
+        controller.error(controllerError);
+        throw thrownError;
       },
       highWaterMark: 5
     }
   );
 
-  assert_throws(theError, () => {
-    controller.enqueue('a');
-  }, 'enqueue should re-throw the error');
+  assert_throws(thrownError, () => controller.enqueue('a'), 'enqueue should re-throw the error');
+
+  return promise_rejects(t, controllerError, rs.getReader().closed);
 
 }, 'Readable stream: strategy.size errors the stream and then throws');
 
-test(() => {
+promise_test(t => {
 
-  const theError = new Error('a unique string');
+  const theError = { name: 'my error' };
 
   let controller;
   const rs = new ReadableStream(
@@ -65,11 +66,9 @@ test(() => {
     }
   );
 
-  try {
-    controller.enqueue('a');
-  } catch (error) {
-    assert_equals(error.name, 'RangeError', 'enqueue should throw a RangeError');
-  }
+  assert_throws(new RangeError(), () => controller.enqueue('a'), 'enqueue should throw a RangeError');
+
+  return promise_rejects(t, theError, rs.getReader().closed, 'closed should reject with the error');
 
 }, 'Readable stream: strategy.size errors the stream and then returns Infinity');
 
@@ -115,7 +114,7 @@ test(() => {
 
 test(() => {
 
-  for (let highWaterMark of [-1, -Infinity]) {
+  for (const highWaterMark of [-1, -Infinity]) {
     assert_throws(new RangeError(), () => {
       new ReadableStream({}, {
         size() {
@@ -126,7 +125,7 @@ test(() => {
     }, 'construction should throw a RangeError for ' + highWaterMark);
   }
 
-  for (let highWaterMark of [NaN, 'foo', {}]) {
+  for (const highWaterMark of [NaN, 'foo', {}]) {
     assert_throws(new TypeError(), () => {
       new ReadableStream({}, {
         size() {
@@ -142,7 +141,7 @@ test(() => {
 promise_test(() => {
 
   const promises = [];
-  for (let size of [NaN, -Infinity, Infinity, -1]) {
+  for (const size of [NaN, -Infinity, Infinity, -1]) {
     let theError;
     const rs = new ReadableStream(
       {
diff --git a/testing/web-platform/tests/streams/readable-streams/bad-underlying-sources.js b/testing/web-platform/tests/streams/readable-streams/bad-underlying-sources.js
index f2fd0fdc9299..b95b54bc7fc9 100644
--- a/testing/web-platform/tests/streams/readable-streams/bad-underlying-sources.js
+++ b/testing/web-platform/tests/streams/readable-streams/bad-underlying-sources.js
@@ -153,11 +153,11 @@ promise_test(() => {
   });
 
   rs.cancel();
-  controller.enqueue('a'); // Calling enqueue after canceling should not throw anything.
+  assert_throws(new TypeError, () => controller.enqueue('a'), 'Calling enqueue after canceling should throw');
 
   return rs.getReader().closed;
 
-}, 'Underlying source: calling enqueue on an empty canceled stream should not throw');
+}, 'Underlying source: calling enqueue on an empty canceled stream should throw');
 
 promise_test(() => {
 
@@ -171,11 +171,11 @@ promise_test(() => {
   });
 
   rs.cancel();
-  controller.enqueue('c'); // Calling enqueue after canceling should not throw anything.
+  assert_throws(new TypeError, () => controller.enqueue('c'), 'Calling enqueue after canceling should throw');
 
   return rs.getReader().closed;
 
-}, 'Underlying source: calling enqueue on a non-empty canceled stream should not throw');
+}, 'Underlying source: calling enqueue on a non-empty canceled stream should throw');
 
 promise_test(() => {
 
@@ -194,7 +194,7 @@ promise_test(t => {
   const closed = new ReadableStream({
     start(c) {
       c.error(theError);
-      assert_throws(theError, () => c.enqueue('a'), 'call to enqueue should throw the error');
+      assert_throws(new TypeError(), () => c.enqueue('a'), 'call to enqueue should throw the error');
     }
   }).getReader().closed;
 
@@ -251,13 +251,13 @@ promise_test(() => {
   });
 
   rs.cancel();
-  controller.close(); // Calling close after canceling should not throw anything.
+  assert_throws(new TypeError(), () => controller.close(), 'Calling close after canceling should throw');
 
   return rs.getReader().closed.then(() => {
     assert_true(startCalled);
   });
 
-}, 'Underlying source: calling close on an empty canceled stream should not throw');
+}, 'Underlying source: calling close on an empty canceled stream should throw');
 
 promise_test(() => {
 
@@ -272,13 +272,13 @@ promise_test(() => {
   });
 
   rs.cancel();
-  controller.close(); // Calling close after canceling should not throw anything.
+  assert_throws(new TypeError(), () => controller.close(), 'Calling close after canceling should throw');
 
   return rs.getReader().closed.then(() => {
     assert_true(startCalled);
   });
 
-}, 'Underlying source: calling close on a non-empty canceled stream should not throw');
+}, 'Underlying source: calling close on a non-empty canceled stream should throw');
 
 promise_test(() => {
 
diff --git a/testing/web-platform/tests/streams/readable-streams/cancel.js b/testing/web-platform/tests/streams/readable-streams/cancel.js
index f5014c2c94d2..3857c8e93414 100644
--- a/testing/web-platform/tests/streams/readable-streams/cancel.js
+++ b/testing/web-platform/tests/streams/readable-streams/cancel.js
@@ -24,7 +24,6 @@ promise_test(() => {
 
     cancel() {
       randomSource.readStop();
-      randomSource.onend();
 
       return new Promise(resolve => {
         setTimeout(() => {
diff --git a/testing/web-platform/tests/streams/readable-streams/general.js b/testing/web-platform/tests/streams/readable-streams/general.js
index fe81bd54d3f5..30eb7ab81602 100644
--- a/testing/web-platform/tests/streams/readable-streams/general.js
+++ b/testing/web-platform/tests/streams/readable-streams/general.js
@@ -10,6 +10,7 @@ test(() => {
 
   new ReadableStream(); // ReadableStream constructed with no parameters
   new ReadableStream({ }); // ReadableStream constructed with an empty object as parameter
+  new ReadableStream({ type: undefined }); // ReadableStream constructed with undefined type
   new ReadableStream(undefined); // ReadableStream constructed with undefined as parameter
 
   let x;
@@ -23,6 +24,17 @@ test(() => {
 
 }, 'ReadableStream can\'t be constructed with garbage');
 
+test(() => {
+
+  assert_throws(new RangeError(), () => new ReadableStream({ type: null }),
+    'constructor should throw when the type is null');
+  assert_throws(new RangeError(), () => new ReadableStream({ type: '' }),
+    'constructor should throw when the type is empty string');
+  assert_throws(new RangeError(), () => new ReadableStream({ type: 'asdf' }),
+    'constructor should throw when the type is asdf');
+
+}, 'ReadableStream can\'t be constructed with an invalid type');
+
 test(() => {
 
   const methods = ['cancel', 'constructor', 'getReader', 'pipeThrough', 'pipeTo', 'tee'];
@@ -33,7 +45,7 @@ test(() => {
 
   assert_array_equals(Object.getOwnPropertyNames(proto).sort(), properties, 'should have all the correct methods');
 
-  for (let m of methods) {
+  for (const m of methods) {
     const propDesc = Object.getOwnPropertyDescriptor(proto, m);
     assert_false(propDesc.enumerable, 'method should be non-enumerable');
     assert_true(propDesc.configurable, 'method should be configurable');
@@ -92,7 +104,7 @@ test(() => {
       assert_array_equals(Object.getOwnPropertyNames(proto).sort(), properties,
         'the controller should have the right properties');
 
-      for (let m of methods) {
+      for (const m of methods) {
         const propDesc = Object.getOwnPropertyDescriptor(proto, m);
         assert_equals(typeof controller[m], 'function', `should have a ${m} method`);
         assert_false(propDesc.enumerable, m + ' should be non-enumerable');
@@ -108,7 +120,7 @@ test(() => {
       assert_true(desiredSizePropDesc.configurable, 'desiredSize should be configurable');
 
       assert_equals(controller.close.length, 0, 'close should have no parameters');
-      assert_equals(controller.constructor.length, 1, 'constructor should have 1 parameter');
+      assert_equals(controller.constructor.length, 4, 'constructor should have 4 parameter');
       assert_equals(controller.enqueue.length, 1, 'enqueue should have 1 parameter');
       assert_equals(controller.error.length, 1, 'error should have 1 parameter');
 
@@ -205,7 +217,7 @@ promise_test(() => {
 
   const rs = new ReadableStream({
     start(c) {
-      for (let o of objects) {
+      for (const o of objects) {
         c.enqueue(o);
       }
       c.close();
@@ -608,6 +620,36 @@ promise_test(() => {
 
 }, 'ReadableStream pull should be able to close a stream.');
 
+promise_test(t => {
+
+  const controllerError = { name: 'controller error' };
+
+  const rs = new ReadableStream({
+    pull(c) {
+      c.error(controllerError);
+    }
+  });
+
+  return promise_rejects(t, controllerError, rs.getReader().closed);
+
+}, 'ReadableStream pull should be able to error a stream.');
+
+promise_test(t => {
+
+  const controllerError = { name: 'controller error' };
+  const thrownError = { name: 'thrown error' };
+
+  const rs = new ReadableStream({
+    pull(c) {
+      c.error(controllerError);
+      throw thrownError;
+    }
+  });
+
+  return promise_rejects(t, controllerError, rs.getReader().closed);
+
+}, 'ReadableStream pull should be able to error a stream and throw.');
+
 test(() => {
 
   let startCalled = false;
@@ -643,24 +685,6 @@ test(() => {
 
 }, 'ReadableStream: enqueue should throw when the stream is closed');
 
-test(() => {
-
-  let startCalled = false;
-  const expectedError = new Error('i am sad');
-
-  new ReadableStream({
-    start(c) {
-      c.error(expectedError);
-
-      assert_throws(expectedError, () => c.enqueue('a'), 'enqueue after error should throw that error');
-      startCalled = true;
-    }
-  });
-
-  assert_true(startCalled);
-
-}, 'ReadableStream: enqueue should throw the stored error when the stream is errored');
-
 promise_test(() => {
 
   let startCalled = 0;
@@ -799,7 +823,7 @@ promise_test(t => {
 
   return readableStreamToArray(rs).then(chunks => {
     assert_equals(chunks.length, 8, '8 chunks should be read');
-    for (let chunk of chunks) {
+    for (const chunk of chunks) {
       assert_equals(chunk.length, 128, 'chunk should have 128 bytes');
     }
   });
diff --git a/testing/web-platform/tests/streams/readable-streams/readable-stream-reader.js b/testing/web-platform/tests/streams/readable-streams/readable-stream-reader.js
index d7d81cf2d34a..1d5bc13004f8 100644
--- a/testing/web-platform/tests/streams/readable-streams/readable-stream-reader.js
+++ b/testing/web-platform/tests/streams/readable-streams/readable-stream-reader.js
@@ -32,7 +32,7 @@ test(() => {
 
   assert_array_equals(Object.getOwnPropertyNames(proto).sort(), properties);
 
-  for (let m of methods) {
+  for (const m of methods) {
     const propDesc = Object.getOwnPropertyDescriptor(proto, m);
     assert_equals(propDesc.enumerable, false, 'method should be non-enumerable');
     assert_equals(propDesc.configurable, true, 'method should be configurable');
diff --git a/testing/web-platform/tests/streams/resources/rs-test-templates.js b/testing/web-platform/tests/streams/resources/rs-test-templates.js
index 852b565d9042..e36463ba7cf0 100644
--- a/testing/web-platform/tests/streams/resources/rs-test-templates.js
+++ b/testing/web-platform/tests/streams/resources/rs-test-templates.js
@@ -19,6 +19,16 @@ self.templatedRSEmpty = (label, factory) => {
     assert_equals(typeof rs.tee, 'function', 'has a tee method');
 
   }, 'instances have the correct methods and properties');
+
+  test(() => {
+    const rs = factory();
+
+    assert_throws(new RangeError(), () => rs.getReader({ mode: '' }), 'empty string mode should throw');
+    assert_throws(new RangeError(), () => rs.getReader({ mode: null }), 'null mode should throw');
+    assert_throws(new RangeError(), () => rs.getReader({ mode: 'asdf' }), 'asdf mode should throw');
+    assert_throws(new TypeError(), () => rs.getReader(null), 'null should throw');
+
+  }, 'calling getReader with invalid arguments should throw appropriate errors');
 };
 
 self.templatedRSClosed = (label, factory) => {
diff --git a/testing/web-platform/tests/touch-events/historical.html b/testing/web-platform/tests/touch-events/historical.html
new file mode 100644
index 000000000000..e6fd59818757
--- /dev/null
+++ b/testing/web-platform/tests/touch-events/historical.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Historical touch events features</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="touch-support.js"></script>
+<body>
+<script>
+test(function() {
+  assert_false("identifiedTouch" in TouchList.prototype,
+               "Should not be supported on the prototype");
+
+  var touchList = document.createTouchList();
+  assert_false("identifiedTouch" in touchList,
+               "Should not be supported on the instance");
+}, "TouchList::identifiedTouch");
+</script>
diff --git a/testing/web-platform/tests/DOMEvents/ClickFakeEvent.nondocument.html b/testing/web-platform/tests/uievents/ClickFakeEvent.nondocument.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/ClickFakeEvent.nondocument.html
rename to testing/web-platform/tests/uievents/ClickFakeEvent.nondocument.html
diff --git a/testing/web-platform/tests/DOMEvents/OWNERS b/testing/web-platform/tests/uievents/OWNERS
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/OWNERS
rename to testing/web-platform/tests/uievents/OWNERS
diff --git a/testing/web-platform/tests/DOMEvents/constructors.html b/testing/web-platform/tests/uievents/constructors/constructors.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/constructors.html
rename to testing/web-platform/tests/uievents/constructors/constructors.html
diff --git a/testing/web-platform/tests/uievents/keyboard/key-mtest-101en-us.html b/testing/web-platform/tests/uievents/keyboard/key-101en-us-manual.html
similarity index 97%
rename from testing/web-platform/tests/uievents/keyboard/key-mtest-101en-us.html
rename to testing/web-platform/tests/uievents/keyboard/key-101en-us-manual.html
index 11a11e852e37..6fa00c929c8b 100644
--- a/testing/web-platform/tests/uievents/keyboard/key-mtest-101en-us.html
+++ b/testing/web-platform/tests/uievents/keyboard/key-101en-us-manual.html
@@ -5,8 +5,8 @@
 
 <title>Keyboard Event Manual Test</title>
 <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-<script type="text/javascript" src="key-mtest.js" ></script>
-<link rel="stylesheet" type="text/css" href="key-mtest.css" />
+<script type="text/javascript" src="key-manual.js" ></script>
+<link rel="stylesheet" type="text/css" href="key-manual.css" />
 
 </head>
 
diff --git a/testing/web-platform/tests/uievents/keyboard/key-mtest-102fr-fr.html b/testing/web-platform/tests/uievents/keyboard/key-102fr-fr-manual.html
similarity index 97%
rename from testing/web-platform/tests/uievents/keyboard/key-mtest-102fr-fr.html
rename to testing/web-platform/tests/uievents/keyboard/key-102fr-fr-manual.html
index cf16845a79e5..7ef1ce295ab0 100644
--- a/testing/web-platform/tests/uievents/keyboard/key-mtest-102fr-fr.html
+++ b/testing/web-platform/tests/uievents/keyboard/key-102fr-fr-manual.html
@@ -5,8 +5,8 @@
 
 <title>Keyboard Event Manual Test</title>
 <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-<script type="text/javascript" src="key-mtest.js" ></script>
-<link rel="stylesheet" type="text/css" href="key-mtest.css" />
+<script type="text/javascript" src="key-manual.js" ></script>
+<link rel="stylesheet" type="text/css" href="key-manual.css" />
 
 </head>
 
diff --git a/testing/web-platform/tests/uievents/keyboard/key-mtest.css b/testing/web-platform/tests/uievents/keyboard/key-manual.css
similarity index 100%
rename from testing/web-platform/tests/uievents/keyboard/key-mtest.css
rename to testing/web-platform/tests/uievents/keyboard/key-manual.css
diff --git a/testing/web-platform/tests/uievents/keyboard/key-mtest.js b/testing/web-platform/tests/uievents/keyboard/key-manual.js
similarity index 100%
rename from testing/web-platform/tests/uievents/keyboard/key-mtest.js
rename to testing/web-platform/tests/uievents/keyboard/key-manual.js
diff --git a/testing/web-platform/tests/DOMEvents/tests/Status.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/Status.html
similarity index 83%
rename from testing/web-platform/tests/DOMEvents/tests/Status.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/Status.html
index 5599395549b0..392f68edc11a 100644
--- a/testing/web-platform/tests/DOMEvents/tests/Status.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/Status.html
@@ -7,13 +7,13 @@
 
 <h2>DOM Level 3 Events Test Suite Status</h2>
 
-<p>This test suite is part of the 
-<a href="http://www.w3.org/2008/webapps/wiki/">Web Application WG's</a> 
-Test Repository as described in WebApps' 
+<p>This test suite is part of the
+<a href="http://www.w3.org/2008/webapps/wiki/">Web Application WG's</a>
+Test Repository as described in WebApps'
 <a href="http://www.w3.org/2008/webapps/wiki/Testing">Testing Wiki</a>.
 </p>
 
-<p>The test suite is for the 
+<p>The test suite is for the
 <a href="http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html">DOM Level 3 Events</a> specification.
 </p>
 
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/DOM.event.flow.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/DOM.event.flow.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventListener.eventHandler.html
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventListener.eventHandler.html
index ed7e9aff2800..eed710a39d76 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventListener.eventHandler.html
@@ -22,7 +22,6 @@
 </table>
 
 <script>
-
     var EVENT = "foo";
     var TARGET = document.getElementById("target");
     var TestResult = false;
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventObject.multiple.dispatchEvent.html
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventObject.multiple.dispatchEvent.html
index 70b2fedbcf0f..6de97a805531 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/EventObject.multiple.dispatchEvent.html
@@ -13,7 +13,6 @@
 </div>
 
 <script>
-
     var EVENT = "foo";
     var TARGET = document.getElementById("target");
     var PARENT = document.getElementById("parent");
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
index 2d91abd496ef..2da0a389e2e3 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
@@ -11,8 +11,6 @@
 <iframe id="helper" style="display: none"></iframe>
 
 <script>
-
-
     var description = "Test Description: " +
                       "DOMCharacterDataModified event fires after ProcessingInstruction.data have been modified, " +
                       "but the node itself has not been inserted or deleted. The proximal event target of this " +
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html
index f00c749f8733..a414d60298ac 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html
@@ -22,7 +22,6 @@
 </table>
 
 <script>
-
     var EVENT = "foo";
     var TARGET = document.getElementById("target");
     var PARENT = document.getElementById("parent");
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html
index 8238fa7d962a..93489c63b452 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html
@@ -22,7 +22,6 @@
 </table>
 
 <script>
-
     var EVENT = "foo";
     var TARGET = document.getElementById("target");
     var PARENT = document.getElementById("parent");
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 86%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
index 7c0091a8f912..4c95ae29dff7 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <root>
     <head xmlns="http://www.w3.org/1999/xhtml">
-        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title> 
+        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title>
     </head>
     <div id="log" xmlns="http://www.w3.org/1999/xhtml"></div>
-  
+
     <pi><?foo bar?></pi>
 
     <script type="text/javascript" xmlns="http://www.w3.org/1999/xhtml">
@@ -12,19 +12,19 @@
             var EVENT = "DOMCharacterDataModified";
             var TARGET = document.getElementsByTagName('pi')[0].firstChild;
             var TestResult = false;
-            
+
             TARGET.addEventListener(EVENT, TestEvent, false);
             TARGET.data = "new" + TARGET.data;
-            
+
             function TestEvent(evt)
             {
                 if ((EVENT == evt.type) && (TARGET == evt.target) && ("newbar" == evt.newValue))
                 {
-                    TestResult = true; 
+                    TestResult = true;
                 }
                 else
                 {
-                    TestResult = false; 
+                    TestResult = false;
                 }
             }
         ]]>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/CompositionEvent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/CompositionEvent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrChange.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrChange.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrName.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrName.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.newValue.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.newValue.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.prevValue.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.prevValue.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.relatedNode.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.relatedNode.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMCharacterDataModified.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMCharacterDataModified.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMNodeInserted.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMNodeInserted.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMNodeRemoved.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMNodeRemoved.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMSubtreeModified.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/DOMSubtreeModified.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.defaultPrevented.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html
similarity index 98%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.defaultPrevented.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html
index d1e0244c16bc..8acd3cb979f4 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.defaultPrevented.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html
@@ -62,7 +62,7 @@
         <a href="http://samples.msdn.microsoft.com/ietestcenter/" id="target">http://samples.msdn.microsoft.com/ietestcenter</a>
 
         <p>Test passes if the word "PASS" appears below after clicking the hyperlink and the page does not navigate away.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.eventPhase.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html
similarity index 98%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.eventPhase.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html
index ab297e7c5535..4bd3b51b46c3 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.eventPhase.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html
@@ -71,7 +71,7 @@
         </div>
 
         <p>Test passes if the word "PASS" appears below after double clicking the above textbox.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.stopPropagation.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html
similarity index 98%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.stopPropagation.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html
index 9f796db65082..019143e366c8 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/Event.stopPropagation.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html
@@ -79,7 +79,7 @@
         </div>
 
         <p>Test passes if the word "PASS" appears below after clicking the above button using mouse.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.key.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.key.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html
index 4c1d254474a3..ea1adb0751f1 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.key.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html
@@ -50,7 +50,7 @@
         Type 'a' here: <input id="target" value=""/>
 
         <p>Test passes if the word "PASS" appears below after typing 'a' in the above textbox using keyboard.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.location.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.location.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.modifiers.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.modifiers.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.button.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.button.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html
index 213009f4c4d5..605565a7814e 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.button.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html
@@ -59,7 +59,7 @@
         </pre>
 
         <p>Test passes if the word "PASS" appears below after following the above steps.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.image.map.area.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.image.map.area.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.preventDefault.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MouseEvent.preventDefault.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.hasFeature.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.hasFeature.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.initMutationEvent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.initMutationEvent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.relatedNode.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/MutationEvent.relatedNode.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 90%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
index 0e3912ea7ef7..34ad59064ffb 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <root>
     <head xmlns="http://www.w3.org/1999/xhtml">
-        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title> 
+        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title>
     </head>
 
     <p xmlns="http://www.w3.org/1999/xhtml">
         <h3>DOM Events</h3>
         <h4>
-            Test Description: DOMCharacterDataModified event fires after ProcessingInstruction.data have been modified, 
-            but the node itself has not been inserted or deleted. The proximal event target of this event shall be the 
+            Test Description: DOMCharacterDataModified event fires after ProcessingInstruction.data have been modified,
+            but the node itself has not been inserted or deleted. The proximal event target of this event shall be the
             ProcessingInstruction node.
         </h4>
 
@@ -25,17 +25,17 @@
                     document.getElementsByTagName("testresult")[0].firstChild.data = "PASS";
                     TestResult = true;
                 }
-                
+
                 var FailTest = function()
                 {
                     document.getElementsByTagName("testresult")[0].firstChild.data = "FAIL";
                     TestResult = false;
                 }
-                
+
                 var EVENT = "DOMCharacterDataModified";
                 var TARGET = document.getElementsByTagName('pi')[0].firstChild;
                 var TestResult = false;
-                
+
                 try
                 {
                     TARGET.addEventListener(EVENT, TestEvent, false);
@@ -45,7 +45,7 @@
                 {
                     FailTest();
                 }
-                
+
                 function TestEvent(evt)
                 {
                     if ((EVENT == evt.type) && (TARGET == evt.target) && ("newbar" == evt.newValue))
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.hasFeature.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.hasFeature.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.initTextEvent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.initTextEvent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.IME.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.IME.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.drop.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.drop.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.paste.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.paste.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.script.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.script.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/UIEvent.load.stylesheet.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/UIEvent.load.stylesheet.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.deltaMode.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.deltaMode.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.hasFeature.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.hasFeature.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.initWheelEvent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.initWheelEvent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.img.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html
similarity index 98%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.img.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html
index 5e403013e297..c0fb1eaf97d8 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.img.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html
@@ -47,7 +47,7 @@
         <div id="parent">Loading...<br></div>
 
         <p>Test passes if the word "PASS" appears below.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
 
         <script type="text/javascript">
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.testresult.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html
similarity index 94%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.testresult.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html
index b9c37576aa9b..e0f6243b8acf 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/abort.testresult.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html
@@ -9,7 +9,7 @@
         <h3><a id="link" href="abort.img.html">Click here to go back to the test page</a></h3>
 
         <p>Test passes if the word "PASS" appears below.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>
             <script>
                 try
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/blur.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/blur.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html
index 0259fe6cb4bb..cef282bfe596 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/blur.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html
@@ -51,7 +51,7 @@
         </div>
 
         <p>Test passes if the word "PASS" appears below after clicking the above textbox and then the button.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.data.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.data.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.keydown.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.keydown.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.preventDefault.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/compositionstart.preventDefault.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 86%
rename from testing/web-platform/tests/DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
index 7c0091a8f912..4c95ae29dff7 100644
--- a/testing/web-platform/tests/DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <root>
     <head xmlns="http://www.w3.org/1999/xhtml">
-        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title> 
+        <title> ProcessingInstruction.data and DOMCharacterDataModified event </title>
     </head>
     <div id="log" xmlns="http://www.w3.org/1999/xhtml"></div>
-  
+
     <pi><?foo bar?></pi>
 
     <script type="text/javascript" xmlns="http://www.w3.org/1999/xhtml">
@@ -12,19 +12,19 @@
             var EVENT = "DOMCharacterDataModified";
             var TARGET = document.getElementsByTagName('pi')[0].firstChild;
             var TestResult = false;
-            
+
             TARGET.addEventListener(EVENT, TestEvent, false);
             TARGET.data = "new" + TARGET.data;
-            
+
             function TestEvent(evt)
             {
                 if ((EVENT == evt.type) && (TARGET == evt.target) && ("newbar" == evt.newValue))
                 {
-                    TestResult = true; 
+                    TestResult = true;
                 }
                 else
                 {
-                    TestResult = false; 
+                    TestResult = false;
                 }
             }
         ]]>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/customevent.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/customevent.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/customevent.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/customevent.html
index a11ca15570e6..76d037ab7e87 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/customevent.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/customevent.html
@@ -55,7 +55,7 @@
         <input type="hidden" id="target" />
 
         <p>Test passes if the word "PASS" appears below.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/dispatchEvent.click.checkbox.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/dispatchEvent.click.checkbox.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/error.image.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/error.image.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html
index 3f55ac9bb902..a629652d4f7c 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/error.image.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html
@@ -59,7 +59,7 @@
         <img id="target" src="./support/InvalidBitMap.png" alt="ERROR">
 
         <p>Test passes if the word "PASS" appears below.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusin.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html
similarity index 97%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusin.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html
index 9c89bfafea66..a6eb1b663801 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusin.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html
@@ -55,7 +55,7 @@
         </div>
 
         <p>Test passes if the word "PASS" appears below after clicking the above textbox using mouse.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusin.relatedTarget.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusin.relatedTarget.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusout.relatedTarget.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/focusout.relatedTarget.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/hasFeature.Events.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/hasFeature.Events.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/hasFeature.feature.string.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/hasFeature.feature.string.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/load.image.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html
similarity index 98%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/load.image.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html
index 1cff31830900..19414eaf0227 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/load.image.html
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html
@@ -75,7 +75,7 @@
         <img id="target" src="./support/iepreview.png" width="300" height="300" onerror="ReloadPage()">
 
         <p>Test passes if the word "PASS" appears below after the above image is loaded.</p>
-       	<div>Test result: </div>
+           <div>Test result: </div>
         <div id='testresult'>FAIL</div>
 
     </body>
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseenter.ctrlKey.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseenter.ctrlKey.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseenter.relatedTarget.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseenter.relatedTarget.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseleave.relatedTarget.html b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/mouseleave.relatedTarget.html
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/16kb.js b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js
similarity index 99%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/16kb.js
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js
index bf362ea39bde..fb3c0d64b15e 100644
--- a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/16kb.js
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js
@@ -1,4 +1,4 @@
-var text = 
+var text =
 "This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! " +
 "This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! " +
 "This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! This is a test! " +
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png
diff --git a/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/iepreview.png b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/support/iepreview.png
rename to testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png
diff --git a/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css
new file mode 100644
index 000000000000..961757bf3da5
--- /dev/null
+++ b/testing/web-platform/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css
@@ -0,0 +1,3 @@
+BODY {
+    PADDING-BOTTOM: 0px; BACKGROUND-COLOR: #eef0eb; MARGIN: 0px; PADDING-LEFT: 0px; PADDING-RIGHT: 0px; PADDING-TOP: 0px
+}
diff --git a/testing/web-platform/tests/DOMEvents/event-phases-order.html b/testing/web-platform/tests/uievents/order-of-events/event-phases-order.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/event-phases-order.html
rename to testing/web-platform/tests/uievents/order-of-events/event-phases-order.html
diff --git a/testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html b/testing/web-platform/tests/uievents/order-of-events/init-event-while-dispatching.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html
rename to testing/web-platform/tests/uievents/order-of-events/init-event-while-dispatching.html
diff --git a/testing/web-platform/tests/DOMEvents/throwing-in-listener-and-window-error-event.html b/testing/web-platform/tests/uievents/throwing-in-listener-and-window-error-event.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/throwing-in-listener-and-window-error-event.html
rename to testing/web-platform/tests/uievents/throwing-in-listener-and-window-error-event.html
diff --git a/testing/web-platform/tests/DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html b/testing/web-platform/tests/uievents/throwing-in-listener-when-all-have-not-run-yet.html
similarity index 100%
rename from testing/web-platform/tests/DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html
rename to testing/web-platform/tests/uievents/throwing-in-listener-when-all-have-not-run-yet.html
diff --git a/testing/web-platform/tests/url/a-element.js b/testing/web-platform/tests/url/a-element.js
index 1d92c9d88aba..c77df5bf2eeb 100644
--- a/testing/web-platform/tests/url/a-element.js
+++ b/testing/web-platform/tests/url/a-element.js
@@ -38,7 +38,9 @@ function runURLTests(urltests) {
       }
 
       assert_equals(url.href, expected.href, "href")
-      assert_equals(url.origin, expected.origin, "origin")
+      if ("origin" in expected) {
+        assert_equals(url.origin, expected.origin, "origin")
+      }
       assert_equals(url.protocol, expected.protocol, "protocol")
       assert_equals(url.username, expected.username, "username")
       assert_equals(url.password, expected.password, "password")
diff --git a/testing/web-platform/tests/url/url-constructor.html b/testing/web-platform/tests/url/url-constructor.html
index 80eb943aa161..f47fa358a063 100644
--- a/testing/web-platform/tests/url/url-constructor.html
+++ b/testing/web-platform/tests/url/url-constructor.html
@@ -38,7 +38,9 @@ function runURLTests(urltests) {
 
       var url = bURL(expected.input, expected.base)
       assert_equals(url.href, expected.href, "href")
-      assert_equals(url.origin, expected.origin, "origin")
+      if ("origin" in expected) {
+        assert_equals(url.origin, expected.origin, "origin")
+      }
       assert_equals(url.protocol, expected.protocol, "protocol")
       assert_equals(url.username, expected.username, "username")
       assert_equals(url.password, expected.password, "password")
diff --git a/testing/web-platform/tests/url/urltestdata.json b/testing/web-platform/tests/url/urltestdata.json
index 322f69ec8939..ee5416ecf232 100644
--- a/testing/web-platform/tests/url/urltestdata.json
+++ b/testing/web-platform/tests/url/urltestdata.json
@@ -4163,6 +4163,22 @@
     "search": "",
     "hash": ""
   },
+  "# unknown scheme with path looking like a password",
+  {
+    "input": "sc::a@example.net",
+    "base": "about:blank",
+    "href": "sc::a@example.net",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": ":a@example.net",
+    "search": "",
+    "hash": ""
+  },
   "# tests from jsdom/whatwg-url designed for code coverage",
   {
     "input": "http://127.0.0.1:10100/relative_import.html",
diff --git a/testing/web-platform/tests/web-animations/animatable/animate.html b/testing/web-platform/tests/web-animations/animatable/animate.html
index 39ddf633d0b2..69a52a2a44f6 100644
--- a/testing/web-platform/tests/web-animations/animatable/animate.html
+++ b/testing/web-platform/tests/web-animations/animatable/animate.html
@@ -95,7 +95,6 @@ test(function(t) {
 
 async_test(function(t) {
   var iframe = document.createElement('iframe');
-  iframe.src = 'data:text/html;charset=utf-8,';
   iframe.width = 10;
   iframe.height = 10;
 
diff --git a/testing/web-platform/tests/web-animations/animation-timeline/document-timeline.html b/testing/web-platform/tests/web-animations/animation-timeline/document-timeline.html
index e7ab1687a148..e4f5133f5434 100644
--- a/testing/web-platform/tests/web-animations/animation-timeline/document-timeline.html
+++ b/testing/web-platform/tests/web-animations/animation-timeline/document-timeline.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="data:text/html;charset=utf-8," width="10" height="10" id="iframe"></iframe>
+<iframe width="10" height="10" id="iframe"></iframe>
 <script>
 'use strict';
 
diff --git a/testing/web-platform/tests/web-animations/animation/playbackRate.html b/testing/web-platform/tests/web-animations/animation/playbackRate.html
index fcb73535e270..2b6c9e1292ee 100644
--- a/testing/web-platform/tests/web-animations/animation/playbackRate.html
+++ b/testing/web-platform/tests/web-animations/animation/playbackRate.html
@@ -11,8 +11,6 @@
 <script>
 "use strict";
 
-var keyFrames = { 'marginLeft': ['100px', '200px'] };
-
 function assert_playbackrate(animation,
                              previousAnimationCurrentTime,
                              previousTimelineCurrentTime,
@@ -31,7 +29,7 @@ function assert_playbackrate(animation,
 
 promise_test(function(t) {
   var div = createDiv(t);
-  var animation = div.animate({keyFrames}, 100 * MS_PER_SEC);
+  var animation = div.animate(null, 100 * MS_PER_SEC);
   return animation.ready.then(function() {
     animation.currentTime = 7 * MS_PER_SEC; // ms
     animation.playbackRate = 0.5;
@@ -48,7 +46,7 @@ promise_test(function(t) {
 
 promise_test(function(t) {
   var div = createDiv(t);
-  var animation = div.animate({keyFrames}, 100 * MS_PER_SEC);
+  var animation = div.animate(null, 100 * MS_PER_SEC);
   animation.playbackRate = 2;
   var previousTimelineCurrentTime;
   var previousAnimationCurrentTime;
@@ -66,7 +64,7 @@ promise_test(function(t) {
 
 promise_test(function(t) {
   var div = createDiv(t);
-  var animation = div.animate({keyFrames}, 100 * MS_PER_SEC);
+  var animation = div.animate(null, 100 * MS_PER_SEC);
   animation.playbackRate = 2;
   var previousTimelineCurrentTime;
   var previousAnimationCurrentTime;
diff --git a/testing/web-platform/tests/webdriver/navigation.py b/testing/web-platform/tests/webdriver/navigation.py
new file mode 100644
index 000000000000..eb4a2cdffbc2
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/navigation.py
@@ -0,0 +1,138 @@
+import contextlib
+import httplib
+import json
+import pytest
+import types
+import urllib
+
+import webdriver
+
+
+def inline(doc):
+    return "data:text/html;charset=utf-8,%s" % urllib.quote(doc)
+
+
+alert_doc = inline("<script>window.alert()</script>")
+frame_doc = inline("<p>frame")
+one_frame_doc = inline("<iframe src='%s'></iframe>" % frame_doc)
+two_frames_doc = inline("<iframe src='%s'></iframe>" % one_frame_doc)
+
+
+class HTTPRequest(object):
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+
+    def head(self, path):
+        return self._request("HEAD", path)
+
+    def get(self, path):
+        return self._request("GET", path)
+
+    @contextlib.contextmanager
+    def _request(self, method, path):
+        conn = httplib.HTTPConnection(self.host, self.port)
+        try:
+            conn.request(method, path)
+            yield conn.getresponse()
+        finally:
+            conn.close()
+
+
+@pytest.fixture(scope="function")
+def http(request, session):
+    return HTTPRequest(session.transport.host, session.transport.port)
+
+
+@pytest.fixture
+def new_window(session):
+    """Open new window and return the window handle."""
+    windows_before = session.window_handles
+    name = session.execute_script("window.open()")
+    assert len(session.window_handles) == len(windows_before) + 1
+    new_windows = session.window_handles - windows_before
+    return new_windows.pop()
+
+
+# TODO(ato): 7.1 Get
+
+
+def test_get_current_url_no_browsing_context(session, new_window):
+    # 7.2 step 1
+    session.window_handle = new_window
+    session.close()
+    with pytest.raises(webdriver.NoSuchWindowException):
+        session.url = "about:blank"
+
+
+def test_get_current_url_alert_prompt(session):
+    # 7.2 step 2
+    import time
+    session.url = alert_doc
+    with pytest.raises(webdriver.UnexpectedAlertOpenException):
+        session.url = "about:blank"
+
+
+def test_get_current_url_matches_location(session):
+    # 7.2 step 3
+    url = session.execute_script("return window.location.href")
+    assert session.url == url
+
+
+def test_get_current_url_payload(http, session):
+    # 7.2 step 4-5
+    session.start()
+    with http.get("/session/%s/url" % session.session_id) as resp:
+        assert resp.status == 200
+        body = json.load(resp)
+    assert "value" in body
+    assert isinstance(body["value"], types.StringTypes)
+
+
+def test_get_current_url_special_pages(session):
+    session.url = "about:blank"
+    assert session.url == "about:blank"
+
+
+# TODO(ato): This test requires modification to pass on Windows
+def test_get_current_url_file_protocol(session):
+    # tests that the browsing context remains the same
+    # when navigated privileged documents
+    session.url = "file:///"
+    assert session.url == "file:///"
+
+
+# TODO(ato): Test for http:// and https:// protocols.
+# We need to expose a fixture for accessing
+# documents served by wptserve in order to test this.
+
+
+def test_get_current_url_malformed_url(session):
+    session.url = "foo"
+    assert session.url
+
+
+def test_get_current_url_after_modified_location(session):
+    session.execute_script("window.location.href = 'about:blank'")
+    assert session.url == "about:blank"
+
+
+def test_get_current_url_nested_browsing_context(session):
+    session.url = one_frame_doc
+    top_level_url = session.url
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    assert session.url == top_level_url
+
+
+def test_get_current_url_nested_browsing_contexts(session):
+    session.url = two_frames_doc
+    top_level_url = session.url
+
+    outer_frame = session.find("iframe", all=False)
+    session.switch_frame(outer_frame)
+
+    inner_frame = session.find("iframe", all=False)
+    session.switch_frame(frame)
+
+    assert session.url == top_level_url
diff --git a/testing/web-platform/tests/websockets/binary/001.html b/testing/web-platform/tests/websockets/binary/001.html
index 87d1df3b08e3..4631ebcf7f0e 100644
--- a/testing/web-platform/tests/websockets/binary/001.html
+++ b/testing/web-platform/tests/websockets/binary/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/binary/002.html b/testing/web-platform/tests/websockets/binary/002.html
index 639af7d8af5c..f2fa16a61a18 100644
--- a/testing/web-platform/tests/websockets/binary/002.html
+++ b/testing/web-platform/tests/websockets/binary/002.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/binary/004.html b/testing/web-platform/tests/websockets/binary/004.html
index e7335750ad40..59b06d700ab5 100644
--- a/testing/web-platform/tests/websockets/binary/004.html
+++ b/testing/web-platform/tests/websockets/binary/004.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/binary/005.html b/testing/web-platform/tests/websockets/binary/005.html
index 818ba2af276e..54c1aae90f91 100644
--- a/testing/web-platform/tests/websockets/binary/005.html
+++ b/testing/web-platform/tests/websockets/binary/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/closing-handshake/002.html b/testing/web-platform/tests/websockets/closing-handshake/002.html
index 074cd7a86aba..f60604d40204 100644
--- a/testing/web-platform/tests/websockets/closing-handshake/002.html
+++ b/testing/web-platform/tests/websockets/closing-handshake/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/closing-handshake/003.html b/testing/web-platform/tests/websockets/closing-handshake/003.html
index 0130e2a1e801..d85e8c1edfdd 100644
--- a/testing/web-platform/tests/websockets/closing-handshake/003.html
+++ b/testing/web-platform/tests/websockets/closing-handshake/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/closing-handshake/004.html b/testing/web-platform/tests/websockets/closing-handshake/004.html
index 9f4c58a2f3ca..343a28a2390f 100644
--- a/testing/web-platform/tests/websockets/closing-handshake/004.html
+++ b/testing/web-platform/tests/websockets/closing-handshake/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/001.html b/testing/web-platform/tests/websockets/constructor/001.html
index 64abe3e96f36..2a868bfa0d37 100644
--- a/testing/web-platform/tests/websockets/constructor/001.html
+++ b/testing/web-platform/tests/websockets/constructor/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/constructor/002.html b/testing/web-platform/tests/websockets/constructor/002.html
index 1acc2dbb82e3..94015979b0a1 100644
--- a/testing/web-platform/tests/websockets/constructor/002.html
+++ b/testing/web-platform/tests/websockets/constructor/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {assert_throws("SyntaxError", function(){new WebSocket("/test")})});
diff --git a/testing/web-platform/tests/websockets/constructor/004.html b/testing/web-platform/tests/websockets/constructor/004.html
index 042caa1e5897..f358021541b2 100644
--- a/testing/web-platform/tests/websockets/constructor/004.html
+++ b/testing/web-platform/tests/websockets/constructor/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 // empty string
diff --git a/testing/web-platform/tests/websockets/constructor/005.html b/testing/web-platform/tests/websockets/constructor/005.html
index 58878b8a5fbc..63e61ddb090f 100644
--- a/testing/web-platform/tests/websockets/constructor/005.html
+++ b/testing/web-platform/tests/websockets/constructor/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/constructor/006.html b/testing/web-platform/tests/websockets/constructor/006.html
index 83e770956941..a9d01bbf34b0 100644
--- a/testing/web-platform/tests/websockets/constructor/006.html
+++ b/testing/web-platform/tests/websockets/constructor/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/007.html b/testing/web-platform/tests/websockets/constructor/007.html
index 9fcb07dc4d38..6f141a541865 100644
--- a/testing/web-platform/tests/websockets/constructor/007.html
+++ b/testing/web-platform/tests/websockets/constructor/007.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/constructor/008.html b/testing/web-platform/tests/websockets/constructor/008.html
index 2ed97ee17a7f..f425ff058f40 100644
--- a/testing/web-platform/tests/websockets/constructor/008.html
+++ b/testing/web-platform/tests/websockets/constructor/008.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 //Pass condition is to not throw
diff --git a/testing/web-platform/tests/websockets/constructor/009.html b/testing/web-platform/tests/websockets/constructor/009.html
index b0fb80d74f22..56eb912c82b9 100644
--- a/testing/web-platform/tests/websockets/constructor/009.html
+++ b/testing/web-platform/tests/websockets/constructor/009.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/010.html b/testing/web-platform/tests/websockets/constructor/010.html
index 4abb417beef1..da2a9bf591b6 100644
--- a/testing/web-platform/tests/websockets/constructor/010.html
+++ b/testing/web-platform/tests/websockets/constructor/010.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/011.html b/testing/web-platform/tests/websockets/constructor/011.html
index 0efe02216512..e8d0b3aaf1f0 100644
--- a/testing/web-platform/tests/websockets/constructor/011.html
+++ b/testing/web-platform/tests/websockets/constructor/011.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/012.html b/testing/web-platform/tests/websockets/constructor/012.html
index 66ca9eaf2a99..29ac6d53f9e3 100644
--- a/testing/web-platform/tests/websockets/constructor/012.html
+++ b/testing/web-platform/tests/websockets/constructor/012.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/013.html b/testing/web-platform/tests/websockets/constructor/013.html
index 137922daeb0b..fe777af19660 100644
--- a/testing/web-platform/tests/websockets/constructor/013.html
+++ b/testing/web-platform/tests/websockets/constructor/013.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/014.html b/testing/web-platform/tests/websockets/constructor/014.html
index a120138e2a72..579a5d3ed461 100644
--- a/testing/web-platform/tests/websockets/constructor/014.html
+++ b/testing/web-platform/tests/websockets/constructor/014.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 
diff --git a/testing/web-platform/tests/websockets/constructor/016.html b/testing/web-platform/tests/websockets/constructor/016.html
index 938d591e3635..a1bf28167907 100644
--- a/testing/web-platform/tests/websockets/constructor/016.html
+++ b/testing/web-platform/tests/websockets/constructor/016.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/017.html b/testing/web-platform/tests/websockets/constructor/017.html
index 69358ec65dcd..8a7960d88657 100644
--- a/testing/web-platform/tests/websockets/constructor/017.html
+++ b/testing/web-platform/tests/websockets/constructor/017.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var tests = [
diff --git a/testing/web-platform/tests/websockets/constructor/018.html b/testing/web-platform/tests/websockets/constructor/018.html
index 71359d0d0939..d96d4be6b655 100644
--- a/testing/web-platform/tests/websockets/constructor/018.html
+++ b/testing/web-platform/tests/websockets/constructor/018.html
@@ -3,12 +3,14 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query?x\u0000');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query?x\u0000y\u0000');
   ws.onmessage = t.step_func(function(e) {
-    assert_equals(e.data, 'x%00');
+    assert_equals(e.data, 'x%00y');
     ws.close();
     t.done();
   })
diff --git a/testing/web-platform/tests/websockets/constructor/019.html b/testing/web-platform/tests/websockets/constructor/019.html
index 9e5c7922519c..b56745aa264e 100644
--- a/testing/web-platform/tests/websockets/constructor/019.html
+++ b/testing/web-platform/tests/websockets/constructor/019.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/020.html b/testing/web-platform/tests/websockets/constructor/020.html
index 37aaf8d01c73..55ca9934b4ed 100644
--- a/testing/web-platform/tests/websockets/constructor/020.html
+++ b/testing/web-platform/tests/websockets/constructor/020.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/constructor/021.html b/testing/web-platform/tests/websockets/constructor/021.html
index a313c7734bf4..80156540f7a0 100644
--- a/testing/web-platform/tests/websockets/constructor/021.html
+++ b/testing/web-platform/tests/websockets/constructor/021.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://certo2.oslo.osa/protocol_array",["foobar, foobar"])})});
diff --git a/testing/web-platform/tests/websockets/constructor/022.html b/testing/web-platform/tests/websockets/constructor/022.html
index 0e6c3480717d..136a40d10700 100644
--- a/testing/web-platform/tests/websockets/constructor/022.html
+++ b/testing/web-platform/tests/websockets/constructor/022.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/cookies/001.html b/testing/web-platform/tests/websockets/cookies/001.html
index ed3184565228..4f3514a20fd2 100644
--- a/testing/web-platform/tests/websockets/cookies/001.html
+++ b/testing/web-platform/tests/websockets/cookies/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var cookie_id = ((new Date())-0) + '.' + Math.random();
diff --git a/testing/web-platform/tests/websockets/cookies/002.html b/testing/web-platform/tests/websockets/cookies/002.html
index fd174f2aefbf..934d4e9364d0 100644
--- a/testing/web-platform/tests/websockets/cookies/002.html
+++ b/testing/web-platform/tests/websockets/cookies/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var cookie_id = ((new Date())-0) + '.' + Math.random();
diff --git a/testing/web-platform/tests/websockets/cookies/003.html b/testing/web-platform/tests/websockets/cookies/003.html
index 662221c57b39..eb27437e5902 100644
--- a/testing/web-platform/tests/websockets/cookies/003.html
+++ b/testing/web-platform/tests/websockets/cookies/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 setup({explict_done:true})
diff --git a/testing/web-platform/tests/websockets/cookies/004.html b/testing/web-platform/tests/websockets/cookies/004.html
index db6b3c1c2140..c172892b3a7b 100644
--- a/testing/web-platform/tests/websockets/cookies/004.html
+++ b/testing/web-platform/tests/websockets/cookies/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 setup({explicit_done:true})
diff --git a/testing/web-platform/tests/websockets/cookies/005.html b/testing/web-platform/tests/websockets/cookies/005.html
index 7b3d80f129cf..731fbfa12fb2 100644
--- a/testing/web-platform/tests/websockets/cookies/005.html
+++ b/testing/web-platform/tests/websockets/cookies/005.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 setup({explicit_done:true})
diff --git a/testing/web-platform/tests/websockets/cookies/006.html b/testing/web-platform/tests/websockets/cookies/006.html
index e14a90f7bdfa..7e975879a351 100644
--- a/testing/web-platform/tests/websockets/cookies/006.html
+++ b/testing/web-platform/tests/websockets/cookies/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var cookie_id = ((new Date())-0) + '.' + Math.random();
diff --git a/testing/web-platform/tests/websockets/cookies/007.html b/testing/web-platform/tests/websockets/cookies/007.html
index eba3139645a0..f4fc8c640c71 100644
--- a/testing/web-platform/tests/websockets/cookies/007.html
+++ b/testing/web-platform/tests/websockets/cookies/007.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var cookie_id = ((new Date())-0) + '.' + Math.random();
diff --git a/testing/web-platform/tests/websockets/extended-payload-length.html b/testing/web-platform/tests/websockets/extended-payload-length.html
index af0d90f0eb95..9e586a98d765 100644
--- a/testing/web-platform/tests/websockets/extended-payload-length.html
+++ b/testing/web-platform/tests/websockets/extended-payload-length.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/interfaces/CloseEvent/clean-close.html b/testing/web-platform/tests/websockets/interfaces/CloseEvent/clean-close.html
index 78a7b5034ab4..acc718516782 100644
--- a/testing/web-platform/tests/websockets/interfaces/CloseEvent/clean-close.html
+++ b/testing/web-platform/tests/websockets/interfaces/CloseEvent/clean-close.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html
index 7b1b49124af3..faf09783aed9 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html
index 685cb322dd7d..3af1d93a777e 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html
index c089d6b8e2e6..a6bd53015c62 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html
index 99798683799f..feddfb90ee68 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html
index c00a80a8bc14..68c47e4901e2 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html
index ba526a79d565..0398b0a9cd8f 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html
index 225990c8ef60..55e9cf9e99c0 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html
index 228c29fc30cc..677423736efa 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html
@@ -5,6 +5,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html
index 2c6016ced201..8200b7504ccc 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html
index a8eff27b3677..49b1330c9778 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html
index d031bfbf3e08..ab6c93b6173a 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
index b9aed783df48..2a110443974f 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
index b78202ea8152..d64ac694fb68 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var i = 0;
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-nested.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-nested.html
index 39506bbbe8e0..d66495a69279 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-nested.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-nested.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-replace.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-replace.html
index a880126d8cb1..a3d29d0c94d7 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-replace.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-replace.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-return.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-return.html
index c9ddec18bf41..c752c4224820 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-return.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-return.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/001.html
index 061a4d4096b4..efc249aab153 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/002.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/002.html
index 6c1330db1028..7280e09b4a86 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/002.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 // this test is testing WebIDL stuff
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/003.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/003.html
index 642e444cc00b..cdb06e5ebb00 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/003.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/004.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/004.html
index 4b3306440b1b..a5b7649dffa1 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/004.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/005.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/005.html
index 93b120088c87..b3c2e932e6d0 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/005.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/006.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/006.html
index 0a17f78f183f..702193456477 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/006.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/constants/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/001.html
index bb790bf48451..4af7636bf437 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['open', 'message', 'error', 'close'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/002.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/002.html
index caac06fd441f..279e0c5806f9 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/002.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['open', 'message', 'error', 'close'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/003.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/003.html
index 962fae319297..a9b76d84f3d5 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/003.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/004.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/004.html
index b26b2796f26f..0c384a6cfa2f 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/004.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/006.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/006.html
index 6fc1247e5a0e..f7ccf1030e39 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/006.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/007.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/007.html
index 79fd86271c4a..4305097d125d 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/007.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/007.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/008.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/008.html
index 122928122b1a..dd06f0d18839 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/008.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/008.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/009.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/009.html
index 76a13c81a6c2..dc25884ce0e0 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/009.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/009.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/010.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/010.html
index 61a184a3dcaa..f4a4850d66ff 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/010.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/010.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/011.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/011.html
index 13a506ddbc93..918becc1033d 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/011.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/011.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/012.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/012.html
index 54500aa7de57..633f02c4acbe 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/012.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/012.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/013.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/013.html
index e1d93770ad98..465505128e53 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/013.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/013.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/014.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/014.html
index 81c25484cb0d..9250fb267319 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/014.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/014.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/015.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/015.html
index b677e1ca1906..8852e6415a7c 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/015.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/015.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/016.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/016.html
index f76fa7f7185b..0e88c79032e2 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/016.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/016.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/017.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/017.html
index dd7c0f9b71b7..b2ed59367339 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/017.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/017.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/018.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/018.html
index 6a29f89889f5..a3ef0f500f90 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/018.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/018.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var ws = null;
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/019.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/019.html
index 605cfce2abec..f975a809808b 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/019.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/019.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 var events = ['open', 'message', 'error', 'close'];
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/020.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/020.html
index 6fd116d91a0e..54d96fe638f4 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/events/020.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/events/020.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/extensions/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/extensions/001.html
index dcdc752da82e..f5003868e8fe 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/extensions/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/extensions/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
index 4450401f945f..ba27228ec912 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/001.html
index cd2a8715d357..aa5d9fdf1949 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/002.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/002.html
index 9b88e04938f4..9e97416f36ec 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/002.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html
index 5ed73191e961..93d72b64bf23 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/004.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/004.html
index 3cc77f7117d0..fbe326a103d0 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/004.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/005.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/005.html
index a222f051d697..3ca8705296e4 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/005.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/006.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/006.html
index 62b3a05bd778..e0be938abc8d 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/006.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/007.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/007.html
index 39368aaf816f..12a4cd087bc9 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/007.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/007.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/008.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/008.html
index 473f634537b6..c83ead4e7be5 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/008.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/008.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/001.html
index 8e751787a821..3a22420ad6cb 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/002.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/002.html
index 407693881a5e..f5c7e4feb63b 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/002.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/003.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/003.html
index ddee85c243c4..08aadbf4665b 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/003.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/004.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/004.html
index 0033d144179f..af906b553331 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/004.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/004.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/005.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/005.html
index 2ead7ff928fd..69e727d11e80 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/005.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/005.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/006.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/006.html
index dc7197801b35..ce871a106d0d 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/006.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id="log"></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/007.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/007.html
index e10dd01e9284..73dd08930b58 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/007.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/007.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/008.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/008.html
index bca801e66648..c5fc34bd8c99 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/008.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/008.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/009.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/009.html
index ad1d0114b520..8f9417e77228 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/009.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/009.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t){
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/010.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/010.html
index fe780f58be52..f6680c66f7fb 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/010.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/010.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(outer) {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/011.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/011.html
index cfefba2aa63d..c00fa7f33b04 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/011.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/011.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/012.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/012.html
index 76b112d004c3..af5b935c6d58 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/send/012.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/send/012.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/001.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/001.html
index 5999f7e3489b..3d1e5e5b89c4 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/001.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/002.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/002.html
index 1c58e86e022c..aa11664020ac 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/002.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html
index 3f0a2a289403..8cc0b7919437 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/004.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/004.html
index 9203e1f35558..908e2cd9eb1b 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/004.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/004.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/005.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/005.html
index 1fa1fcc57ad6..f3d89cf2eaed 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/005.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/006.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/006.html
index 72493f8da4e7..124bdbc19e5b 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/006.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/006.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/resolve.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/resolve.html
index 7708b69c8b6e..ad7db147f2f7 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/url/resolve.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/url/resolve.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../../../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 test(function() {
diff --git a/testing/web-platform/tests/websockets/keeping-connection-open/001.html b/testing/web-platform/tests/websockets/keeping-connection-open/001.html
index c291502daf5f..ec18fe67e26c 100644
--- a/testing/web-platform/tests/websockets/keeping-connection-open/001.html
+++ b/testing/web-platform/tests/websockets/keeping-connection-open/001.html
@@ -5,6 +5,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/opening-handshake/001.html b/testing/web-platform/tests/websockets/opening-handshake/001.html
index 817189826f49..9683a3595022 100644
--- a/testing/web-platform/tests/websockets/opening-handshake/001.html
+++ b/testing/web-platform/tests/websockets/opening-handshake/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/opening-handshake/002.html b/testing/web-platform/tests/websockets/opening-handshake/002.html
index 26e5b07806fe..d18ec6e43ae3 100644
--- a/testing/web-platform/tests/websockets/opening-handshake/002.html
+++ b/testing/web-platform/tests/websockets/opening-handshake/002.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/opening-handshake/003.html b/testing/web-platform/tests/websockets/opening-handshake/003.html
index b5220428cbeb..6c634b0e9a1f 100644
--- a/testing/web-platform/tests/websockets/opening-handshake/003.html
+++ b/testing/web-platform/tests/websockets/opening-handshake/003.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/opening-handshake/005.html b/testing/web-platform/tests/websockets/opening-handshake/005.html
index fc5bc4dfb9ff..3a1a964c232e 100644
--- a/testing/web-platform/tests/websockets/opening-handshake/005.html
+++ b/testing/web-platform/tests/websockets/opening-handshake/005.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/security/001.html b/testing/web-platform/tests/websockets/security/001.html
index a5c725efb7e3..4cc24598bd31 100644
--- a/testing/web-platform/tests/websockets/security/001.html
+++ b/testing/web-platform/tests/websockets/security/001.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/security/002.html b/testing/web-platform/tests/websockets/security/002.html
index bb4d8eb8842b..2bdc133ec239 100644
--- a/testing/web-platform/tests/websockets/security/002.html
+++ b/testing/web-platform/tests/websockets/security/002.html
@@ -3,6 +3,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/websockets/unload-a-document/001-1.html b/testing/web-platform/tests/websockets/unload-a-document/001-1.html
index 08ae66616c38..214246b2ee8f 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/001-1.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/001-1.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context</title>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff --git a/testing/web-platform/tests/websockets/unload-a-document/001.html b/testing/web-platform/tests/websockets/unload-a-document/001.html
index dfc55aa7d693..d949b6eba09d 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/001.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/001.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/utils.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <p>Test requires popup blocker disabled</p>
 <div id=log></div>
 <script>
diff --git a/testing/web-platform/tests/websockets/unload-a-document/002-1.html b/testing/web-platform/tests/websockets/unload-a-document/002-1.html
index 7f4e004f37d1..86a852b101c1 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/002-1.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/002-1.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context with closed websocket</title>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff --git a/testing/web-platform/tests/websockets/unload-a-document/002.html b/testing/web-platform/tests/websockets/unload-a-document/002.html
index 9894b1e1dec3..df35192d6a41 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/002.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/002.html
@@ -5,6 +5,8 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/utils.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <p>Test requires popup blocker disabled</p>
 <div id=log></div>
 <script>
diff --git a/testing/web-platform/tests/websockets/unload-a-document/005-1.html b/testing/web-platform/tests/websockets/unload-a-document/005-1.html
index a3386634f626..04a14874aa0c 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/005-1.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/005-1.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <title>WebSockets: navigating nested browsing context with a websocket in top-level</title>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <script>
 var t = opener.t;
 var assert_unreached = opener.assert_unreached;
diff --git a/testing/web-platform/tests/websockets/unload-a-document/005.html b/testing/web-platform/tests/websockets/unload-a-document/005.html
index 7375f642ad3f..4bafe8b603ad 100644
--- a/testing/web-platform/tests/websockets/unload-a-document/005.html
+++ b/testing/web-platform/tests/websockets/unload-a-document/005.html
@@ -4,6 +4,8 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=../constants.js?pipe=sub></script>
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
 <div id=log></div>
 <p>Test requires popup blocker disabled</p>
 <div id=log></div>
diff --git a/testing/web-platform/tests/webvtt/OWNERS b/testing/web-platform/tests/webvtt/OWNERS
index dd2b7600f63a..0ea4adb9056b 100644
--- a/testing/web-platform/tests/webvtt/OWNERS
+++ b/testing/web-platform/tests/webvtt/OWNERS
@@ -1,4 +1,3 @@
-@foolip
 @r12a
 @silviapfeiffer
 @zcorpan
diff --git a/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm b/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm
index 58a31f042520..aea7e025c16c 100644
--- a/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm
+++ b/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm
@@ -25,9 +25,9 @@ async_test(function(t) {
 });
 
 test(function() {
-  assert_throws("NotSupportedError", function() {
-    document.createEvent("ErrorEvent");
-  }, "should not be supported");
+  var e = document.createEvent("ErrorEvent");
+  var eProto = Object.getPrototypeOf(e);
+  assert_equals(eProto, ErrorEvent.prototype);
 }, "document.createEvent('ErrorEvent')");
 
 test(function() {
diff --git a/testing/web-platform/tests/workers/constructors/Worker/sample_worker/worker.js b/testing/web-platform/tests/workers/constructors/Worker/sample_worker/worker.js
new file mode 100644
index 000000000000..19bbea58e767
--- /dev/null
+++ b/testing/web-platform/tests/workers/constructors/Worker/sample_worker/worker.js
@@ -0,0 +1 @@
+onmessage = function(event) { postMessage(event.data); }
diff --git a/testing/web-platform/tests/workers/constructors/Worker/use-base-url.html b/testing/web-platform/tests/workers/constructors/Worker/use-base-url.html
new file mode 100644
index 000000000000..94ce2a71f142
--- /dev/null
+++ b/testing/web-platform/tests/workers/constructors/Worker/use-base-url.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Use the document base url when resolving worker URLs</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<base href="/workers/constructors/Worker/sample_worker/">
+<script>
+    async_test(function(t) {
+        var worker = new Worker('worker.js');
+        var data = "foo";
+        worker.postMessage(data);
+        worker.onmessage = t.step_func_done(function(event) {
+            assert_equals(event.data, data, "event.data does not match expected data");
+        });
+        worker.onerror = t.unreached_func("received error event");
+    }, "Use the document base url when resolving worker URLs");
+</script>