diff --git a/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini b/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
index d40989a91ef..86ba08df8f3 100644
--- a/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
+++ b/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
@@ -69,3 +69,6 @@
   [Array with mixed types]
     expected: FAIL
 
+  [no-argument Blob constructor without 'new']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini b/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini
new file mode 100644
index 00000000000..665ea8e0562
--- /dev/null
+++ b/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini
@@ -0,0 +1,137 @@
+[idlharness.worker]
+  type: testharness
+  [URL interface: operation createObjectURL(Blob)]
+    expected: FAIL
+
+  [URL interface: operation createFor(Blob)]
+    expected: FAIL
+
+  [URL interface: operation revokeObjectURL(DOMString)]
+    expected: FAIL
+
+  [Blob interface: attribute isClosed]
+    expected: FAIL
+
+  [Blob interface: operation close()]
+    expected: FAIL
+
+  [Blob interface: new Blob(["TEST"\]) must inherit property "isClosed" with the proper type (2)]
+    expected: FAIL
+
+  [Blob interface: new Blob(["TEST"\]) must inherit property "close" with the proper type (4)]
+    expected: FAIL
+
+  [File interface: existence and properties of interface object]
+    expected: FAIL
+
+  [File interface object length]
+    expected: FAIL
+
+  [File interface: attribute lastModified]
+    expected: FAIL
+
+  [File must be primary interface of new File(["myFileBits"\], "myFileName")]
+    expected: FAIL
+
+  [Stringification of new File(["myFileBits"\], "myFileName")]
+    expected: FAIL
+
+  [File interface: new File(["myFileBits"\], "myFileName") must inherit property "name" with the proper type (0)]
+    expected: FAIL
+
+  [File interface: new File(["myFileBits"\], "myFileName") must inherit property "lastModified" with the proper type (1)]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "size" with the proper type (0)]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "type" with the proper type (1)]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "isClosed" with the proper type (2)]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "slice" with the proper type (3)]
+    expected: FAIL
+
+  [Blob interface: calling slice(long long,long long,DOMString) on new File(["myFileBits"\], "myFileName") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileList interface object length]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [FileList interface: operation item(unsigned long)]
+    expected: FAIL
+
+  [FileList interface: attribute length]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileReader interface: operation readAsArrayBuffer(Blob)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsArrayBuffer" with the proper type (0)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsArrayBuffer(Blob) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReaderSync interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileReaderSync interface object length]
+    expected: FAIL
+
+  [FileReaderSync interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [FileReaderSync interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [FileReaderSync interface: operation readAsArrayBuffer(Blob)]
+    expected: FAIL
+
+  [FileReaderSync interface: operation readAsText(Blob,DOMString)]
+    expected: FAIL
+
+  [FileReaderSync interface: operation readAsDataURL(Blob)]
+    expected: FAIL
+
+  [FileReaderSync must be primary interface of new FileReaderSync()]
+    expected: FAIL
+
+  [Stringification of new FileReaderSync()]
+    expected: FAIL
+
+  [FileReaderSync interface: new FileReaderSync() must inherit property "readAsArrayBuffer" with the proper type (0)]
+    expected: FAIL
+
+  [FileReaderSync interface: calling readAsArrayBuffer(Blob) on new FileReaderSync() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReaderSync interface: new FileReaderSync() must inherit property "readAsText" with the proper type (1)]
+    expected: FAIL
+
+  [FileReaderSync interface: calling readAsText(Blob,DOMString) on new FileReaderSync() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReaderSync interface: new FileReaderSync() must inherit property "readAsDataURL" with the proper type (2)]
+    expected: FAIL
+
+  [FileReaderSync interface: calling readAsDataURL(Blob) on new FileReaderSync() with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f3346144921..2b24fcb09c6 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -746,12 +746,12 @@
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-id-manual.html"
       },
       {
-        "path": "notifications/Notification-requestPermission-denied-manual.html",
-        "url": "/notifications/Notification-requestPermission-denied-manual.html"
+        "path": "notifications/body-basic-manual.html",
+        "url": "/notifications/body-basic-manual.html"
       },
       {
-        "path": "notifications/Notification-requestPermission-granted-manual.html",
-        "url": "/notifications/Notification-requestPermission-granted-manual.html"
+        "path": "notifications/body-empty-manual.html",
+        "url": "/notifications/body-empty-manual.html"
       },
       {
         "path": "notifications/event-onclick-manual.html",
@@ -766,44 +766,28 @@
         "url": "/notifications/event-onerror-denied-manual.html"
       },
       {
-        "path": "notifications/notification-body-basic-manual.html",
-        "url": "/notifications/notification-body-basic-manual.html"
+        "path": "notifications/icon-basic-manual.html",
+        "url": "/notifications/icon-basic-manual.html"
       },
       {
-        "path": "notifications/notification-body-empty-manual.html",
-        "url": "/notifications/notification-body-empty-manual.html"
+        "path": "notifications/icon-empty-manual.html",
+        "url": "/notifications/icon-empty-manual.html"
       },
       {
-        "path": "notifications/notification-close-manual.html",
-        "url": "/notifications/notification-close-manual.html"
+        "path": "notifications/requestPermission-denied-manual.html",
+        "url": "/notifications/requestPermission-denied-manual.html"
       },
       {
-        "path": "notifications/notification-dir-auto-manual.html",
-        "url": "/notifications/notification-dir-auto-manual.html"
+        "path": "notifications/requestPermission-granted-manual.html",
+        "url": "/notifications/requestPermission-granted-manual.html"
       },
       {
-        "path": "notifications/notification-dir-ltr-manual.html",
-        "url": "/notifications/notification-dir-ltr-manual.html"
+        "path": "notifications/tag-different-manual.html",
+        "url": "/notifications/tag-different-manual.html"
       },
       {
-        "path": "notifications/notification-dir-rtl-manual.html",
-        "url": "/notifications/notification-dir-rtl-manual.html"
-      },
-      {
-        "path": "notifications/notification-icon-basic-manual.html",
-        "url": "/notifications/notification-icon-basic-manual.html"
-      },
-      {
-        "path": "notifications/notification-icon-empty-manual.html",
-        "url": "/notifications/notification-icon-empty-manual.html"
-      },
-      {
-        "path": "notifications/notification-tag-different-manual.html",
-        "url": "/notifications/notification-tag-different-manual.html"
-      },
-      {
-        "path": "notifications/notification-tag-same-manual.html",
-        "url": "/notifications/notification-tag-same-manual.html"
+        "path": "notifications/tag-same-manual.html",
+        "url": "/notifications/tag-same-manual.html"
       },
       {
         "path": "page-visibility/test_minimize-manual.html",
@@ -4275,6 +4259,16 @@
         ],
         "url": "/html/rendering/non-replaced-elements/tables/table-width-150percent.html"
       },
+      {
+        "path": "html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/the-fieldset-element-0/ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html"
+      },
       {
         "path": "html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml",
         "references": [
@@ -10473,6 +10467,10 @@
         "path": "FileAPI/idlharness.html",
         "url": "/FileAPI/idlharness.html"
       },
+      {
+        "path": "FileAPI/idlharness.worker.js",
+        "url": "/FileAPI/idlharness.worker"
+      },
       {
         "path": "FileAPI/reading-data-section/Determining-Encoding.html",
         "url": "/FileAPI/reading-data-section/Determining-Encoding.html"
@@ -16930,8 +16928,12 @@
         "url": "/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html"
       },
       {
-        "path": "html/semantics/forms/the-fieldset-element/disabled.html",
-        "url": "/html/semantics/forms/the-fieldset-element/disabled.html"
+        "path": "html/semantics/forms/the-fieldset-element/disabled-001.html",
+        "url": "/html/semantics/forms/the-fieldset-element/disabled-001.html"
+      },
+      {
+        "path": "html/semantics/forms/the-fieldset-element/disabled-002.xhtml",
+        "url": "/html/semantics/forms/the-fieldset-element/disabled-002.xhtml"
       },
       {
         "path": "html/semantics/forms/the-form-element/form-autocomplete.html",
@@ -17097,6 +17099,10 @@
         "path": "html/semantics/forms/the-label-element/labelable-elements.html",
         "url": "/html/semantics/forms/the-label-element/labelable-elements.html"
       },
+      {
+        "path": "html/semantics/forms/the-legend-element/legend-form.html",
+        "url": "/html/semantics/forms/the-legend-element/legend-form.html"
+      },
       {
         "path": "html/semantics/forms/the-meter-element/meter.html",
         "url": "/html/semantics/forms/the-meter-element/meter.html"
@@ -18305,6 +18311,14 @@
         "path": "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
         "url": "/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html"
       },
+      {
+        "path": "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html",
+        "url": "/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html"
+      },
+      {
+        "path": "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
+        "url": "/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html"
+      },
       {
         "path": "mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html",
         "url": "/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html"
@@ -18357,6 +18371,10 @@
         "path": "mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
         "url": "/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html"
       },
+      {
+        "path": "mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
+        "url": "/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html"
+      },
       {
         "path": "mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html",
         "url": "/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html"
@@ -18461,6 +18479,14 @@
         "path": "mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
         "url": "/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html"
       },
+      {
+        "path": "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html",
+        "url": "/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html"
+      },
+      {
+        "path": "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
+        "url": "/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html"
+      },
       {
         "path": "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html"
@@ -18569,6 +18595,18 @@
         "path": "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html"
@@ -18677,6 +18715,18 @@
         "path": "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html"
@@ -18713,6 +18763,10 @@
         "path": "mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html"
@@ -18749,6 +18803,10 @@
         "path": "mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html"
@@ -18857,6 +18915,18 @@
         "path": "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html"
@@ -18965,6 +19035,18 @@
         "path": "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
         "url": "/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html"
       },
+      {
+        "path": "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html"
+      },
+      {
+        "path": "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+        "url": "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html"
+      },
       {
         "path": "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
         "url": "/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html"
@@ -19270,8 +19352,12 @@
         "url": "/navigation-timing/test_unique_performance_objects.html"
       },
       {
-        "path": "notifications/Notification-permission.html",
-        "url": "/notifications/Notification-permission.html"
+        "path": "notifications/constructor-basic.html",
+        "url": "/notifications/constructor-basic.html"
+      },
+      {
+        "path": "notifications/constructor-invalid.html",
+        "url": "/notifications/constructor-invalid.html"
       },
       {
         "path": "notifications/event-onclose.html",
@@ -19290,16 +19376,12 @@
         "url": "/notifications/interfaces.html"
       },
       {
-        "path": "notifications/notification-constructor-basic.html",
-        "url": "/notifications/notification-constructor-basic.html"
+        "path": "notifications/lang.html",
+        "url": "/notifications/lang.html"
       },
       {
-        "path": "notifications/notification-constructor-invalid.html",
-        "url": "/notifications/notification-constructor-invalid.html"
-      },
-      {
-        "path": "notifications/notification-lang.html",
-        "url": "/notifications/notification-lang.html"
+        "path": "notifications/permission.html",
+        "url": "/notifications/permission.html"
       },
       {
         "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_004.htm",
@@ -24793,22 +24875,10 @@
         "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html"
       },
-      {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html",
-        "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html"
-      },
-      {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html",
-        "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html"
-      },
       {
         "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html"
       },
-      {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html",
-        "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html"
-      },
       {
         "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html"
@@ -25005,18 +25075,6 @@
         "path": "shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html",
         "url": "/shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html"
       },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html",
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html",
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html",
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html"
-      },
       {
         "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-003.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-003.html"
@@ -25065,66 +25123,6 @@
         "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html"
       },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html",
-        "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html"
-      },
       {
         "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html"
@@ -25197,10 +25195,6 @@
         "path": "shadow-dom/styles/test-001.html",
         "url": "/shadow-dom/styles/test-001.html"
       },
-      {
-        "path": "shadow-dom/styles/test-002.html",
-        "url": "/shadow-dom/styles/test-002.html"
-      },
       {
         "path": "shadow-dom/styles/test-003.html",
         "url": "/shadow-dom/styles/test-003.html"
@@ -25849,6 +25843,10 @@
         "path": "websockets/Close-Reason-124Bytes.htm",
         "url": "/websockets/Close-Reason-124Bytes.htm"
       },
+      {
+        "path": "websockets/Close-clamp.htm",
+        "url": "/websockets/Close-clamp.htm"
+      },
       {
         "path": "websockets/Close-null.htm",
         "url": "/websockets/Close-null.htm"
@@ -28859,16 +28857,7 @@
   },
   "local_changes": {
     "deleted": [],
-    "items": {
-      "testharness": {
-        "websockets/Close-clamp.htm": [
-          {
-            "path": "websockets/Close-clamp.htm",
-            "url": "/websockets/Close-clamp.htm"
-          }
-        ]
-      }
-    },
+    "items": {},
     "reftest_nodes": {}
   },
   "reftest_nodes": {
@@ -30672,6 +30661,18 @@
         "url": "/html/rendering/non-replaced-elements/tables/table-width-150percent.html"
       }
     ],
+    "html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html": [
+      {
+        "path": "html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/the-fieldset-element-0/ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html"
+      }
+    ],
     "html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml": [
       {
         "path": "html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml",
@@ -34333,7 +34334,7 @@
       }
     ]
   },
-  "rev": "5e3ea8f49fee68c327388bfd1dd1375a8ce12a0e",
+  "rev": "12d3e15e5ecae695e1216c358d613705fbff6b68",
   "url_base": "/",
   "version": 2
 }
\ No newline at end of file
diff --git a/tests/wpt/metadata/dom/nodes/ChildNode-after.html.ini b/tests/wpt/metadata/dom/nodes/ChildNode-after.html.ini
deleted file mode 100644
index e0ebd79a258..00000000000
--- a/tests/wpt/metadata/dom/nodes/ChildNode-after.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[ChildNode-after.html]
-  type: testharness
-  [Comment.after() with one sibling of child and text as arguments.]
-    expected: FAIL
-
-  [Element.after() with one sibling of child and text as arguments.]
-    expected: FAIL
-
-  [Text.after() with one sibling of child and text as arguments.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/nodes/Element-matches.html.ini b/tests/wpt/metadata/dom/nodes/Element-matches.html.ini
new file mode 100644
index 00000000000..cf9f112738c
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Element-matches.html.ini
@@ -0,0 +1,86 @@
+[Element-matches.html]
+  type: testharness
+  [In-document Element.matches: Attribute hyphen-separated list selector, matching lang attribute with partial value (with no refNodes): #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [In-document Element.matches: :target pseudo-class selector, matching the element referenced by the URL fragment identifier (with no refNodes): :target]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching inherited language (with no refNodes): #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching specified language with exact value (with no refNodes): #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching specified language with partial value (with no refNodes): #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [In-document Element.matches: :checked pseudo-class selector, matching checked radio buttons and checkboxes (with no refNodes): #pseudo-ui :checked]
+    expected: FAIL
+
+  [Detached Element.matches: Attribute hyphen-separated list selector, matching lang attribute with partial value (with no refNodes): #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Detached Element.matches: :lang pseudo-class selector, matching specified language with exact value (with no refNodes): #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Detached Element.matches: :lang pseudo-class selector, matching specified language with partial value (with no refNodes): #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Detached Element.matches: :enabled pseudo-class selector, matching all disabled form controls (with no refNodes): #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Detached Element.matches: :checked pseudo-class selector, matching checked radio buttons and checkboxes (with no refNodes): #pseudo-ui :checked]
+    expected: FAIL
+
+  [Fragment Element.matches: Attribute hyphen-separated list selector, matching lang attribute with partial value (with no refNodes): #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Fragment Element.matches: :lang pseudo-class selector, matching specified language with exact value (with no refNodes): #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Fragment Element.matches: :lang pseudo-class selector, matching specified language with partial value (with no refNodes): #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Fragment Element.matches: :enabled pseudo-class selector, matching all disabled form controls (with no refNodes): #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Fragment Element.matches: :checked pseudo-class selector, matching checked radio buttons and checkboxes (with no refNodes): #pseudo-ui :checked]
+    expected: FAIL
+
+  [In-document Element.matches: Universal selector, matching all children of the specified reference element (with refNode Element): >*]
+    expected: FAIL
+
+  [In-document Element.matches: Universal selector, matching all grandchildren of the specified reference element (with refNode Element): >*>*]
+    expected: FAIL
+
+  [In-document Element.matches: Universal selector, matching all descendants of the specified reference element (with refNode Element): *]
+    expected: FAIL
+
+  [In-document Element.matches: Attribute hyphen-separated list selector, matching lang attribute with partial value (with refNode Element): #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching inherited language (1) (with no refNodes): #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching specified language with exact value (1) (with no refNodes): #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [In-document Element.matches: :lang pseudo-class selector, matching specified language with partial value (1) (with no refNodes): #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [In-document Element.matches: :checked pseudo-class selector, matching checked radio buttons and checkboxes (1) (with no refNodes): #pseudo-ui :checked]
+    expected: FAIL
+
+  [In-document Element.matches: Class selector, matching element with class value using non-ASCII characters (with no refNodes): .台北Táiběi]
+    expected: FAIL
+
+  [In-document Element.matches: Class selector, chained, matching element with multiple class values using non-ASCII characters (with no refNodes): .台北Táiběi.台北]
+    expected: FAIL
+
+  [In-document Element.matches: ID selector, matching id value using non-ASCII characters (with no refNodes): #台北Táiběi]
+    expected: FAIL
+
+  [In-document Element.matches: ID selector, matching id values using non-ASCII characters (with no refNodes): #台北Táiběi, #台北]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini
new file mode 100644
index 00000000000..a99874300b0
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini
@@ -0,0 +1,761 @@
+[ParentNode-querySelector-All.html]
+  type: testharness
+  [Detached Element.querySelectorAll tree order]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll tree order]
+    expected: FAIL
+
+  [Document.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Document.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Document.querySelectorAll: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Document.querySelector: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Document.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Document.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Document.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Document.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Document.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Document.querySelector: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Document.querySelectorAll: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Document.querySelector: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Document.querySelectorAll: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Document.querySelector: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Document.querySelectorAll: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Document.querySelector: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Document.querySelectorAll: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Document.querySelector: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Document.querySelectorAll: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Document.querySelector: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Document.querySelectorAll: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Document.querySelector: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Document.querySelectorAll: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [Document.querySelector: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Detached Element.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Detached Element.querySelector: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Detached Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Detached Element.querySelector: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Detached Element.querySelector: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Detached Element.querySelector: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Detached Element.querySelector: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :enabled pseudo-class selector, matching all enabled form controls: #pseudo-ui :enabled]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :enabled pseudo-class selector, matching all disabled form controls: #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Detached Element.querySelector: :enabled pseudo-class selector, matching all disabled form controls: #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Detached Element.querySelector: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Detached Element.querySelector: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Detached Element.querySelector: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Detached Element.querySelector: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Detached Element.querySelectorAll: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [Detached Element.querySelector: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Fragment.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Fragment.querySelector: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Fragment.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Fragment.querySelector: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Fragment.querySelector: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Fragment.querySelector: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Fragment.querySelector: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :enabled pseudo-class selector, matching all enabled form controls: #pseudo-ui :enabled]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :enabled pseudo-class selector, matching all disabled form controls: #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Fragment.querySelector: :enabled pseudo-class selector, matching all disabled form controls: #pseudo-ui :disabled]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Fragment.querySelector: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Fragment.querySelector: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Fragment.querySelector: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Fragment.querySelector: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [Fragment.querySelectorAll: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [Fragment.querySelector: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Type selector, matching html element: html]
+    expected: FAIL
+
+  [In-document Element.querySelector: Type selector, matching html element: html]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Type selector, matching body element: body]
+    expected: FAIL
+
+  [In-document Element.querySelector: Type selector, matching body element: body]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Universal selector, matching all children of element with specified ID: #universal>*]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Universal selector, matching all grandchildren of element with specified ID: #universal>*>*]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Universal selector, matching all descendants of element with specified ID: #universal *]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching align attribute with value: .attr-presence-div1[align\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching align attribute with empty value: .attr-presence-div2[align\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching title attribute, case insensitivity: #attr-presence [TiTlE\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching custom data-* attribute: [data-attr-presence\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching attribute with non-ASCII characters: ul[data-中文\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching option with selected attribute: #attr-presence-select2 option[selected\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute presence selector, matching multiple options with selected attributes: #attr-presence-select3 option[selected\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector, matching align attribute with value: #attr-value [align="center"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector, matching align attribute with empty value: #attr-value [align=""\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector, matching custom data-* attribute with unicode escaped value: [data-attr-value="\\e9"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector, matching custom data-* attribute with escaped character: [data-attr-value_foo="\\e9"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector with single-quoted value, matching multiple inputs with type attributes: #attr-value input[type='hidden'\],#attr-value input[type='radio'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector with double-quoted value, matching multiple inputs with type attributes: #attr-value input[type="hidden"\],#attr-value input[type='radio'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector with unquoted value, matching multiple inputs with type attributes: #attr-value input[type=hidden\],#attr-value input[type=radio\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute value selector, matching attribute with value using non-ASCII characters: [data-attr-value=中文\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector, matching class attribute with value: #attr-whitespace [class~="div1"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [In-document Element.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector, matching custom data-* attribute with unicode escaped value: [data-attr-whitespace~="\\0000e9"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector, matching custom data-* attribute with escaped character: [data-attr-whitespace_foo~="\\e9"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector with single-quoted value, matching multiple links with rel attributes: #attr-whitespace a[rel~='bookmark'\],  #attr-whitespace a[rel~='nofollow'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector with double-quoted value, matching multiple links with rel attributes: #attr-whitespace a[rel~="bookmark"\],#attr-whitespace a[rel~='nofollow'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector with unquoted value, matching multiple links with rel attributes: #attr-whitespace a[rel~=bookmark\],    #attr-whitespace a[rel~=nofollow\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute whitespace-separated list selector, matching title attribute with value using non-ASCII characters: #attr-whitespace [title~=中文\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute hyphen-separated list selector, matching lang attribute with exact value: #attr-hyphen-div2[lang|="fr"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [In-document Element.querySelector: Attribute hyphen-separated list selector, matching lang attribute with partial value: #attr-hyphen-div3[lang|="en"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute begins with selector, matching href attributes beginning with specified substring: #attr-begins a[href^="http://www"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute begins with selector, matching lang attributes beginning with specified substring, : #attr-begins [lang^="en-"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute begins with selector with single-quoted value, matching class attribute beginning with specified substring: #attr-begins [class^=' apple'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute begins with selector with double-quoted value, matching class attribute beginning with specified substring: #attr-begins [class^=" apple"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute ends with selector, matching href attributes ending with specified substring: #attr-ends a[href$=".org"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute ends with selector, matching lang attributes ending with specified substring, : #attr-ends [lang$="-CH"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute ends with selector with single-quoted value, matching class attribute ending with specified substring: #attr-ends [class$='apple '\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute ends with selector with double-quoted value, matching class attribute ending with specified substring: #attr-ends [class$="apple "\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector, matching href attributes beginning with specified substring: #attr-contains a[href*="http://www"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector, matching href attributes ending with specified substring: #attr-contains a[href*=".org"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector, matching href attributes containing specified substring: #attr-contains a[href*=".example."\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector, matching lang attributes beginning with specified substring, : #attr-contains [lang*="en-"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector, matching lang attributes ending with specified substring, : #attr-contains [lang*="-CH"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with single-quoted value, matching class attribute beginning with specified substring: #attr-contains [class*=' apple'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with single-quoted value, matching class attribute ending with specified substring: #attr-contains [class*='orange '\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with single-quoted value, matching class attribute containing specified substring: #attr-contains [class*='ple banana ora'\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with double-quoted value, matching class attribute beginning with specified substring: #attr-contains [class*=" apple"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with double-quoted value, matching class attribute ending with specified substring: #attr-contains [class*="orange "\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with double-quoted value, matching class attribute containing specified substring: #attr-contains [class*="ple banana ora"\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with unquoted value, matching class attribute beginning with specified substring: #attr-contains [class*= apple\]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with unquoted value, matching class attribute ending with specified substring: #attr-contains [class*=orange \]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Attribute contains selector with unquoted value, matching class attribute containing specified substring: #attr-contains [class*= banana \]]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :root pseudo-class selector, not matching document root element: :root]
+    expected: FAIL
+
+  [In-document Element.querySelector: :root pseudo-class selector, not matching document root element: :root]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-child selector, matching the third child element: #pseudo-nth-table1 :nth-child(3)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-child selector, matching every third child element: #pseudo-nth li:nth-child(3n)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-child selector, matching every second child element, starting from the fourth: #pseudo-nth li:nth-child(2n+4)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-child selector, matching every fourth child element, starting from the third: #pseudo-nth-p1 :nth-child(4n-1)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-child selector, matching the third last child element: #pseudo-nth-table1 :nth-last-child(3)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-child selector, matching every third child element from the end: #pseudo-nth li:nth-last-child(3n)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-child selector, matching every second child element from the end, starting from the fourth last: #pseudo-nth li:nth-last-child(2n+4)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-child selector, matching every fourth element from the end, starting from the third last: #pseudo-nth-p1 :nth-last-child(4n-1)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-of-type selector, matching the third em element: #pseudo-nth-p1 em:nth-of-type(3)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-of-type selector, matching every second element of their type: #pseudo-nth-p1 :nth-of-type(2n)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-of-type selector, matching every second elemetn of their type, starting from the first: #pseudo-nth-p1 span:nth-of-type(2n-1)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-of-type selector, matching the thrid last em element: #pseudo-nth-p1 em:nth-last-of-type(3)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-of-type selector, matching every second last element of their type: #pseudo-nth-p1 :nth-last-of-type(2n)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :nth-last-of-type selector, matching every second last element of their type, starting from the last: #pseudo-nth-p1 span:nth-last-of-type(2n-1)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-of-type selector, matching the first em element: #pseudo-nth-p1 em:first-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-of-type selector, matching the first of every type of element: #pseudo-nth-p1 :first-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-of-type selector, matching the first td element in each table row: #pseudo-nth-table1 tr :first-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :last-of-type selector, matching the last em elemnet: #pseudo-nth-p1 em:last-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :last-of-type selector, matching the last of every type of element: #pseudo-nth-p1 :last-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :last-of-type selector, matching the last td element in each table row: #pseudo-nth-table1 tr :last-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-child pseudo-class selector, matching first child div element: #pseudo-first-child div:first-child]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-child pseudo-class selector, matching first-child of multiple elements: #pseudo-first-child span:first-child]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :last-child pseudo-class selector, matching last child div element: #pseudo-last-child div:last-child]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :last-child pseudo-class selector, matching first-child of multiple elements: #pseudo-last-child span:last-child]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :pseudo-only-child pseudo-class selector, matching all only-child elements: #pseudo-only :only-child]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :pseudo-only-of-type pseudo-class selector, matching all elements with no siblings of the same type: #pseudo-only :only-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :pseudo-only-of-type pseudo-class selector, matching em elements with no siblings of the same type: #pseudo-only em:only-of-type]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :empty pseudo-class selector, matching empty p elements: #pseudo-empty p:empty]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :empty pseudo-class selector, matching all empty elements: #pseudo-empty :empty]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :link and :visited pseudo-class selectors, matching a and area elements with href attributes: #pseudo-link :link, #pseudo-link :visited]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :link and :visited pseudo-class selectors, not matching link elements with href attributes: #head :link, #head :visited]
+    expected: FAIL
+
+  [In-document Element.querySelector: :link and :visited pseudo-class selectors, not matching link elements with href attributes: #head :link, #head :visited]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [In-document Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [In-document Element.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [In-document Element.querySelector: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [In-document Element.querySelector: :lang pseudo-class selector, matching specified language with partial value: #pseudo-lang-div3:lang(en)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [In-document Element.querySelector: :lang pseudo-class selector, not matching incorrect language: #pseudo-lang-div4:lang(es-AR)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :enabled pseudo-class selector, matching all enabled form controls: #pseudo-ui :enabled]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [In-document Element.querySelector: :checked pseudo-class selector, matching checked radio buttons and checkboxes: #pseudo-ui :checked]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :not pseudo-class selector, matching : #not>:not(div)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :not pseudo-class selector, matching : #not * :not(:first-child)]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [In-document Element.querySelector: :first-line pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-line]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [In-document Element.querySelector: ::first-line pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-line]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [In-document Element.querySelector: :first-letter pseudo-element (one-colon syntax) selector, not matching any elements: #pseudo-element:first-letter]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [In-document Element.querySelector: ::first-letter pseudo-element (two-colon syntax) selector, not matching any elements: #pseudo-element::first-letter]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, matching element with specified class: .class-p]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, chained, matching only elements with all specified classes: #class .apple.orange.banana]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class Selector, chained, with type selector: div.apple.banana.orange]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, matching element with class value using non-ASCII characters: .台北Táiběi]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, matching multiple elements with class value using non-ASCII characters: .台北]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, chained, matching element with multiple class values using non-ASCII characters: .台北Táiběi.台北]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, matching element with class with escaped character: .foo\\:bar]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Class selector, matching element with class with escaped character: .test\\.foo\\[5\\\]bar]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching element with specified id: #id #id-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, chained, matching element with specified id: #id-div1, #id-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, chained, matching element with specified id: #id-div1, #id-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID Selector, chained, with type selector: div#id-div1, div#id-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching multiple elements with duplicate id: #id-li-duplicate]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching id value using non-ASCII characters: #台北Táiběi]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching id value using non-ASCII characters: #台北]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching id values using non-ASCII characters: #台北Táiběi, #台北]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching element with id with escaped character: #\\#foo\\:bar]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: ID selector, matching element with id with escaped character: #test\\.foo\\[5\\\]bar]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element with id that is a descendant of an element: body #descendant-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element with id that is a descendant of an element: div #descendant-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element with id that is a descendant of an element with id: #descendant #descendant-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element with class that is a descendant of an element with id: #descendant .descendant-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, matching element with class that is a descendant of an element with class: .descendant-div1 .descendant-div3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Descendant combinator, whitespace characters: #descendant\t\r\n#descendant-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, matching element that is a child of an element with id: #child>div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, matching element with id that is a child of an element: div>#child-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, matching element with id that is a child of an element with id: #child>#child-div1]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, matching element with id that is a child of an element with class: #child-div1>.child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, matching element with class that is a child of an element with class: .child-div1>.child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, surrounded by whitespace: #child-div1\t\r\n>\t\r\n#child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, whitespace after: #child-div1>\t\r\n#child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, whitespace before: #child-div1\t\r\n>#child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Child combinator, no whitespace: #child-div1>#child-div2]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching element that is an adjacent sibling of an element with id: #adjacent-div2+div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element: div+#adjacent-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element with id: #adjacent-div2+#adjacent-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with id: #adjacent-div2+.adjacent-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with class: .adjacent-div2+.adjacent-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, matching p element that is an adjacent sibling of a div element: #adjacent div+p]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, surrounded by whitespace: #adjacent-p2\t\r\n+\t\r\n#adjacent-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, whitespace after: #adjacent-p2+\t\r\n#adjacent-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, whitespace before: #adjacent-p2\t\r\n+#adjacent-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Adjacent sibling combinator, no whitespace: #adjacent-p2+#adjacent-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, matching element that is a sibling of an element with id: #sibling-div2~div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, matching element with id that is a sibling of an element: div~#sibling-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, matching element with id that is a sibling of an element with id: #sibling-div2~#sibling-div4]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, matching element with class that is a sibling of an element with id: #sibling-div2~.sibling-div]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, matching p element that is a sibling of a div element: #sibling div~p]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, surrounded by whitespace: #sibling-p2\t\r\n~\t\r\n#sibling-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, whitespace after: #sibling-p2~\t\r\n#sibling-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, whitespace before: #sibling-p2\t\r\n~#sibling-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: General sibling combinator, no whitespace: #sibling-p2~#sibling-p3]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Syntax, group of selectors separator, surrounded by whitespace: #group em\t\r \n,\t\r \n#group strong]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Syntax, group of selectors separator, whitespace after: #group em,\t\r\n#group strong]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Syntax, group of selectors separator, whitespace before: #group em\t\r\n,#group strong]
+    expected: FAIL
+
+  [In-document Element.querySelectorAll: Syntax, group of selectors separator, no whitespace: #group em,#group strong]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/Image-constructor.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/Image-constructor.html.ini
index 5e8f6e678d8..cf1b2d37e49 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/Image-constructor.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/Image-constructor.html.ini
@@ -3,3 +3,4 @@
   [Image and HTMLImageElement share a prototype]
     expected:
       if not debug: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled.html.ini b/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-001.html.ini
similarity index 96%
rename from tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled.html.ini
rename to tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-001.html.ini
index 458a1fd1e57..0be7a4a46c8 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-001.html.ini
@@ -1,4 +1,4 @@
-[disabled.html]
+[disabled-001.html]
   type: testharness
   [The disabled attribute, when specified, causes all the form control descendants of the fieldset element, excluding those that are descendants of the fieldset element's first legend element child, if any, to be disabled.]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-002.xhtml.ini b/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-002.xhtml.ini
new file mode 100644
index 00000000000..4c9713c8eaa
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/the-fieldset-element/disabled-002.xhtml.ini
@@ -0,0 +1,5 @@
+[disabled-002.xhtml]
+  type: testharness
+  [A file input without a disabled attribute that is a descendant of a disabled fieldset should be disabled (modulo legend-related complications that don't apply here)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
index 84e573b74ec..573ae073e83 100644
--- a/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/the-label-element/label-attributes.html.ini
@@ -33,3 +33,6 @@
   [Check that the labels property of a form control with no label returns a zero-length NodeList.]
     expected: FAIL
 
+  [A label's htmlFor attribute must reflect the for content attribute]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/the-legend-element/legend-form.html.ini b/tests/wpt/metadata/html/semantics/forms/the-legend-element/legend-form.html.ini
new file mode 100644
index 00000000000..9fccac3e419
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/the-legend-element/legend-form.html.ini
@@ -0,0 +1,5 @@
+[legend-form.html]
+  type: testharness
+  [Check if legend.form return null when legend has no fieldset element as its parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/mozilla-sync b/tests/wpt/metadata/mozilla-sync
index aea6bada764..f14d1287364 100644
--- a/tests/wpt/metadata/mozilla-sync
+++ b/tests/wpt/metadata/mozilla-sync
@@ -1 +1 @@
-f52a4a292aa30b1dcb3e36812f82aeef1e2bdd20
\ No newline at end of file
+78455ec033c6116732a8f43b909093b7d7732779
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/.travis.yml b/tests/wpt/web-platform-tests/.travis.yml
index 566fe18a9a6..a3ee2c28841 100644
--- a/tests/wpt/web-platform-tests/.travis.yml
+++ b/tests/wpt/web-platform-tests/.travis.yml
@@ -1,7 +1,8 @@
+sudo: false # cause Travis to start builds much faster
 language: python
 python:
   - "2.7"
 before_install:
   - git submodule update --init --recursive
 # command to run tests, e.g. python setup.py test
-script:  ./lint
\ No newline at end of file
+script:  ./lint
diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.html b/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.html
index 54dca00a96e..dced17de0a5 100644
--- a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.html
+++ b/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.html
@@ -29,10 +29,7 @@ test(function() {
   assert_equals(blob.type, "");
 }, "no-argument Blob constructor");
 test(function() {
-  var blob = Blob();
-  assert_true(blob instanceof Blob);
-  assert_equals(blob.size, 0);
-  assert_equals(blob.type, "");
+  assert_throws(new TypeError(), function() { var blob = Blob(); });
 }, "no-argument Blob constructor without 'new'");
 test(function() {
   var blob = new Blob;
diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.html b/tests/wpt/web-platform-tests/FileAPI/idlharness.html
index 64a9c8508b3..0ef37000d31 100644
--- a/tests/wpt/web-platform-tests/FileAPI/idlharness.html
+++ b/tests/wpt/web-platform-tests/FileAPI/idlharness.html
@@ -15,144 +15,46 @@
 
     <div id="log"></div>
 
-    <pre id="untested_idl" style="display: none">
-      interface ArrayBuffer {
-      };
-
-      interface ArrayBufferView {
-      };
-
-      interface URL {
-      };
-
-      interface EventTarget {
-      };
-
-      interface Event {
-      };
-
-      [TreatNonCallableAsNull]
-      callback EventHandlerNonNull = any (Event event);
-      typedef EventHandlerNonNull? EventHandler;
-    </pre>
-
-    <pre id="idl" style="display: none">
-[Constructor,
- Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> blobParts, optional BlobPropertyBag options), Exposed=Window,Worker]
-interface Blob {
-
-  readonly attribute unsigned long long size;
-  readonly attribute DOMString type;
-  readonly attribute boolean isClosed;
-
-  //slice Blob into byte-ranged chunks
-
-  Blob slice([Clamp] optional long long start,
-             [Clamp] optional long long end,
-             optional DOMString contentType);
-  void close();
-
-};
-
-dictionary BlobPropertyBag {
-  DOMString type = "";
-};
-
-[Constructor(sequence<(Blob or DOMString or ArrayBufferView or ArrayBuffer)> fileBits,
-[EnsureUTF16] DOMString fileName, optional FilePropertyBag options), Exposed=Window,Worker]
-interface File : Blob {
-
-  readonly attribute DOMString name;
-  readonly attribute long long lastModified;
-
-};
-
-dictionary FilePropertyBag {
-
-  DOMString type = "";
-  long long lastModified;
-
-};
-
-[Exposed=Window,Worker] interface FileList {
-  getter File? item(unsigned long index);
-  readonly attribute unsigned long length;
-};
-
-[Constructor, Exposed=Window,Worker]
-interface FileReader: EventTarget {
-
-  // async read methods
-  void readAsArrayBuffer(Blob blob);
-  void readAsText(Blob blob, optional DOMString label);
-  void readAsDataURL(Blob blob);
-
-  void abort();
-
-  // states
-  const unsigned short EMPTY = 0;
-  const unsigned short LOADING = 1;
-  const unsigned short DONE = 2;
-
-  readonly attribute unsigned short readyState;
-
-  // File or Blob data
-  readonly attribute (DOMString or ArrayBuffer)? result;
-
-  readonly attribute DOMError? error;
-
-  // event handler attributes
-  attribute EventHandler onloadstart;
-  attribute EventHandler onprogress;
-  attribute EventHandler onload;
-  attribute EventHandler onabort;
-  attribute EventHandler onerror;
-  attribute EventHandler onloadend;
-
-};
-
-[Constructor, Exposed=Worker]
-interface FileReaderSync {
-
-  // Synchronously return strings
-
-  ArrayBuffer readAsArrayBuffer(Blob blob);
-  DOMString readAsText(Blob blob, optional DOMString label);
-  DOMString readAsDataURL(Blob blob);
-};
-
-partial interface URL {
-
-  static DOMString createObjectURL(Blob blob);
-  static DOMString createFor(Blob blob);
-  static void revokeObjectURL(DOMString url);
-
-};
-
-    </pre>
-
     <form name="uploadData">
       <input type="file" id="fileChooser">
     </form>
 
     <script>
-      var idl_array, file_input;
+var file_input;
+setup(function() {
+    var idl_array = new IdlArray();
+
+    var request = new XMLHttpRequest();
+    request.open("GET", "idlharness.idl");
+    request.send();
+    request.onload = function() {
+        var idls = request.responseText;
+
+        idl_array.add_untested_idls("[PrimaryGlobal] interface Window { };");
+
+        idl_array.add_untested_idls("interface ArrayBuffer {};");
+        idl_array.add_untested_idls("interface ArrayBufferView {};");
+        idl_array.add_untested_idls("interface URL {};");
+        idl_array.add_untested_idls("interface EventTarget {};");
+        idl_array.add_untested_idls("interface Event {};");
+        idl_array.add_untested_idls("[TreatNonCallableAsNull] callback EventHandlerNonNull = any (Event event);");
+        idl_array.add_untested_idls("typedef EventHandlerNonNull? EventHandler;");
+
+        idl_array.add_idls(idls);
 
-      setup(function() {
         file_input = document.querySelector("#fileChooser");
-        idl_array = new IdlArray();
-        idl_array.add_untested_idls(document.getElementById("untested_idl").textContent);
-        idl_array.add_idls(document.getElementById("idl").textContent);
-
         idl_array.add_objects({
-          Blob: ['new Blob(["TEST"])'],
-          File: ['new File(["myFileBits"], "myFileName")'],
-          FileList: ['file_input.files'],
-          FileReader: ['new FileReader()']
+            Blob: ['new Blob(["TEST"])'],
+            File: ['new File(["myFileBits"], "myFileName")'],
+            FileList: ['file_input.files'],
+            FileReader: ['new FileReader()']
         });
-      });
 
-      idl_array.test();
+        idl_array.test();
+        done();
+  };
+}, {explicit_done: true});
     </script>
+
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.idl b/tests/wpt/web-platform-tests/FileAPI/idlharness.idl
new file mode 100644
index 00000000000..ae83a9cb1fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/FileAPI/idlharness.idl
@@ -0,0 +1,81 @@
+[Constructor,
+ Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> blobParts, optional BlobPropertyBag options), Exposed=Window,Worker]
+interface Blob {
+
+  readonly attribute unsigned long long size;
+  readonly attribute DOMString type;
+  readonly attribute boolean isClosed;
+
+  //slice Blob into byte-ranged chunks
+
+  Blob slice([Clamp] optional long long start,
+             [Clamp] optional long long end,
+             optional DOMString contentType);
+  void close();
+
+};
+
+dictionary BlobPropertyBag {
+  DOMString type = "";
+};
+
+[Constructor(sequence<(Blob or DOMString or ArrayBufferView or ArrayBuffer)> fileBits,
+[EnsureUTF16] DOMString fileName, optional FilePropertyBag options), Exposed=Window,Worker]
+interface File : Blob {
+
+  readonly attribute DOMString name;
+  readonly attribute long long lastModified;
+
+};
+
+dictionary FilePropertyBag {
+
+  DOMString type = "";
+  long long lastModified;
+
+};
+
+[Exposed=Window,Worker] interface FileList {
+  getter File? item(unsigned long index);
+  readonly attribute unsigned long length;
+};
+
+[Constructor, Exposed=Window,Worker]
+interface FileReader: EventTarget {
+
+  // async read methods
+  void readAsArrayBuffer(Blob blob);
+  void readAsText(Blob blob, optional DOMString label);
+  void readAsDataURL(Blob blob);
+
+  void abort();
+
+  // states
+  const unsigned short EMPTY = 0;
+  const unsigned short LOADING = 1;
+  const unsigned short DONE = 2;
+
+  readonly attribute unsigned short readyState;
+
+  // File or Blob data
+  readonly attribute (DOMString or ArrayBuffer)? result;
+
+  readonly attribute DOMError? error;
+
+  // event handler attributes
+  attribute EventHandler onloadstart;
+  attribute EventHandler onprogress;
+  attribute EventHandler onload;
+  attribute EventHandler onabort;
+  attribute EventHandler onerror;
+  attribute EventHandler onloadend;
+
+};
+
+partial interface URL {
+
+  static DOMString createObjectURL(Blob blob);
+  static DOMString createFor(Blob blob);
+  static void revokeObjectURL(DOMString url);
+
+};
diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.worker.js b/tests/wpt/web-platform-tests/FileAPI/idlharness.worker.js
new file mode 100644
index 00000000000..40ba81699b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/FileAPI/idlharness.worker.js
@@ -0,0 +1,45 @@
+importScripts("/resources/testharness.js");
+importScripts("/resources/WebIDLParser.js", "/resources/idlharness.js");
+
+var request = new XMLHttpRequest();
+request.open("GET", "idlharness.idl");
+request.send();
+request.onload = function() {
+    var idl_array = new IdlArray();
+    var idls = request.responseText;
+
+    idl_array.add_untested_idls("[Global] interface Window { };");
+
+    idl_array.add_untested_idls("interface ArrayBuffer {};");
+    idl_array.add_untested_idls("interface ArrayBufferView {};");
+    idl_array.add_untested_idls("interface URL {};");
+    idl_array.add_untested_idls("interface EventTarget {};");
+    idl_array.add_untested_idls("interface Event {};");
+    idl_array.add_untested_idls("[TreatNonCallableAsNull] callback EventHandlerNonNull = any (Event event);");
+    idl_array.add_untested_idls("typedef EventHandlerNonNull? EventHandler;");
+
+
+    var worker_idls =
+            '[Constructor, Exposed=Worker]\n' +
+            'interface FileReaderSync {\n' +
+            '\n' +
+            '  // Synchronously return strings\n' +
+            '\n' +
+            '  ArrayBuffer readAsArrayBuffer(Blob blob);\n' +
+            '  DOMString readAsText(Blob blob, optional DOMString label);\n' +
+            '  DOMString readAsDataURL(Blob blob);\n' +
+            '};';
+
+    idl_array.add_idls(idls);
+    idl_array.add_idls(worker_idls);
+
+    idl_array.add_objects({
+        Blob: ['new Blob(["TEST"])'],
+        File: ['new File(["myFileBits"], "myFileName")'],
+        FileReader: ['new FileReader()'],
+        FileReaderSync: ['new FileReaderSync()']
+    });
+
+    idl_array.test();
+    done();
+};
diff --git a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-constructor.html b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-constructor.html
index 9dc6d9918a3..0e5ffea7d32 100644
--- a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-constructor.html
+++ b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-constructor.html
@@ -24,6 +24,14 @@ test(function() {
                "The message property should be inherited");
 }, 'new DOMException(): own-ness');
 
+test(function() {
+  var ex = new DOMException(null);
+  assert_equals(ex.name, "Error",
+                "Not passing a name should end up with 'Error' as the name");
+  assert_equals(ex.message, "null",
+                "Passing null as message should end up with stringified 'null' as the message");
+}, 'new DOMException(null)');
+
 test(function() {
   var ex = new DOMException(undefined);
   assert_equals(ex.name, "Error",
@@ -55,6 +63,13 @@ test(function() {
               "The message property should be own");
 }, 'new DOMException("foo"): own-ness');
 
+test(function() {
+  var ex = new DOMException("bar", undefined);
+  assert_equals(ex.name, "Error",
+                "Passing undefined for name should end up with 'Error' as the name");
+  assert_equals(ex.message, "bar", "Should still be using passed-in message");
+}, 'new DOMException("bar", undefined)');
+
 test(function() {
   var ex = new DOMException("bar", "NotSupportedError");
   assert_equals(ex.name, "NotSupportedError", "Should be using the passed-in name");
@@ -70,4 +85,55 @@ test(function() {
   assert_true(ex.hasOwnProperty("message"),
               "The message property should be own");
 }, 'new DOMException("bar", "NotSupportedError"): own-ness');
+
+test(function() {
+  var ex = new DOMException("bar", "foo");
+  assert_equals(ex.name, "foo", "Should be using the passed-in name");
+  assert_equals(ex.message, "bar", "Should still be using passed-in message");
+  assert_equals(ex.code, 0,
+                "Should have 0 for code for a name not in the exception names table");
+}, 'new DOMException("bar", "foo")');
+
+[
+  {name: "IndexSizeError", code: 1},
+  {name: "HierarchyRequestError", code: 3},
+  {name: "WrongDocumentError", code: 4},
+  {name: "InvalidCharacterError", code: 5},
+  {name: "NoModificationAllowedError", code: 7},
+  {name: "NotFoundError", code: 8},
+  {name: "NotSupportedError", code: 9},
+  {name: "InUseAttributeError", code: 10},
+  {name: "InvalidStateError", code: 11},
+  {name: "SyntaxError", code: 12},
+  {name: "InvalidModificationError", code: 13},
+  {name: "NamespaceError", code: 14},
+  {name: "InvalidAccessError", code: 15},
+  {name: "SecurityError", code: 18},
+  {name: "NetworkError", code: 19},
+  {name: "AbortError", code: 20},
+  {name: "URLMismatchError", code: 21},
+  {name: "QuotaExceededError", code: 22},
+  {name: "TimeoutError", code: 23},
+  {name: "InvalidNodeTypeError", code: 24},
+  {name: "DataCloneError", code: 25}
+].forEach(function(test_case) {
+  test(function() {
+    var ex = new DOMException("msg", test_case.name);
+    assert_equals(ex.name, test_case.name,
+                  "Should be using the passed-in name");
+    assert_equals(ex.message, "msg",
+                  "Should be using the passed-in message");
+    assert_equals(ex.code, test_case.code,
+                  "Should have matching legacy code from error names table");
+  },'new DOMexception("msg", "' + test_case.name + '")');
+});
+
+test(function() {
+  var ex = new DOMException("bar", "UnknownError");
+  assert_equals(ex.name, "UnknownError", "Should be using the passed-in name");
+  assert_equals(ex.message, "bar", "Should still be using passed-in message");
+  assert_equals(ex.code, 0,
+                "Should have 0 for code for a name in the exception names table with no legacy code");
+}, 'new DOMException("bar", "UnknownError")');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role.html b/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html
similarity index 100%
rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role.html
rename to tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/messages.json b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
index 34990c02200..1b5daba1f65 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/messages.json
+++ b/tests/wpt/web-platform-tests/conformance-checkers/messages.json
@@ -1,4 +1,10 @@
 {
+    "html-aria/author-requirements/571-haswarn.html": "The \u201ctextbox\u201d role is unnecessary for an \u201cinput\u201d element that has no \u201clist\u201d attribute and whose type is \u201ctext\u201d.",
+    "html-aria/author-requirements/572-haswarn.html": "The \u201ctextbox\u201d role is unnecessary for an \u201cinput\u201d element that has no \u201clist\u201d attribute and whose type is \u201ctext\u201d.",
+    "html-aria/author-requirements/573-haswarn.html": "The \u201ctextbox\u201d role is unnecessary for an \u201cinput\u201d element that has no \u201clist\u201d attribute and whose type is \u201ctext\u201d.",
+    "html-aria/combobox-autocomplete-list/div-haswarn.html": "The \u201ctextbox\u201d role is unnecessary for an \u201cinput\u201d element that has no \u201clist\u201d attribute and whose type is \u201ctext\u201d.",
+    "html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html": "The \u201ccheckbox\u201d role is unnecessary for element \u201cinput\u201d whose type is \u201ccheckbox\u201d.",
+    "html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html": "The \u201ccheckbox\u201d role is unnecessary for element \u201cinput\u201d whose type is \u201ccheckbox\u201d.",
     "html-rdfa/0019-novalid.html": "Attribute \u201chref\u201d not allowed on element \u201cdiv\u201d in this context.",
     "html-rdfa/0035-novalid.html": "Attribute \u201chref\u201d not allowed on element \u201cimg\u201d in this context.",
     "html-rdfa/0037-novalid.html": "Attribute \u201chref\u201d not allowed on element \u201cimg\u201d in this context.",
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.js
deleted file mode 100644
index ec2f0076d57..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.js
+++ /dev/null
@@ -1 +0,0 @@
-alert_assert('PASS');
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/child-src-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/child-src-test.js
deleted file mode 100644
index fd09f153716..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/child-src-test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var EXPECT_BLOCK = true;
-var EXPECT_LOAD = false;
-
-window.jsTestIsAsync = true;
-window.wasPostTestScriptParsed = true;
-
-var iframe;
-
-function injectFrame(url, shouldBlock) {
-    window.onload = function() {
-        iframe = document.createElement('iframe');
-        iframe.onload = iframeLoaded(shouldBlock);
-        iframe.src = url;
-        document.body.appendChild(iframe);
-    };
-}
-
-function iframeLoaded(expectBlock) {
-    return function(ev) {
-        var failed = true;
-        try {
-            console.log("IFrame load event fired: the IFrame's location is '" + ev.target.contentWindow.location.href + "'.");
-            if (expectBlock) {
-                testFailed("The IFrame should have been blocked (or cross-origin). It wasn't.");
-                failed = true;
-            } else {
-                testPassed("The IFrame should not have been blocked. It wasn't.");
-                failed = false;
-            }
-        } catch (ex) {
-            debug("IFrame load event fired: the IFrame is cross-origin (or was blocked).");
-            if (expectBlock) {
-                testPassed("The IFrame should have been blocked (or cross-origin). It was.");
-                failed = false;
-            } else {
-                testFailed("The IFrame should not have been blocked. It was.");
-                failed = true;
-            }
-        }
-        finishJSTest();
-    };
-}
-
-function injectFrameRedirectingTo(url, shouldBlock) {
-    injectFrame("/security/contentSecurityPolicy/resources/redir.php?url=" + url, shouldBlock);
-}
-
-function injectWorker(url, expectBlock) {
-    window.onload = function() {
-        if (expectBlock == EXPECT_BLOCK)
-            shouldThrow("var w = new Worker('" + url + "');");
-        else
-            shouldNotThrow("var w = new Worker('" + url + "');");
-        finishJSTest();
-    };
-}
-
-function injectSharedWorker(url, expectBlock) {
-    window.onload = function() {
-        if (expectBlock == EXPECT_BLOCK)
-            shouldThrow("var w = new SharedWorker('" + url + "');");
-        else
-            shouldNotThrow("var w = new SharedWorker('" + url + "');");
-        finishJSTest();
-    };
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/dump-as-text.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/dump-as-text.js
deleted file mode 100644
index a229b1fc75c..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/dump-as-text.js
+++ /dev/null
@@ -1,2 +0,0 @@
-if (window.testRunner)
-    testRunner.dumpAsText();
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/frame-ancestors-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/frame-ancestors-test.js
deleted file mode 100644
index e4b12d4faf7..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/frame-ancestors-test.js
+++ /dev/null
@@ -1,109 +0,0 @@
-var SAME_ORIGIN = true;
-var CROSS_ORIGIN = false;
-
-var EXPECT_BLOCK = true;
-var EXPECT_LOAD = false;
-
-var SAMEORIGIN_ORIGIN = "http://127.0.0.1:8000";
-var CROSSORIGIN_ORIGIN = "http://localhost:8080";
-
-window.jsTestIsAsync = true;
-window.wasPostTestScriptParsed = true;
-
-if (window.testRunner)
-    testRunner.dumpChildFramesAsText();
-
-window.addEventListener("message", function(e) {
-    if (window.parent != window) {
-        window.parent.postMessage(e.data, "*");
-    } else {
-        if (e.data)
-            testFailed("The inner IFrame failed.");
-        else
-            testPassed("The inner IFrame passed.");
-
-        finishJSTest();
-    }
-});
-
-function injectNestedIframe(policy, parent, child, expectation) {
-    var iframe = document.createElement("iframe");
-
-    var url = "/security/contentSecurityPolicy/resources/frame-in-frame.pl?" + "policy=" + policy + "&parent=" + parent + "&child=" + child + "&expectation=" + expectation;
-    url = (parent == "same" ? SAMEORIGIN_ORIGIN : CROSSORIGIN_ORIGIN) + url;
-
-    iframe.src = url;
-    document.body.appendChild(iframe);
-}
-
-function injectIFrame(policy, sameOrigin, expectBlock) {
-    var iframe = document.createElement("iframe");
-    iframe.addEventListener("load", iframeLoaded(expectBlock));
-    iframe.addEventListener("error", iframeLoaded(expectBlock));
-
-    var url = "/security/contentSecurityPolicy/resources/frame-ancestors.pl?policy=" + policy;
-    if (!sameOrigin)
-        url = CROSSORIGIN_ORIGIN + url;
-
-    iframe.src = url;
-    document.body.appendChild(iframe);
-}
-
-function iframeLoaded(expectBlock) {
-    return function(ev) {
-        var failed = true;
-        try {
-            console.log("IFrame load event fired: the IFrame's location is '" + ev.target.contentWindow.location.href + "'.");
-            if (expectBlock) {
-                testFailed("The IFrame should have been blocked (or cross-origin). It wasn't.");
-                failed = true;
-            } else {
-                testPassed("The IFrame should not have been blocked. It wasn't.");
-                failed = false;
-            }
-        } catch (ex) {
-            debug("IFrame load event fired: the IFrame is cross-origin (or was blocked).");
-            if (expectBlock) {
-                testPassed("The IFrame should have been blocked (or cross-origin). It was.");
-                failed = false;
-            } else {
-                testFailed("The IFrame should not have been blocked. It was.");
-                failed = true;
-            }
-        }
-        if (window.parent != window)
-            window.parent.postMessage(failed, '*');
-        else
-            finishJSTest();
-    };
-}
-
-function crossOriginFrameShouldBeBlocked(policy) {
-    window.onload = function() {
-        injectIFrame(policy, CROSS_ORIGIN, EXPECT_BLOCK);
-    };
-}
-
-function crossOriginFrameShouldBeAllowed(policy) {
-    window.onload = function() {
-        injectIFrame(policy, CROSS_ORIGIN, EXPECT_LOAD);
-    };
-}
-
-function sameOriginFrameShouldBeBlocked(policy) {
-    window.onload = function() {
-        injectIFrame(policy, SAME_ORIGIN, EXPECT_BLOCK);
-    };
-}
-
-function sameOriginFrameShouldBeAllowed(policy) {
-    window.onload = function() {
-        injectIFrame(policy, SAME_ORIGIN, EXPECT_LOAD);
-    };
-}
-
-function testNestedIFrame(policy, parent, child, expectation) {
-    window.onload = function() {
-        injectNestedIframe(policy, parent == SAME_ORIGIN ? "same" : "cross", child == SAME_ORIGIN ? "same" : "cross", expectation == EXPECT_LOAD ? "Allowed" : "Blocked");
-    };
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/mixed-content-with-csp.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/mixed-content-with-csp.html
deleted file mode 100644
index 77f47cf3b1c..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/mixed-content-with-csp.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<meta http-equiv="Content-Security-Policy" content="default-src 'self'"> This page includes an insecure script that alerts "FAIL", but that script is blocked by CSP.
-<script src="http://127.0.0.1:8080/security/contentSecurityPolicy/resources/alert-fail.js"></script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-plugin-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-plugin-test.js
deleted file mode 100644
index 0a6f0c5e1be..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-plugin-test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-if (window.testRunner) {
-    testRunner.waitUntilDone();
-    testRunner.dumpAsText();
-    testRunner.dumpChildFramesAsText();
-}
-
-function testExperimentalPolicy() {
-    testImpl(true);
-}
-
-function test() {
-    testImpl(false);
-}
-
-function testImpl(experimental) {
-    if (tests.length === 0)
-        return finishTesting();
-    var baseURL = "/security/contentSecurityPolicy/";
-    var current = tests.shift();
-    var iframe = document.createElement("iframe");
-    iframe.src = baseURL + "resources/echo-object-data.pl?" +
-        "experimental=" + (experimental ? "true" : "false") +
-        "&csp=" + escape(current[1]);
-
-    if (current[0])
-        iframe.src += "&log=PASS.";
-    else
-        iframe.src += "&log=FAIL.";
-
-    if (current[2])
-        iframe.src += "&plugin=" + escape(current[2]);
-    else {
-        iframe.src += "&plugin=data:application/x-webkit-test-netscape,logifloaded";
-    }
-
-    if (current[3] !== undefined)
-        iframe.src += "&type=" + escape(current[3]);
-    else
-        iframe.src += "&type=application/x-webkit-test-netscape";
-
-    iframe.onload = function() {
-        if (window.internals)
-            internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(iframe);
-        testImpl(experimental);
-    };
-    document.body.appendChild(iframe);
-}
-
-function finishTesting() {
-    if (window.testRunner) {
-        setTimeout("testRunner.notifyDone()", 0);
-    }
-    return true;
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-test.js
deleted file mode 100644
index d5139dcd87a..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/multiple-iframe-test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-if (window.testRunner) {
-    testRunner.waitUntilDone();
-    testRunner.dumpAsText();
-    testRunner.dumpChildFramesAsText();
-}
-
-function testPreescapedPolicy() {
-    testImpl(false, true);
-}
-
-function testExperimentalPolicy() {
-    testImpl(true, false);
-}
-
-function test() {
-    testImpl(false, false);
-}
-
-function testImpl(experimental, preescapedPolicy) {
-    if (tests.length === 0)
-        return finishTesting();
-
-    var baseURL = "/security/contentSecurityPolicy/";
-    var current = tests.shift();
-    var iframe = document.createElement("iframe");
-
-    var policy = current[1];
-    if (!preescapedPolicy)
-        policy = encodeURIComponent(policy);
-
-    var scriptToLoad = baseURL + encodeURIComponent(current[2]);
-    if (current[2].match(/^data:/) || current[2].match(/^https?:/))
-        scriptToLoad = encodeURIComponent(current[2]);
-
-    iframe.src = baseURL + "resources/echo-script-src.pl?" +
-        "experimental=" + (experimental ? "true" : "false") +
-        "&should_run=" + encodeURIComponent(current[0]) +
-        "&csp=" + policy + "&q=" + scriptToLoad;
-    if (current[3] !== undefined)
-        iframe.src += "&nonce=" + encodeURIComponent(current[3]);
-
-    iframe.onload = function() {
-        testImpl(experimental, preescapedPolicy);
-    };
-    document.body.appendChild(iframe);
-}
-
-function finishTesting() {
-    if (window.testRunner) {
-        setTimeout("testRunner.notifyDone()", 0);
-    }
-    return true;
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/referrer-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/referrer-test.js
deleted file mode 100644
index 7dafc9f9cf5..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/referrer-test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-var ReferrerTest = {
-    NO_REFERRER: "no-referrer",
-    NO_REFERRER_WHEN_DOWNGRADE: "no-referrer-when-downgrade",
-    ORIGIN: "origin",
-    ORIGIN_WHEN_CROSS_ORIGIN: "origin-when-cross-origin",
-    UNSAFE_URL: "unsafe-url",
-
-    INVALID: "invalid",
-    EMPTY: "",
-
-    HTTP: "http",
-    HTTPS: "https",
-
-    bindHandler: function(func) {
-        window.addEventListener("message", function(e) {
-            ReferrerTest.referrerResult = undefined;
-            func(e.data);
-            finishJSTest();
-        });
-    },
-
-    base: function(scheme) {
-        return scheme == "http" ? "http://127.0.0.1:8000/" : "https://127.0.0.1:8443/";
-    },
-
-    generateFrameURL: function(policy, from, to) {
-        return ReferrerTest.base(from) + "security/contentSecurityPolicy/resources/referrer-test.php?policy=" + policy + "&to=" + to;
-    },
-
-    injectFrame: function(policy, from, to) {
-        var iframe = document.createElement("iframe");
-        iframe.src = ReferrerTest.generateFrameURL(policy, from, to);
-        document.body.appendChild(iframe);
-    }
-};
-
-function expectFullReferrer(policy, from, to) {
-    ReferrerTest.bindHandler(function(referrer) {
-        ReferrerTest.referrerResult = referrer;
-        shouldBeEqualToString("ReferrerTest.referrerResult", ReferrerTest.generateFrameURL(policy, from, to));
-    });
-    ReferrerTest.injectFrame(policy, from, to);
-}
-
-function expectNoReferrer(policy, from, to) {
-    ReferrerTest.bindHandler(function(referrer) {
-        ReferrerTest.referrerResult = referrer;
-        shouldBeEqualToString("ReferrerTest.referrerResult", "");
-    });
-    ReferrerTest.injectFrame(policy, from, to);
-}
-
-function expectOriginReferrer(policy, from, to) {
-    ReferrerTest.bindHandler(function(referrer) {
-        ReferrerTest.referrerResult = referrer;
-        shouldBeEqualToString("ReferrerTest.referrerResult", ReferrerTest.base(from));
-    });
-    ReferrerTest.injectFrame(policy, from, to);
-}
-
-window.wasPostTestScriptParsed = true;
-window.jsTestIsAsync = true;
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/reflected-xss-and-xss-protection.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/reflected-xss-and-xss-protection.js
deleted file mode 100644
index a7ba8ebbd0c..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/reflected-xss-and-xss-protection.js
+++ /dev/null
@@ -1,41 +0,0 @@
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    testRunner.dumpChildFramesAsText();
-    testRunner.setXSSAuditorEnabled(true);
-    testRunner.waitUntilDone();
-}
-
-function testMixedHeader(csp, xssProtection) {
-    var params = [
-        'q=<script>alert_assert(String.fromCharCode(0x58,0x53,0x53))<' + '/script>'
-    ];
-    if (csp != 'unset')
-        params.push('csp=' + csp);
-
-    if (xssProtection == 'allow')
-        params.push('disable-protection=1');
-    if (xssProtection == 'block')
-        params.push('enable-full-block=1');
-    if (xssProtection == 'filter')
-        params.push('valid-header=2');
-    if (xssProtection == 'invalid')
-        params.push('malformed-header=1');
-
-    var url = '/security/xssAuditor/resources/echo-intertag.pl?';
-    url += params.join('&amp;');
-
-    document.write('<p>Testing behavior when "reflected-xss" is set to ' + csp + ', and "X-XSS-Protection" is set to ' + xssProtection + '.');
-    document.write('<iframe src="' + url + '"></iframe>');
-}
-
-function frameLoaded() {
-    var frame = document.querySelector('iframe');
-    try {
-        alert_assert('Loaded ' + frame.contentWindow.location.href + ' into the IFrame.');
-    } catch (e) {
-        alert_assert('Loaded cross-origin frame.');
-    }
-    testRunner.notifyDone();
-}
-
-window.onload = frameLoaded;
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script-src.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script-src.html
deleted file mode 100644
index e7f5a00e746..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script-src.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<body>
-    <div id="result" text="PASS">
-        FAIL
-    </div>
-    <script src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicy-tests-base.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicy-tests-base.js
deleted file mode 100644
index f403e52e62a..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicy-tests-base.js
+++ /dev/null
@@ -1,18 +0,0 @@
-if (window.testRunner)
-    testRunner.dumpAsText();
-
-function log(msg) {
-    var txt = document.createTextNode(msg);
-    document.querySelector('body').appendChild(txt);
-    document.querySelector('body').appendChild(document.createElement('br'));
-}
-
-function injectPolicy(policy) {
-    var meta = document.createElement('meta');
-    meta.setAttribute('http-equiv', 'Content-Security-Policy');
-    meta.setAttribute('content', policy);
-    document.head.appendChild(meta);
-}
-
-if (!document.securityPolicy)
-    log('FAIL document.securityPolicy is not defined.')
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicyviolation-test.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicyviolation-test.js
deleted file mode 100644
index cd16d94b3e0..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/securitypolicyviolation-test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-window.jsTestIsAsync = true;
-
-document.addEventListener('securitypolicyviolation', function handleEvent(e) {
-    window.e = e;
-    for (key in expectations)
-        shouldBe('window.e.' + key, JSON.stringify(expectations[key]));
-    finishJSTest();
-});
-
-window.addEventListener('load', function() {
-    debug('Kicking off the tests:');
-    run();
-});
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr.js
deleted file mode 100644
index 04e68d61b4f..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr.js
+++ /dev/null
@@ -1,10 +0,0 @@
-onconnect = function(event) {
-    var port = event.ports[0];
-    try {
-        var xhr = new XMLHttpRequest;
-        xhr.open("GET", "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/blue.css", true);
-        port.postMessage("xhr allowed");
-    } catch (e) {
-        port.postMessage("xhr blocked");
-    }
-};
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/style.xsl b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/style.xsl
deleted file mode 100644
index 6d83dfc059b..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/style.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="2.0"
-  xmlns:xhtml="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  exclude-result-prefixes="xhtml xsl xs">
-<xsl:output method="xml" version="1.0" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.1//EN" doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" indent="yes"/>
-<xsl:template match="@*|node()">
-  <xsl:copy>
-    <xsl:apply-templates select="@*|node()"/>
-  </xsl:copy>
-</xsl:template>
-<xsl:template match="xhtml:div">
-  <xsl:copy>
-    Style sheet applied.
-    <xsl:apply-templates select="@*|node()"/>
-  </xsl:copy>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/transform-to-img.xsl b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/transform-to-img.xsl
deleted file mode 100644
index 8d4ccf33487..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/transform-to-img.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <script>
-//<![CDATA[
-if (window.testRunner)
-    testRunner.dumpAsText();
-//]]>
-        </script>
-      </head>
-      <body>
-        Here is an image:
-        <img src="../resources/abe.png"/>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/tests/wpt/web-platform-tests/docs/css-metadata.md b/tests/wpt/web-platform-tests/docs/css-metadata.md
index c2de47cfe95..24a7a6324e4 100644
--- a/tests/wpt/web-platform-tests/docs/css-metadata.md
+++ b/tests/wpt/web-platform-tests/docs/css-metadata.md
@@ -373,8 +373,8 @@ The assertion should not be:
 The test assertion is **optional**. It helps the reviewer understand
 the goal of the test so that he or she can make sure it is being
 tested correctly. Also, in case a problem is found with the test
-later, the testing method (e.g. using 'color' to determine pass/fail)
-can be changed (e.g. to using 'background-color') while preserving
+later, the testing method (e.g. using `color` to determine pass/fail)
+can be changed (e.g. to using `background-color`) while preserving
 the intent of the test (e.g. testing support for ID selectors).
 
 Examples of good test assertions:
diff --git a/tests/wpt/web-platform-tests/docs/css-user-styles.md b/tests/wpt/web-platform-tests/docs/css-user-styles.md
index 2eeff97ec7c..3179339693d 100644
--- a/tests/wpt/web-platform-tests/docs/css-user-styles.md
+++ b/tests/wpt/web-platform-tests/docs/css-user-styles.md
@@ -52,7 +52,7 @@ sheet is applied.</p>
 Within the test case it is recommended that the case itself indicate
 the necessary user style sheet that is required.
 
-Examples: (code for the cascade.css file)
+Examples: (code for the [`cascade.css`][cascade-css] file)
 
 ``` css
 #cascade /* ID name should match user style sheet file name */
@@ -66,7 +66,7 @@ The rule ```#cascade``` in the example above is used by the test
 page to hide the prerequisite text. The rule name should match the
 user style sheet CSS file name in order to keep this orderly.
 
-Examples: (code for the cascade-### XHTML files)
+Examples: (code for [the `cascade-###.xht` files][cascade-xht])
 
 ``` html
 <p id="cascade">
@@ -83,3 +83,6 @@ sheet is properly applied.
 Please flag test that require user style sheets with the userstyle
 flag so people running the tests know that a user style sheet is
 required.
+
+[cascade-css]: https://github.com/w3c/csswg-test/blob/master/css21/cascade/support/cascade.css
+[cascade-xht]: https://github.com/w3c/csswg-test/blob/master/css21/cascade/cascade-001.xht
diff --git a/tests/wpt/web-platform-tests/docs/reftests.md b/tests/wpt/web-platform-tests/docs/reftests.md
index d92e3514a10..f096bc0c667 100644
--- a/tests/wpt/web-platform-tests/docs/reftests.md
+++ b/tests/wpt/web-platform-tests/docs/reftests.md
@@ -47,8 +47,8 @@ event firing. In some cases it is necessary to delay the screenshot
 later than this, for example becase some DOM manipulation is
 required to set up the desired test conditions. To enable this, the
 test may have a `class="reftest-wait"` attribute specified on the root
-element. This will cause the screenshot to be delayed until the load
-event has fired and the reftest-wait class has been removed from the
+element. This will cause the screenshot to be delayed until the `load`
+event has fired and the `reftest-wait` class has been removed from the
 root element (technical note: the implementation in wptrunner uses
 mutation observers so the screenshot will be triggered in the
 microtask checkpoint after the class is removed. Because the harness
@@ -66,12 +66,12 @@ Multiple references linked from a single file are interpreted as
 multiple possible renderings for that file. `<link rel=[mis]match>`
 elements in a reference create further conditions that must be met in
 order for the test to pass. For example, consider a situation where
-a.html has `<link rel=match href=b.html>` and `<link rel=match
-href=c.html>`, b.html has `<link rel=match href=b1.html>` and c.html
+`a.html` has `<link rel=match href=b.html>` and `<link rel=match
+href=c.html>`, `b.html` has `<link rel=match href=b1.html>` and `c.html`
 has `<link rel=mismatch href=c1.html>`. In this case, to pass we must
-either have a.html, b.html and b1.html all rendering identically, or
-a.html and c.html rendering identically, but c.html rendering
-differently from c1.html.
+either have `a.html`, `b.html` and `b1.html` all rendering identically, or
+`a.html` and `c.html` rendering identically, but `c.html` rendering
+differently from `c1.html`.
 
 ## Fuzzy Matching
 
diff --git a/tests/wpt/web-platform-tests/docs/review-process.md b/tests/wpt/web-platform-tests/docs/review-process.md
index e983bb2f333..d14b0f24c88 100644
--- a/tests/wpt/web-platform-tests/docs/review-process.md
+++ b/tests/wpt/web-platform-tests/docs/review-process.md
@@ -24,7 +24,7 @@ may also be used as long as the review is clearly linked.
 ### Critic
 
 [Critic][critic] is a code review tool that is frequently used for
-reviewing web-platform-tests sumbissions. Although it has a steeper
+reviewing web-platform-tests submissions. Although it has a steeper
 learning curve than the GitHub tools, it has more features that aid in
 conducting non-trivial reviews.
 
@@ -33,13 +33,13 @@ and log (authentication is via GitHub). On the homepage, click "Add
 Filter". In the resulting dialog, select the web-platform-tests
 repository and add the path of the folder(s) where you want to review
 code, e.g. `/` to review any submissions or `XMLHttpRequest/` to
-review only submissions in the XHMLHttpRequest directory. Ensure that
+review only submissions in the `XHMLHttpRequest` directory. Ensure that
 your email address is added so that you receive notifications of new
 reviews matching your filters, and activity on existing reviews.
 
 ## Labels
 
-Pull requests get automatically labelled in the Github repository. Check
+Pull requests get automatically labelled in the GitHub repository. Check
 out the [list of labels in Github][issues]
 to see the open pull requests for a given specification or a given Working Group.
 
diff --git a/tests/wpt/web-platform-tests/docs/running_tests.md b/tests/wpt/web-platform-tests/docs/running_tests.md
index affbc90059d..98fcd413580 100644
--- a/tests/wpt/web-platform-tests/docs/running_tests.md
+++ b/tests/wpt/web-platform-tests/docs/running_tests.md
@@ -26,7 +26,7 @@ environment, the [wptrunner](http://github.com/w3c/wptrunner) test runner
 can be used. This is a test runner written in Python and designed to
 control the browser from the outside using some remote control
 protocol such as WebDriver. This allows it to handle cases such as the
-browser crashing that connot be handled by an in-browser harness. It
+browser crashing that cannot be handled by an in-browser harness. It
 also has the ability to automatically run both testharness-based tests
 and reftests.
 
diff --git a/tests/wpt/web-platform-tests/docs/test-format-guidelines.md b/tests/wpt/web-platform-tests/docs/test-format-guidelines.md
index 881e960eec9..cae7cb0e2d4 100644
--- a/tests/wpt/web-platform-tests/docs/test-format-guidelines.md
+++ b/tests/wpt/web-platform-tests/docs/test-format-guidelines.md
@@ -111,7 +111,7 @@ between attributes will be collapsed to a single space, duplicate
 attributes will be removed, optional closing tags will be inserted,
 and invalid markup will be normalized.  If these changes should make
 the test inoperable, for example if the test is testing markup error
-recovery, add the [flag][requirement-flags] 'asis' to prevent
+recovery, add the [flag][requirement-flags] `asis` to prevent
 re-serialization. This flag will also prevent format conversions so it
 may be necessary to provide alternate versions of the test in other
 formats (XHTML, HTML, etc.)
@@ -262,7 +262,7 @@ the `location` dictionary, which has entries matching the
     {{location[host]}}
 {% endraw %}
 
-is replaced by hostname:port for the current request.
+is replaced by `hostname:port` for the current request.
 
 ### Tests Requiring Special Headers
 
diff --git a/tests/wpt/web-platform-tests/docs/test-style-guidelines.md b/tests/wpt/web-platform-tests/docs/test-style-guidelines.md
index 77a75357dfd..e8ccbd9face 100644
--- a/tests/wpt/web-platform-tests/docs/test-style-guidelines.md
+++ b/tests/wpt/web-platform-tests/docs/test-style-guidelines.md
@@ -196,14 +196,14 @@ red to denote failure._
 
 #### Overlapped text
 
-Tests of the 'line-height', 'font-size' and similar properties can
+Tests of the `line-height`, `font-size` and similar properties can
 sometimes be devised in such a way that a failure will result in the
 text overlapping.
 
 #### The word "FAIL"
 
 Some properties lend themselves well to this kind of test, for
-example 'quotes' and 'content'. The idea is that if the word "FAIL"
+example `quotes` and `content`. The idea is that if the word "FAIL"
 appears anywhere, something must have gone wrong.
 
 [Example][fail-example]
@@ -219,7 +219,7 @@ shapes. This font is especially useful for testing font and text
 properties. Without this font it would be very hard to use the
 overlapping technique with text.
 
-The font's em-square is exactly square. It's ascent and descent is
+The font's em-square is exactly square. Its ascent and descent is
 exactly the size of the em square. This means that the font's extent
 is exactly the same as its line-height, meaning that it can be
 exactly aligned with padding, borders, margins, and so forth.
@@ -263,9 +263,9 @@ E.g. Good:
 ```
 
 __If the test uses the Ahem font, make sure the line-height on block
-elements is specified; avoid 'line-height: normal'__. Also, for
+elements is specified; avoid `line-height: normal`__. Also, for
 absolute reliability, the difference between computed line-height
-and computed font-size should be dividable by 2.
+and computed font-size should be divisible by 2.
 
 E.g. Bad:
 
@@ -273,14 +273,14 @@ E.g. Bad:
 {font: 1.25em Ahem;} /* computed line-height value is 'normal' */
 {font: 20px Ahem;} /* computed line-height value is 'normal' */
 {font-size: 25px; line-height: 50px;} /* the difference between
-computed line-height and computed font-size is not dividable by 2. */
+computed line-height and computed font-size is not divisible by 2. */
 ```
 
 E.g. Good:
 
 ``` css
 {font-size: 25px; line-height: 51px;} /* the difference between
-computed line-height and computed font-size is dividable by 2. */
+computed line-height and computed font-size is divisible by 2. */
 ```
 
 [Example test using Ahem][ahem-example]
@@ -347,11 +347,9 @@ In practice, the important thing to decide is when to be methodical
 and when to simply test, in an ad hoc fashion, a cross section of
 the possibilities.
 
-This example is a methodical test of the :not() pseudo-class with
-each attribute selector in turn, first for long values and then for
-short values:
-
-http://www.hixie.ch/tests/adhoc/css/selectors/not/010.xml
+This is an [example][methodical-test] of a methodical test of the
+`:not()` pseudo-class with each attribute selector in turn, first
+for long values and then for short values.
 
 ### Overlapping
 
@@ -399,7 +397,7 @@ As mentioned many times in this document, red indicates a bug, so
 nothing should ever be red in a test.
 
 There is one important exception to this rule... the test for the
-'red' value for the color properties!
+`red` value for the color properties!
 
 ### Unobvious tests
 
@@ -436,3 +434,4 @@ The last [subtest on this page][unobvious-test] shows this problem.
 [download-ahem]: http://www.w3.org/Style/CSS/Test/Fonts/Ahem/AHEM____.TTF
 [long-test]: http://www.hixie.ch/tests/evil/mixed/lineheight3.html
 [unobvious-test]: http://www.w3.org/Style/CSS/Test/CSS1/current/sec525.htm
+[methodical-test]: http://www.hixie.ch/tests/adhoc/css/selectors/not/010.xml
diff --git a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html b/tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html
index 5c3f7db66ef..84a2b8d3218 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html
@@ -106,7 +106,7 @@ function test_after(child, nodeName, innerHTML) {
         parent.appendChild(document.createTextNode('1'));
         parent.appendChild(y);
         child.after(x, '2');
-        var expected = innerHTML + '<x></x>12<y></y>';
+        var expected = innerHTML + '<x></x>21<y></y>';
         assert_equals(parent.innerHTML, expected);
     }, nodeName + '.after() with one sibling of child and text as arguments.');
 
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.html b/tests/wpt/web-platform-tests/dom/nodes/Element-matches.html
index 44e5112ee35..e04c0f9d19a 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Element-matches.html
@@ -12,16 +12,14 @@
 <div id="log">This test requires JavaScript.</div>
 
 <script>
-var docType  = "html"; // Only run tests suitable for HTML
+async_test(function() {
+  var frame = document.createElement("iframe");
+  frame.onload = this.step_func_done(init);
+  frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
+  document.body.appendChild(frame);
+});
 
-var frame = document.createElement("iframe"),
-    doc;
-
-frame.onload = init;
-frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
-document.body.appendChild(frame);
-
-function init() {
+function init(e) {
   /*
    * This test suite tests Selectors API methods in 4 different contexts:
    * 1. Document node
@@ -40,13 +38,15 @@ function init() {
    * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
    */
 
+  var docType  = "html"; // Only run tests suitable for HTML
+
   // Prepare the nodes for testing
-  doc = frame.contentDocument;                 // Document Node tests
+  var doc = e.target.contentDocument;                 // Document Node tests
 
   var element = doc.getElementById("root");   // In-document Element Node tests
 
   //Setup the namespace tests
-  setupSpecialElements(element);
+  setupSpecialElements(doc, element);
 
   var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
                                                // Element tests, but after running the Document tests. This
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html b/tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html
index 16555f4dc28..1b8c46deb7d 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html
@@ -82,7 +82,7 @@ var fooChild = document.createElementNS('childNamespace', 'childElem');
 fooElem.appendChild(fooChild);
 
 lookupNamespaceURI(fooChild, null, 'childNamespace', 'Child element should inherit baz namespace');
-lookupNamespaceURI(fooChild, '', 'childNamespace', 'Child element should have null namespace');	
+lookupNamespaceURI(fooChild, '', 'childNamespace', 'Child element should have null namespace');
 lookupNamespaceURI(fooChild, 'xmlns', null, 'Child element should not have XMLNS namespace');
 lookupNamespaceURI(fooChild, 'prefix', 'fooNamespace', 'Child element has namespace URI matching prefix');
 
diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html
index 1899882ed6a..159b0b967a8 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html
@@ -10,17 +10,14 @@
 <div id="log">This test requires JavaScript.</div>
 
 <script>
-var testType = TEST_QSA;
-var docType  = "html"; // Only run tests suitable for HTML
+async_test(function() {
+  var frame = document.createElement("iframe");
+  frame.onload = this.step_func_done(init);
+  frame.src = "ParentNode-querySelector-All-content.html#target";
+  document.body.appendChild(frame);
+});
 
-var frame = document.createElement("iframe"),
-    doc;
-
-frame.onload = init;
-frame.src = "ParentNode-querySelector-All-content.html#target";
-document.body.appendChild(frame);
-
-function init() {
+function init(e) {
   /*
    * This test suite tests Selectors API methods in 4 different contexts:
    * 1. Document node
@@ -55,13 +52,16 @@ function init() {
    * The ParentNode-querySelector-All.js file contains all the common test functions for running each of the aforementioned tests
    */
 
+  var testType = TEST_QSA;
+  var docType  = "html"; // Only run tests suitable for HTML
+
   // Prepare the nodes for testing
-  doc = frame.contentDocument;                 // Document Node tests
+  var doc = e.target.contentDocument;                 // Document Node tests
 
   var element = doc.getElementById("root");   // In-document Element Node tests
 
   //Setup the namespace tests
-  setupSpecialElements(element);
+  setupSpecialElements(doc, element);
 
   var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
                                                // Element tests, but after running the Document tests. This
@@ -89,10 +89,10 @@ function init() {
   runSpecialSelectorTests("Fragment", fragment);
   runSpecialSelectorTests("In-document Element", element);
 
-  verifyStaticList("Document", doc);
-  verifyStaticList("Detached Element", detached);
-  verifyStaticList("Fragment", fragment);
-  verifyStaticList("In-document Element", element);
+  verifyStaticList("Document", doc, doc);
+  verifyStaticList("Detached Element", doc, detached);
+  verifyStaticList("Fragment", doc, fragment);
+  verifyStaticList("In-document Element", doc, element);
 
   runInvalidSelectorTest("Document", doc, invalidSelectors);
   runInvalidSelectorTest("Detached Element", detached, invalidSelectors);
diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
index 4c93be2d93a..4e6bef6d5ed 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
+++ b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
@@ -3,7 +3,7 @@
 /*
  * Create and append special elements that cannot be created correctly with HTML markup alone.
  */
-function setupSpecialElements(parent) {
+function setupSpecialElements(doc, parent) {
   // Setup null and undefined tests
   parent.appendChild(doc.createElement("null"));
   parent.appendChild(doc.createElement("undefined"));
@@ -75,7 +75,7 @@ function interfaceCheck(type, obj) {
  * Verify that the NodeList returned by querySelectorAll is static and and that a new list is created after
  * each call. A static list should not be affected by subsequent changes to the DOM.
  */
-function verifyStaticList(type, root) {
+function verifyStaticList(type, doc, root) {
   var pre, post, preLength;
 
   test(function() {
diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.xht b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.xht
index 4abd11e8fa0..7a673202b95 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.xht
+++ b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.xht
@@ -12,17 +12,14 @@
 <div id="log">This test requires JavaScript.</div>
 
 <script><![CDATA[
-var testType = TEST_QSA;
-var docType  = "xhtml"; // Only run tests suitable for XHTML
+async_test(function() {
+  var frame = document.createElement("iframe");
+  frame.onload = this.step_func_done(init);
+  frame.src = "ParentNode-querySelector-All-content.xht#target";
+  document.body.appendChild(frame);
+})
 
-var frame = document.createElement("iframe"),
-    doc;
-
-frame.onload = init;
-frame.src = "ParentNode-querySelector-All-content.xht#target";
-document.body.appendChild(frame);
-
-function init() {
+function init(e) {
   /*
    * This test suite tests Selectors API methods in 4 different contexts:
    * 1. Document node
@@ -57,13 +54,16 @@ function init() {
    * The ParentNode-querySelector-All.js file contains all the common test functions for running each of the aforementioned tests
    */
 
+  var testType = TEST_QSA;
+  var docType  = "xhtml"; // Only run tests suitable for XHTML
+
   // Prepare the nodes for testing
-  doc = frame.contentDocument;                 // Document Node tests
+  var doc = e.target.contentDocument;                 // Document Node tests
 
   var element = doc.getElementById("root");   // In-document Element Node tests
 
   //Setup the namespace tests
-  setupSpecialElements(element);
+  setupSpecialElements(doc, element);
 
   var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
                                                // Element tests, but after running the Document tests. This
@@ -91,10 +91,10 @@ function init() {
   runSpecialSelectorTests("Fragment", fragment);
   runSpecialSelectorTests("In-document Element", element);
 
-  verifyStaticList("Document", doc);
-  verifyStaticList("Detached Element", detached);
-  verifyStaticList("Fragment", fragment);
-  verifyStaticList("In-document Element", element);
+  verifyStaticList("Document", doc, doc);
+  verifyStaticList("Detached Element", doc, detached);
+  verifyStaticList("Fragment", doc, fragment);
+  verifyStaticList("In-document Element", doc, element);
 
   runInvalidSelectorTest("Document", doc, invalidSelectors);
   runInvalidSelectorTest("Detached Element", detached, invalidSelectors);
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html
new file mode 100644
index 00000000000..cabbaf20e65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Rendering requirements test (suggested default rendering): fieldset min-width is overridable</title>
+    <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#the-fieldset-and-legend-elements">
+    <link rel="help" href="http://drafts.csswg.org/css2/visudet.html#min-max-widths">
+    <link rel="help" href="http://drafts.csswg.org/css-sizing/#width-height-keywords">
+    <link rel="match" href="ref.html">
+    <meta name="flags" content="">
+    <meta name="assert" content="fieldset's default min-width should be overridable since it's not !important and not spec'd to be non-overridable">
+    <style>
+body {
+    margin: 10px;
+}
+#cover {
+    background-color: green;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    height: 100px;
+    width: 100px;
+    z-index: 2;
+}
+fieldset {
+    min-width: 0;/* property under test */
+    /* zero these out so it renders more like a div element */
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+.outer {
+    width: 100px;
+}
+.inner {
+    background-color: red;
+    color: red;
+    height: 100px;
+    overflow: scroll;
+    white-space: nowrap;
+}
+    </style>
+</head>
+<body>
+    <div class="outer">
+        <fieldset>
+            <div class="inner">a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a</div>
+        </fieldset>
+    </div>
+    <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+    <div id="cover"></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/ref.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/ref.html
new file mode 100644
index 00000000000..d17268a786b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-element-0/ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Rendering requirements Reftest Reference</title>
+    <style>
+body {
+    margin: 10px;
+}
+div {
+    background-color: green;
+    height: 100px;
+    width: 100px;
+}
+    </style>
+</head>
+<body>
+    <div></div>
+    <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
index bb0e9239ac8..86d684a1c87 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>The constraint validation API Test: element.validity.patternMismatch</title>
+<title>The constraint validation API Test: element.validity.stepMismatch</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-stepmismatch">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled.html
rename to tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-001.html
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml b/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml
new file mode 100644
index 00000000000..896d737df4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>File input descendants of disabled fieldsets</title>
+  <link rel="author" title="Chris Rebert" href="http://chrisrebert.com" />
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-fieldset-disabled" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div id="log"></div>
+  <form>
+    <fieldset id="fs" disabled="disabled">
+      <input id="myfile" type="file" />
+    </fieldset>
+  </form>
+  <script>
+    test(function () {
+      assert_true(document.getElementById('fs').disabled, "disabled fieldset should be disabled");
+      assert_false(document.getElementById('myfile').willValidate, "form control descendant of disabled fieldset that is not also a descendant of a legend should be disabled");
+    }, "A file input without a disabled attribute that is a descendant of a disabled fieldset should be disabled (modulo legend-related complications that don't apply here)");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.html
index 324f72ba468..6f8f3ba5bd2 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.html
@@ -121,4 +121,8 @@
                   "The 'form' property for a label without a form owner should return null.");
   }, "Check that the labels property of a form control with no label returns a zero-length NodeList.");
 
+  // htmlFor attribute
+  test(function () {
+    assert_equals(document.getElementById("lbl2").htmlFor, "testx");
+  }, "A label's htmlFor attribute must reflect the for content attribute");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/legend-form.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/legend-form.html
new file mode 100644
index 00000000000..60d7e4dbdfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/legend-form.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTMLLegendElement Test: form</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<div style="display:none">
+  <form id="testform">
+    <legend id="testlegend">radio</legend>
+  </form>
+</div>
+
+<script>
+
+test(function () {
+  var legendEle = document.getElementById("testlegend");
+  assert_equals(legendEle.form, null);
+}, "Check if legend.form return null when legend has no fieldset element as its parent");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
index 0f7b9cdf8f7..5e6b8cbe168 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
index aacf82bea18..0adc65f828b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
index 93a02452cee..260fb14b042 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
index b21770be3b3..9b18ebb78b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
index 6f551bef74a..742363922fb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
index 6f00a97c23c..3f781b8201a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
index dd96415dce3..f584e0be95a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
index 0b627378b1a..eb24a71a796 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
index c1f35d39a74..77adba6442a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
index 46251b244b8..b08d413e8eb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
index 4a502ef111d..606887e3dd5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
index d9761930854..2f4f750de9f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
index 69d69d3a73c..a047941dcd4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
index e482ae3500e..bd24109afe2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
index 0bc7b32d141..d1be723f15d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
index 412894cc620..3f8ec136a1c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
index 8c1400c0979..3ae09e2e3f3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
index bb40013c9c8..883c0bbdf78 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
index e7a11db559f..cb3528e03c9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
index b94f116e47f..7bffa299c5d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
index 48d4a288667..ce72664408e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
index bd00bd6324e..b9ddc78ff18 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
index 7f772955e24..1a9053e4c3e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
index 620ec69295e..0488b133755 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
index 7994c9c9a4f..23f0a1fc89d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
index 968a1961dff..7baa3e54a98 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
new file mode 100644
index 00000000000..ff33c35d169
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-wss
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-wss",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
new file mode 100644
index 00000000000..dabaab28cd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-wss
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-wss",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
index 420d1505a8c..721e31d399a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: audio-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
index 51fb3a591e6..e78f5493f91 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: fetch-request
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
index fc4c0869503..7b8652238ff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: form-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
index 6a5650251a4..a3430f19368 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: iframe-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
index 7cedf27a751..46ece8f0caa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: img-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
index 7b61d3cdd26..51d06274602 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-css-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
index 8ff7c5427d0..3763052b387 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-prefetch-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
index 727c13ac86b..7a5e5dfa350 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: object-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
index fd0f5781633..c9885eb8577 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: picture-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
index 97fd7c54678..c0e7eb86796 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: script-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
index 47ce1138658..2799f5af02f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: video-tag
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
index dfe4c0d2b96..091bc03c161 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: worker-request
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
index 890c5a068e0..4044ccec1fc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-https
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: xhr-request
-                                 expectation: allowed"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
new file mode 100644
index 00000000000..1967e45115c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: same-host-wss
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "same-host-wss",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
index ef20ab3dd20..b30f28b2aab 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
index 7947998f3b1..c13fd88e47e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
index 259edb91093..9045019de11 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
index e2ad2c00a11..d4b8292af32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
index c1fbed161ac..a640ddee7d9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
index ea646752bc6..48f005a386e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
index fb7626fcfb8..f44a0b54d66 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
index e0e31ce25e1..9cd4f1ba421 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
index 3732ca0c34b..54bb60accf1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
index cd098fcc6bc..26d7d2390ae 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
index 98dc8f5b8b0..7d620f8da93 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
index 2cf47e953ac..f6d23405dd5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
index ff96861c443..c3ea33fdb70 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
index a590f6a0013..4c591115391 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
index 90eeccc4346..ebfb5195eb1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
index 59c4b5b27e2..f5ffcf3a8b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
index fa4e129441e..57efd6f5ec4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
index cb0c1c27c1c..e3113a84c9f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
index 964ef1f74c4..9dc0bb122c4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
index 1f63f808b60..bad7e7f2104 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
index a27066a3de4..f044783e62b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
index 19a05ae3f2b..fd0a1f923a7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
index 7e0fb6d0420..d720fc4fa99 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
index 7176f33e09a..bd69a14a9de 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
index 109dd139400..9da0d9f98ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
index d7725fd0f27..b0fff36eb94 100644
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-https
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Allowed content</h1>
-    <h2>Test behavior of allowed content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
new file mode 100644
index 00000000000..52684b1a501
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-wss
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-wss",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
new file mode 100644
index 00000000000..a32429b8866
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-wss
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: allowed">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-wss",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "allowed"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 539754e8d07..012bd3540a1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
index 3b2e413efec..54fbe3a8477 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index d135154c8f7..f9555455807 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index d239302da25..277d4789180 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
index b4742c92b8b..582ed6012b1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index be3c57b5905..37d4db54b49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 7d8b398b0a6..b4957a41eb1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
index c89b2df2bba..e910a0ab7be 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 919be4b5bd8..1f8763010f0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index cf64424bece..7376626e2e1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
index d5bcff9defa..fc123d9638d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 29b7c7d6150..f7fd32cbf9b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 2563337805f..8ebd99b0118 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
index a3fb49fdc6f..b7743daa64c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index fa599d1c9e8..3fe162a2f7c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 00d7cd5127a..6f71158c216 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
index 6712dfda071..48012dfe550 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index d2c14742359..b76c48a658a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index bf7ef43097c..61f10dfbff3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
index b3d6c9eef0b..69210c6061d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 643daa0c202..a2201a2132a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 77d1f3e6ff3..8fc3283a0ac 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
index 1f2cf69ab3e..21f63bd7307 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index bf8eaef23d9..d4c437147aa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 76d3dddf51e..314f0978905 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
index 6c227ca5f8c..d44e65bcd19 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 18e2fbfc73f..973db8006fc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..5f4facece9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..0d700202fcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..22e930e20b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index bf6576a67f6..c03b96f01fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
index 91d1a3f1265..a7ce2a53055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 3cacff2de7d..1eec54d3b2c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index eb2b540f545..6d67e4d0e40 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
index c94668ad726..0d8b5ebdbd1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 3f74ebf7bc5..326ca747cb4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index a3d5fddcb1c..35e3102a5dd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
index e8c3c209671..eaa1cc5d729 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 8a1708b4e0a..ff99ecf9bbd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index c5dde9eaa3f..b93d1778422 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
index da5b01e6b1f..b23f9f0eb68 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index b852778af0c..122ee404dc7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 3045cec23d2..4c43f3aea64 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
index e13d6d25b37..27da8b421be 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 974e6b771da..01df78229ff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index e45e810791e..27e971ac49c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
index 32d1c139e43..0fe505a4b05 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 6dbd29b3e05..d066d7f4af1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index ef2583c98f5..011e515da17 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
index 7e9799a483e..5c8d860a695 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index e2341178abf..123e53d2027 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 741ac1d2337..735c267a88a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
index f17779c3a86..d70b8576897 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index f05454aaa7f..bf77ac6d77e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index bbeb517dd65..f8509416232 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
index 272556d9822..0dd9e88e885 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 11edffe12af..eb7f7ea2c73 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..972d7f3d349
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..66b20800ffa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..664acc6fa8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: http-csp
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "http-csp",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
new file mode 100644
index 00000000000..46e2255e388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
index a320a2ad190..ccc8e9b0b86 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: fetch-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
index c02e468a94e..147bd58578d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: form-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
index 0f4c63bfe92..84af99aca91 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: iframe-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
index 98dd2c36fe2..bf9b606aed9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-css-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
index 956d09f91b0..128c08dcd6e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: object-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
index 6f2a7c1b14e..debd088dbb9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: picture-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
index 3a8e8aefc5c..4872269168d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: script-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
index 52f49cc0950..b4bfdb8781c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: worker-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
index 68a41936b77..39a44b4524f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: xhr-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..04a462d1302
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
index 065f3322f7f..85be9eb2b7d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: fetch-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
index 21195e63b87..f5a0bf5dc92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: form-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
index 9d9ae1a5b11..6a70032ecdf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: iframe-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
index c692dddfda4..68b5ac7066c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-css-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
index 0b74f62647f..a71d608c404 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: object-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
index 3a086d69def..b1cf804b339 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: picture-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
index 45028df06e5..05201512b34 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: script-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
index 48d69822c97..599a5280f19 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: worker-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
index 08215b4aecc..fd22ba37e55 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: xhr-request
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..1f887fb5870
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: meta-csp
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "meta-csp",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 7719e757c7d..f35fd03dae8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
index 0c9cc94d746..3b2d158d631 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 5bef9697f3c..24a1e8671d8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index fa08dd71aff..aaeaf76737f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 073e4c1b261..a649f4de484 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 971bbfccd73..fa1d0fe9094 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 1f01aade06f..0dad760aad3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 8eca3a1b2eb..ed11ad73e8d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index fd5a0e86605..de84e1278b6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index cc5e4864e4b..13c536f3eb5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 7091e351662..e941030043e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 98d50834796..c9efe54e44a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 0335c8ecc47..23e6badf7ea 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index f50f0aa5db2..482024535f9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index d61c4c8ad65..f91df5037e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 15dba41092a..09fadc8d3fb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 0846e19e785..63505012881 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 8d3684a05c5..c3bedd387d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 8327609cb0b..4c375acd157 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 0d043a69002..21d15255719 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 9d56544f27d..cd56451c5e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index b536c01465e..4feea4b7dc0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
index da677d1a301..2d4f15b13e2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index da62f80f75c..a6782c7e5b8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 64b05b0fcee..b2ee591a74a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
index fe1c2531791..e49db79f3d3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index d719df447bd..ffd8aeb9c0b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..ef959099b11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..9a344137bb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..fad857a6ee1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: cross-origin-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "cross-origin-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index f09de3a87c2..d7aa3899bfa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
index c97f703f5c4..55c768525d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index a83aa353695..13de80df73c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 6c5e403c488..45a2764ade6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 20651d5552f..09e948a84b5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 4a7fc77ae4c..f72d269d11e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 352f5af16ce..a69f2bb412e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 37c55c40dfc..f98fe6c4cdf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 75f0e6f543d..b891c73e817 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index a9b3c3001bc..11d8f4877a7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 094ea4f0dd4..ce383d9aacb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index efad36e8b4c..67b58e0096c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 0670e6ac299..190b66b0d62 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 09fc02e5234..c03d5036a38 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 6ff553e4f3f..d9a16660981 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index bbf3a5d6c24..0b2a8c8ff5a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 51d6568f63f..532c97bf066 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 86771b07327..662fc90485a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index 465f68eb4c8..cc1c051a364 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
index 546e32f28ee..23efca0a54c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 40ab7e08358..69e151519bb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index f21e6a1f205..065ff5ba526 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
index 3cee8fc6a31..3cd8a67482c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index 34ce2e6b7c0..3b3e17c2777 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
index de05e8f9e74..897354a798a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
index be1c31bebdf..ee787d05aa3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
index ed2d3e2834d..9a9085b86eb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Blockable content</h1>
-    <h2>Test behavior of blockable content.</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..cc63690459a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: keep-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "keep-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..4b7ae62fd4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: no-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "no-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
new file mode 100644
index 00000000000..278819b938f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="opt_in_method: no-opt-in
+                                 origin: same-host-ws
+                                 source_scheme: https
+                                 context_nesting: top-level
+                                 redirection: swap-scheme-redirect
+                                 subresource: websocket-request
+                                 expectation: blocked">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      MixedContentTestCase(
+        {
+          "opt_in_method": "no-opt-in",
+          "origin": "same-host-ws",
+          "source_scheme": "https",
+          "context_nesting": "top-level",
+          "redirection": "swap-scheme-redirect",
+          "subresource": "websocket-request",
+          "expectation": "blocked"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/common.js b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
index d500f7ef52a..e02e52f6b49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/common.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
@@ -354,7 +354,33 @@ function requestViaObject(url) {
   return createRequestViaElement("object", {"data": url}, document.body);
 }
 
+/**
+ * Creates a new WebSocket pointing to {@code url} and sends a message string
+ * "echo". The {@code message} and {@code error} events are triggering the
+ * returned promise resolve/reject events.
+ * @param {string} url The URL for WebSocket to connect to.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaWebSocket(url) {
+  return new Promise(function(resolve, reject) {
+    var websocket = new WebSocket(url);
+
+    websocket.addEventListener("message", function(e) {
+      resolve(JSON.parse(e.data));
+    });
+
+    websocket.addEventListener("open", function(e) {
+      websocket.send("echo");
+    });
+
+    websocket.addEventListener("error", function(e) {
+      reject(e)
+    });
+  });
+}
+
 // SanityChecker does nothing in release mode. See sanity-checker.js for debug
 // mode.
 function SanityChecker() {}
 SanityChecker.prototype.checkScenario = function() {};
+SanityChecker.prototype.setFailTimeout = function(test, timeout) {};
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/expect.py b/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
index b3c3932478a..e25f2f9f470 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
@@ -58,14 +58,15 @@ def main(request, response):
 
         key = request.GET["key"]
         stash = request.server.stash
+        path = request.GET.get("path", request.url.split('?'))[0]
 
         if action == "put":
             value = request.GET["value"]
-            stash.take(key=key)
-            stash.put(key=key, value=value)
+            stash.take(key=key, path=path)
+            stash.put(key=key, value=value, path=path)
             response_data = json.dumps({"status": "success", "result": key})
         elif action == "purge":
-            value = stash.take(key=key)
+            value = stash.take(key=key, path=path)
             if content_type == "image/png":
                 response_data = open(os.path.join(request.doc_root,
                                                   "images",
@@ -86,7 +87,7 @@ def main(request, response):
             else:
                 response_data = "/* purged */"
         elif action == "take":
-            value = stash.take(key=key)
+            value = stash.take(key=key, path=path)
             if value is None:
                 status = "allowed"
             else:
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
index df140c9c47b..7f3a7bfa967 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
@@ -16,30 +16,43 @@
  * @return {object} Object wrapping the start method used to run the test.
  */
 function MixedContentTestCase(scenario, description, sanityChecker) {
-  var insecureProtocol = "http";
-  var secureProtocol = "https";
+  var httpProtocol = "http";
+  var httpsProtocol = "https";
+  var wsProtocol = "ws";
+  var wssProtocol = "wss";
 
   var sameOriginHost = location.hostname;
   var crossOriginHost = "{{domains[www1]}}";
 
   // These values can evaluate to either empty strings or a ":port" string.
-  var insecurePort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  var securePort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
+  var httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
+  var httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
+  var wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
+  var wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
 
   var resourcePath = "/mixed-content/generic/expect.py";
+  var wsResourcePath = "/stash_responder";
 
   // Map all endpoints to scenario for use in the test.
   var endpoint = {
     "same-origin":
       location.origin + resourcePath,
     "same-host-https":
-      secureProtocol + "://" + sameOriginHost + securePort + resourcePath,
+      httpsProtocol + "://" + sameOriginHost + httpsPort + resourcePath,
     "same-host-http":
-      insecureProtocol + "://" + sameOriginHost + insecurePort + resourcePath,
+      httpProtocol + "://" + sameOriginHost + httpPort + resourcePath,
     "cross-origin-https":
-      secureProtocol + "://" + crossOriginHost + securePort + resourcePath,
+      httpsProtocol + "://" + crossOriginHost + httpsPort + resourcePath,
     "cross-origin-http":
-      insecureProtocol + "://" + crossOriginHost + insecurePort + resourcePath
+      httpProtocol + "://" + crossOriginHost + httpPort + resourcePath,
+    "same-host-wss":
+      wssProtocol + "://" + sameOriginHost + wssPort + wsResourcePath,
+    "same-host-ws":
+      wsProtocol + "://" + sameOriginHost + wsPort + wsResourcePath,
+    "cross-origin-wss":
+      wssProtocol + "://" + crossOriginHost + wssPort + wsResourcePath,
+    "cross-origin-ws":
+      wsProtocol + "://" + crossOriginHost + wsPort + wsResourcePath
   };
 
   // Mapping all the resource requesting methods to the scenario.
@@ -58,7 +71,8 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
     "picture-tag": requestViaPicture,
     "object-tag": requestViaObject,
     "link-css-tag": requestViaLinkStylesheet,
-    "link-prefetch-tag": requestViaLinkPrefetch
+    "link-prefetch-tag": requestViaLinkPrefetch,
+    "websocket-request": requestViaWebSocket
   };
 
   sanityChecker.checkScenario(scenario, resourceMap);
@@ -79,35 +93,29 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
     "picture-tag": "image/png",
     "object-tag": "text/html",
     "link-css-tag": "text/css",
-    "link-prefetch-tag": "text/html"
+    "link-prefetch-tag": "text/html",
+    "websocket-request": "application/json"
   };
 
   var mixed_content_test = async_test(description);
 
   function runTest() {
-    var testCompleted = false;
-
-    // Due to missing implementations, tests time out, so we fail them early.
-    // TODO(kristijanburnik): Once WPT rolled in:
-    //   https://github.com/w3c/testharness.js/pull/127
-    // Refactor to make use of step_timeout.
-    setTimeout(function() {
-      mixed_content_test.step(function() {
-        assert_true(testCompleted, "Expected test to complete.");
-        mixed_content_test.done();
-      })
-    }, 1000);
+    sanityChecker.setFailTimeout(mixed_content_test);
 
     var key = guid();
     var value = guid();
+    // We use the same path for both HTTP/S and WS/S stash requests.
+    var stash_path = encodeURIComponent("/mixed-content");
     var announceResourceRequestUrl = endpoint['same-origin'] +
                                      "?action=put&key=" + key +
-                                     "&value=" + value;
+                                     "&value=" + value +
+                                     "&path=" + stash_path;
     var assertResourceRequestUrl = endpoint['same-origin'] +
-                                  "?action=take&key=" + key;
+                                  "?action=take&key=" + key +
+                                  "&path=" + stash_path;
     var resourceRequestUrl = endpoint[scenario.origin] + "?redirection=" +
-                             scenario.redirection + "&action=purge&key=" +
-                             key + "&content_type=" +
+                             scenario.redirection + "&action=purge&key=" + key +
+                             "&path=" + stash_path + "&content_type=" +
                              contentType[scenario.subresource];
 
     xhrRequest(announceResourceRequestUrl)
@@ -147,7 +155,6 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
                   "'.");
          }, "Check if request was sent.");
          mixed_content_test.done();
-         testCompleted = true;
       });
 
   }  // runTest
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js b/tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js
index c711e0ee236..55a103adf0f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js
@@ -1,6 +1,6 @@
 // The SanityChecker is used in debug mode to identify problems with the
-// structure of the testsuite. In release mode it is mocked out to do nothing.
-
+// structure of the testsuite and to force early test failures.
+// In release mode it is mocked out to do nothing.
 function SanityChecker()  {}
 
 SanityChecker.prototype.checkScenario = function(scenario, resourceInvoker) {
@@ -36,3 +36,18 @@ SanityChecker.prototype.checkScenario = function(scenario, resourceInvoker) {
 
   }, "[MixedContentTestCase] The test scenario should be valid.");
 }
+
+// For easier debugging runs, we can fail a test earlier.
+SanityChecker.prototype.setFailTimeout = function(test, timeout) {
+  // Due to missing implementations, tests time out, so we fail them early.
+  // TODO(kristijanburnik): Once WPT rolled in:
+  //   https://github.com/w3c/testharness.js/pull/127
+  // Refactor to make use of step_timeout.
+  setTimeout(function() {
+    test.step(function() {
+      assert_equals(test.phase, test.phases.COMPLETE,
+                    "Expected test to complete.");
+      test.done();
+    })
+  }, timeout || 1000);
+}
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 3cae7b1b2f2..ac620c1075b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
index a6597f1f437..abc81b30191 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 3b0dd9786c9..27c67b081dd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 9a63f99ae00..1816b4231bd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
index e0d760323b7..509fc34750f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index aa689fad1a4..61baeee7944 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index a95ea4adfd2..743515ed351 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
index 87338d7de57..88a54250a12 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index f319137a7ca..2098a60b628 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 767bbaa01e5..029d34c4f41 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
index 892c5f10d1f..c72ca267fcb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 10513766f2e..b50a7b70a01 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 0562b6ed924..5fd63aa6d0b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
index 0246af6a961..e6f742213cc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 57989fdbccc..522e9442072 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index d496ea5435f..ad615e9b23f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
index 450b5556579..b6f92431a3a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 200d50cbec4..580f4b5492f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index fde66246b8e..fa8bd8a1f49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
index 21f01e59b78..685f34582a0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index 4e042058e5e..ab0378461d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
index 532b9631902..8b64104bd2f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
index e605a73136b..abe3385b06a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
index e71c10ae4c3..78d9f8d5d4e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: http-csp
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
index 40b5cddbdde..ddc860ba2fc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: audio-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
index 7febc67f326..44fdb8b7aa1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: img-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
index 293be460d2f..b5de46754dd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-prefetch-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
index a4376a209f2..2aebedc7857 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: cross-origin-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: video-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
index ade9c060d40..e066dd1e3e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: audio-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
index f4bc1bc74b6..0572c8079bc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: img-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
index 29a5afc0c99..3b1d36af291 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: link-prefetch-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
index 4a098da56b4..c78aa6b9942 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
@@ -1,43 +1,25 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: meta-csp
                                  origin: same-host-http
                                  source_scheme: https
                                  context_nesting: top-level
                                  redirection: no-redirect
                                  subresource: video-tag
-                                 expectation: blocked"><meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+                                 expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 235dcab68a6..15fe5d2afc1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
index f0f024cf794..2da4a2b9361 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 76724ecbf69..8b610ada7db 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index dccc6c8fad1..5a7bdc3b538 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 4c4933e919b..6c0a9f5e686 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index f779562be89..c9ffbfd0c70 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 67f09927adb..76629861437 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 935d48e8a36..5bcce0017db 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 84c2eb421d7..31230323496 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 7178e0fcf9d..561a2f7c1b5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 6cc20ef2fdc..e02134b4acf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 2e8225bc21e..f90575c137a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: cross-origin-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 203f93f430c..cd4d8a52e76 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 7d096f0be49..20d31cf690e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 8af53520894..2ed233dc885 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 355dc84511b..aab662fc3ab 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 90e3843733f..6f0a8fdedef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index d8d2853b058..f55cce43713 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 30969a0623e..26c76572040 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 6cf5133166c..582f6c63a5d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 8faeaa0e512..a7feabccba1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
index 139a87d3013..68bfc2b84a8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
index 847d2a7000b..2e5eff5a74e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
index 3deb905f760..8c5bd7b0806 100644
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.debug.html.template. -->
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
     <meta charset='utf-8'>
     <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
     <meta name="assert" content="opt_in_method: no-opt-in
                                  origin: same-host-http
                                  source_scheme: https
@@ -14,30 +16,10 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for mixed-content tests. -->
     <script src="/mixed-content/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/mixed-content/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/mixed-content/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all mixed-content test cases. -->
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
-    <h1>Optionally-blockable content</h1>
-    <h2>Test behavior of optionally-blockable content</h2>
-    <pre>opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed</pre>
-
-    <p>See <a href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable" target="_blank">specification</a>
-       details for this test.</p>
-
-    <div id="log"></div>
     <script>
       MixedContentTestCase(
         {
@@ -53,5 +35,6 @@
         new SanityChecker()
       ).start();
       </script>
+    <div id="log"></div>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec.src.json b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
index 94c61c03769..3f1540ab408 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec.src.json
+++ b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
@@ -69,6 +69,20 @@
           },
           "origin": ["cross-origin-http", "same-host-http"],
           "expectation": "blocked"
+        },
+        {
+          "name": "ws-downgrade-blocks",
+          "expansion": "default",
+          "source_scheme": "https",
+          "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"],
+          "context_nesting": "top-level",
+          "redirection": "*",
+          "subresource": {
+            "blockable": "websocket-request",
+            "optionally-blockable": []
+          },
+          "origin": ["cross-origin-ws", "same-host-ws"],
+          "expectation": "blocked"
         }
       ]
     },
@@ -91,6 +105,20 @@
           },
           "origin": ["same-host-https"],
           "expectation": "allowed"
+        },
+        {
+          "name": "websocket-allowed",
+          "expansion": "default",
+          "source_scheme": "https",
+          "opt_in_method": "*",
+          "context_nesting": "top-level",
+          "redirection": ["no-redirect", "keep-scheme-redirect"],
+          "subresource": {
+            "blockable": "websocket-request",
+            "optionally-blockable": []
+          },
+          "origin": ["same-host-wss"],
+          "expectation": "allowed"
         }
       ]
     }
@@ -98,7 +126,7 @@
 
   "excluded_tests": [
     {
-      "name": "TODO-subresources-not-supported",
+      "name": "Redundant-subresources",
       "expansion": "*",
       "source_scheme": "*",
       "opt_in_method": "*",
@@ -106,14 +134,34 @@
       "redirection": "*",
       "subresource": {
         "blockable": [
-          "a-tag",
-          "websocket-request"
+          "a-tag"
         ],
         "optionally-blockable": []
       },
       "origin": "*",
       "expectation": "*"
     },
+    {
+      "name": "Skip-origins-not-applicable-to-websockets",
+      "expansion": "*",
+      "source_scheme": "*",
+      "opt_in_method": "*",
+      "context_nesting": "*",
+      "redirection": "*",
+      "subresource": {
+        "blockable": [
+          "websocket-request"
+        ],
+        "optionally-blockable": []
+      },
+      "origin": [
+        "same-host-https",
+        "same-host-http",
+        "cross-origin-https",
+        "cross-origin-http"
+      ],
+      "expectation": "*"
+    },
     {
       "name": "TODO-opt-in-method-img-cross-origin",
       "expansion": "*",
@@ -175,7 +223,11 @@
       "same-host-https",
       "same-host-http",
       "cross-origin-https",
-      "cross-origin-http"
+      "cross-origin-http",
+      "same-host-wss",
+      "same-host-ws",
+      "cross-origin-wss",
+      "cross-origin-ws"
     ],
     "subresource": {
       "blockable": [
diff --git a/tests/wpt/web-platform-tests/notifications/Notification-permission.html b/tests/wpt/web-platform-tests/notifications/Notification-permission.html
deleted file mode 100644
index d6501b5b5c3..00000000000
--- a/tests/wpt/web-platform-tests/notifications/Notification-permission.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: Notification - permission (basic)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.3 Permission" href="http://www.w3.org/TR/notifications/#permission">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-    test(function() {
-      assert_in_array(Notification.permission, ["default", "denied", "granted"], "Notification.permission");
-    }, "Test checks that notification the value of permission is in array");
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-denied-manual.html b/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-denied-manual.html
deleted file mode 100644
index 583e80e6920..00000000000
--- a/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-denied-manual.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: Notification - requestPermission (deny)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.3 Permission" href="http://www.w3.org/TR/notifications/#permission">
-<meta name="flags" content="interact">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-  <p>Test Step:</p>
-  <p>1. When ask the user whether showing notifications, make sure choose deny.</p>
-  <div id="log"></div>
-  <script>
-    t = async_test("the notification the value of permission is denied", {timeout: 50000});
-    Notification.requestPermission(t.step_func(function(permission) {
-       assert_equals(permission, "denied", "notification permission");
-       t.done();
-    }));
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-granted-manual.html b/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-granted-manual.html
deleted file mode 100644
index 4cf29d2731f..00000000000
--- a/tests/wpt/web-platform-tests/notifications/Notification-requestPermission-granted-manual.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: Notification - requestPermission (allow)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.3 Permission" href="http://www.w3.org/TR/notifications/#permission">
-<meta name="flags" content="interact">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-  <p>Test Step:</p>
-  <p>1. When ask the user whether showing notifications, make sure choose allow.</p>
-  <div id="log"></div>
-  <script>
-    t = async_test("the notification the value of permission is granted", {timeout: 50000});
-    Notification.requestPermission(t.step_func(function(permission) {
-       assert_equals(permission, "granted", "notification permission");
-       t.done();
-    }));
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/README.md b/tests/wpt/web-platform-tests/notifications/README.md
deleted file mode 100644
index 821255358f1..00000000000
--- a/tests/wpt/web-platform-tests/notifications/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Web Notifications test suite.
-
-Latest Editor's Draft: http://dvcs.w3.org/hg/notifications/raw-file/tip/Overview.html
-
-Latest Technical Report: http://www.w3.org/TR/notifications/
diff --git a/tests/wpt/web-platform-tests/notifications/body-basic-manual.html b/tests/wpt/web-platform-tests/notifications/body-basic-manual.html
new file mode 100644
index 00000000000..a479917aeef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/body-basic-manual.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.body (basic)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = null,
+                notifications = [],
+                text = "This is the body content: Room 101"
+            createPassFail("If a notification appears containing the text"
+                + " \"" + text + "\"",
+                t, closeNotifications, notifications)
+            notification = new Notification("", {
+                body: text
+            })
+            notifications.push(notification)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/body-empty-manual.html b/tests/wpt/web-platform-tests/notifications/body-empty-manual.html
new file mode 100644
index 00000000000..a94f08e1c5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/body-empty-manual.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.body (empty string)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = null,
+                notifications = [],
+                text = "This is the title: New e-mail received"
+            createPassFail("If a notification appears containing the text "
+                + "\"" + text + "\""
+                + " but containing no body text other than any boilerplate"
+                + " content the browser may automatically add to all"
+                + " notifications (for example, some browsers show the origin"
+                + " in the notification)", t, closeNotifications, notifications)
+           notification = new Notification(text, {
+              body: ""
+           })
+           notifications.push(notification)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/common.js b/tests/wpt/web-platform-tests/notifications/common.js
new file mode 100644
index 00000000000..ecfa0e3c2d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/common.js
@@ -0,0 +1,48 @@
+function createPassFail(condition, test, cleanup, cleanupParam) {
+    var div = document.querySelector("#passfail")
+    var para = document.createElement("p")
+    var pass = document.createElement("button")
+    var fail = document.createElement("button")
+    var style = "font-family: monospace"
+    para.innerHTML = condition
+        + ', press the PASS button;'
+        + ' otherwise press the FAIL button.',
+    pass.innerHTML = "PASS"
+    fail.innerHTML = "FAIL"
+    pass.setAttribute("style", style)
+    fail.setAttribute("style", style)
+    pass.addEventListener("click", function () {
+        clearPassFail()
+        cleanup(cleanupParam)
+        test.done()
+    }, false)
+    fail.addEventListener("click", function () {
+        clearPassFail()
+        cleanup(cleanupParam)
+        test.force_timeout()
+        test.set_status(test.FAIL)
+        test.done()
+    }, false)
+    document.body.appendChild(div)
+    div.appendChild(para)
+    div.appendChild(pass)
+    div.appendChild(fail)
+}
+function clearPassFail() {
+    document.querySelector("#passfail").innerHTML = ""
+}
+function closeNotifications(notifications) {
+    for (var i=0; i < notifications.length; i++) {
+        notifications[i].close()
+    }
+}
+function hasNotificationPermission() {
+    Notification.requestPermission()
+    if (Notification.permission != "granted") {
+        alert("TEST NOT RUN. Change your browser settings so that"
+            + " notifications for this origin are allowed, and then re-run"
+            + " this test.")
+        return false
+    }
+    return true
+}
diff --git a/tests/wpt/web-platform-tests/notifications/constructor-basic.html b/tests/wpt/web-platform-tests/notifications/constructor-basic.html
new file mode 100644
index 00000000000..a36a8ce3047
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/constructor-basic.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification constructor (basic)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+    if (Notification.permission != "granted") {
+        this.force_timeout()
+        this.set_status(this.NOTRUN, "You must allow notifications for this"
+            + " origin before running this test.")
+    }
+    var notification = new Notification("New Email Received")
+    assert_true(notification instanceof Notification)
+    notification.onshow = function() {
+        notification.close()
+    }
+}, "Called the notification constructor with one argument.")
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/constructor-invalid.html b/tests/wpt/web-platform-tests/notifications/constructor-invalid.html
new file mode 100644
index 00000000000..88df165e169
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/constructor-invalid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification constructor (invalid)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+    if (Notification.permission != "granted") {
+        this.force_timeout()
+        this.set_status(this.NOTRUN, "You must allow notifications for this"
+            + " origin before running this test.")
+    }
+    assert_throws(new TypeError(), function() {
+        new Notification()
+    })
+}, "Called the notification constructor with no arguments.")
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/event-onclick-manual.html b/tests/wpt/web-platform-tests/notifications/event-onclick-manual.html
index 5d06caea5f2..0d48d06ae8d 100644
--- a/tests/wpt/web-platform-tests/notifications/event-onclick-manual.html
+++ b/tests/wpt/web-platform-tests/notifications/event-onclick-manual.html
@@ -1,28 +1,25 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification - onclick (basic)</title>
+<title>Notification.onclick (basic)</title>
 <link rel="author" title="Apple Inc." href="http://www.apple.com/">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-var t = async_test("the notification.onclick event can be invoked", {timeout: 50000});
-
-Notification.requestPermission(t.step_func(function(permission) {
-    assert_equals(permission, "granted", "notification permission");
-
-    var notification = new Notification("Please click on the notification.", {
-        body: "Click me to test clicking on notifications."
-    });
-    notification.onclick = t.step_func(function(e) {
-        assert_equals(Object.prototype.toString.call(e), "[object Event]", "the type of event");
-        assert_equals(e.type, "click", "The event is the expected type.")
-        t.done();
-    });
-}));
-  </script>
-</body>
-
+<script src="common.js"></script>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification =
+                new Notification("Please click on the notification.", {
+                    body: "Click me to test clicking on notifications."
+                })
+            notification.onclick = function(e) {
+                assert_equals(Object.prototype.toString.call(e), "[object Event]")
+                assert_equals(e.type, "click")
+                t.done()
+            }
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/event-onclose.html b/tests/wpt/web-platform-tests/notifications/event-onclose.html
index 27414dc4fe8..aee3213698e 100644
--- a/tests/wpt/web-platform-tests/notifications/event-onclose.html
+++ b/tests/wpt/web-platform-tests/notifications/event-onclose.html
@@ -1,31 +1,26 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification - onclose (basic)</title>
+<title>Notification.onclose (basic)</title>
 <link rel="author" title="Apple Inc." href="http://www.apple.com/">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-var t = async_test("the notification.onclose event can be invoked", {timeout: 50000});
-
-Notification.requestPermission(t.step_func(function(permission) {
-    assert_equals(permission, "granted", "notification permission");
-
-    var notification = new Notification("This notification will close.", {
-        body: "This notification will close."
-    });
-    notification.onshow = t.step_func(function(e) {
-        e.target.close();
-    });
-    notification.onclose = t.step_func(function(e) {
-        assert_equals(Object.prototype.toString.call(e), "[object Event]", "the type of event");
-        assert_equals(e.type, "close", "The event is the expected type.")
-        t.done();
-    });
-}));
-  </script>
-</body>
-
+<script>
+test(function() {
+    if (Notification.permission != "granted") {
+        this.force_timeout()
+        this.set_status(this.NOTRUN, "You must allow notifications for this"
+            + "origin before running this test.")
+    } else {
+        var t = async_test("Invoked the onclose event handler.")
+        var notification = new Notification("New Email Received")
+        notification.onshow = t.step_func(function() {
+            notification.close()
+        })
+        notification.onclose = t.step_func(function(e) {
+            assert_equals(Object.prototype.toString.call(e), "[object Event]")
+            assert_equals(e.type, "close", "Checked the event type.")
+            t.done()
+        })
+    }
+}, "Checked test prerequisites.")
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.html b/tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.html
index 3e521801d4b..4a50de73662 100644
--- a/tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.html
+++ b/tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification - onerror (basic)</title>
+<title>Notification.onerror (permission=default)</title>
 <link rel="author" title="Apple Inc." href="http://www.apple.com/">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-    if (Notification.permission != "default") {
-      document.getElementById("log").innerHTML = "Please clear your notification settings for web-platform.test and retry.";
-    } else {
-      t = async_test("the notification.onerror event can be invoked", {timeout: 50000});
-    var notification = new Notification("New Email Received", {
-      body: "Room 101"
-    });
-    notification.onerror = t.step_func(function(e) {
-      assert_equals(Object.prototype.toString.call(e), "[object Event]", "the type of event");
-      assert_equals(e.type, "error", "The event is the expected type.")
-      t.done();
-    });
-    }
-  </script>
-</body>
-
+<script>
+setup({ explicit_timeout: true })
+if (Notification.permission != "default") {
+    alert("TEST NOT RUN. Change your browser settings so that the notification"
+        + " settings for this origin are completely cleared/removed, (so your"
+        + " browser default settings are used for this origin), and then reload"
+        + " this page.")
+} else {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = new Notification("New Email Received")
+            notification.onerror = function(e) {
+                assert_equals(Object.prototype.toString.call(e), "[object Event]")
+                assert_equals(e.type, "error")
+                Notification.requestPermission()
+                t.done()
+            }
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.html b/tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.html
index 049bd3fe779..b90fb38cc10 100644
--- a/tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.html
+++ b/tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.html
@@ -1,37 +1,26 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification - onerror (basic)</title>
+<title>Notification.onerror (permission=denied)</title>
 <link rel="author" title="Apple Inc." href="http://www.apple.com/">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="message"></div>
-  <div id="log"></div>
-  <script>
-    var t = async_test("the notification.onerror event can be invoked", {timeout: 50000});
-
-    function onerror_test() {
-       var notification = new Notification("New Email Received", {
-         body: "Room 101"
-       });
-       notification.onerror = t.step_func(function(e) {
-         assert_equals(Object.prototype.toString.call(e), "[object Event]", "the type of event");
-         assert_equals(e.type, "error", "The event is the expected type.")
-         t.done();
-       });
-    }
-
-    if (Notification.permission != "denied") {
-      document.getElementById("message").innerHTML = "Please deny web-platform.test in your browser's notification preferences and retry";
-      Notification.requestPermission(t.step_func(function(permission) {
-        assert_equals(permission, "denied", "notification permission");
-        onerror_test();
-      }));
-    } else {
-      onerror_test();
-    }
-  </script>
-</body>
-
+<script>
+setup({ explicit_timeout: true })
+Notification.requestPermission()
+if (Notification.permission != "denied") {
+    alert("TEST NOT RUN. Change your browser settings so that notifications"
+        + " for this origin are blocked, and then reload this page.")
+} else {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = new Notification("New Email Received")
+            notification.onerror = function(e) {
+                assert_equals(Object.prototype.toString.call(e), "[object Event]")
+                assert_equals(e.type, "error")
+                Notification.requestPermission()
+                t.done()
+            }
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/event-onshow.html b/tests/wpt/web-platform-tests/notifications/event-onshow.html
index 8e3c7637ee1..7cc2be9de5b 100644
--- a/tests/wpt/web-platform-tests/notifications/event-onshow.html
+++ b/tests/wpt/web-platform-tests/notifications/event-onshow.html
@@ -1,29 +1,25 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification - onshow (basic)</title>
+<title>Notification.onshow (basic)</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
 <link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-var t = async_test("the notification.onshow event can be invoked", {timeout: 50000});
-
-Notification.requestPermission(t.step_func(function(permission) {
-    assert_equals(permission, "granted", "notification permission");
-
-    var notification = new Notification("This is a notification.", {
-        body: "Can you see this?."
-    });
-    notification.onshow = t.step_func(function(e) {
-        assert_equals(Object.prototype.toString.call(e), "[object Event]", "the type of event");
-        assert_equals(e.type, "show", "The event is the expected type.")
-        t.done();
-    });
-}));
-  </script>
-</body>
-
+<script>
+test(function() {
+    if (Notification.permission != "granted") {
+        this.force_timeout()
+        this.set_status(this.NOTRUN, "You must allow notifications for this"
+            + " origin before running this test.")
+    } else {
+        var t = async_test("Invoked the onshow event handler.")
+        var notification = new Notification("New Email Received")
+        notification.onshow = t.step_func(function(e) {
+            assert_equals(Object.prototype.toString.call(e), "[object Event]")
+            assert_equals(e.type, "show", "Checked the event type.")
+            notification.close()
+            t.done()
+        })
+    }
+}, "Checked test prerequisites.")
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/icon-basic-manual.html b/tests/wpt/web-platform-tests/notifications/icon-basic-manual.html
new file mode 100644
index 00000000000..32e8e0bbbd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/icon-basic-manual.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.icon (basic)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = null,
+                notifications = []
+            createPassFail("If a notification appears containing"
+                + " an image of a cat",
+                t, closeNotifications, notifications)
+            notification = new Notification("New Email Received", {
+                body: "Room 101",
+                icon: "http://test.csswg.org/source/support/cat.png"
+            })
+            notifications.push(notification)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/icon-empty-manual.html b/tests/wpt/web-platform-tests/notifications/icon-empty-manual.html
new file mode 100644
index 00000000000..a4b288fa597
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/icon-empty-manual.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.icon (empty string)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification = null,
+                notifications = []
+            createPassFail("If a notification appears containing no image",
+                t, closeNotifications, notifications)
+            notification = new Notification("New Email Received", {
+                body: "Room 101",
+                icon: ""
+            })
+            notifications.push(notification)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/instance.html b/tests/wpt/web-platform-tests/notifications/instance.html
index 2451b10c6a1..c0ebe7e6998 100644
--- a/tests/wpt/web-platform-tests/notifications/instance.html
+++ b/tests/wpt/web-platform-tests/notifications/instance.html
@@ -1,52 +1,63 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Basic Notification instance tests</title>
+<title>Notification instance basic tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-  var n = new Notification("Radio check",
-    {
-        dir: "ltr",
-       lang: "aa",
-       body: "This is a radio check.",
-        tag: "radio_check999",
-       icon: "http://example.com/icon.png",
+if (Notification.permission != "granted") {
+    test(function() {
+        this.force_timeout()
+        this.set_status(this.NOTRUN, "You must allow notifications for this"
+            + " origin before running this test.")
+    })
+} else {
+    var n = new Notification("Radio check",
+      {
+          dir: "ltr",
+         lang: "aa",
+         body: "This is a radio check.",
+          tag: "radio_check999",
+         icon: "http://example.com/icon.png",
+      }
+    )
+    n.onshow = function() {
+        n.close()
     }
-  );
-  test(function() {
-    assert_true(n instanceof Notification);
-    },"Notification instance exists.");
-  test(function() {
-    assert_true("close" in n);
-    },"Attribute exists: close");
-  test(function() {
-    assert_true("onclick" in n);
-    },"Attribute exists: onclick");
-  test(function() {
-    assert_true("onshow" in n);
-    },"Attribute exists: onshow");
-  test(function() {
-    assert_true("onerror" in n);
-    },"Attribute exists: onerror");
-  test(function() {
-    assert_true("onclose" in n);
-    },"Attribute exists: onclose");
-  test(function() {
-    assert_equals("Radio check", n.title);
-    },"Attribute exists with expected value: title");
-  test(function() {
-    assert_equals("ltr", n.dir);
-    },"Attribute exists with expected value: dir");
-  test(function() {
-    assert_equals("aa", n.lang);
-    },"Attribute exists with expected value: lang");
-  test(function() {
-    assert_equals("This is a radio check.", n.body);
-    },"Attribute exists with expected value: body");
-  test(function() {
-    assert_equals("radio_check999", n.tag);
-    },"Attribute exists with expected value: tag");
-  test(function() {
-    assert_equals("http://example.com/icon.png", n.icon);
-    },"Attribute exists with expected value: icon");
+    test(function() {
+        assert_true(n instanceof Notification)
+    },"Notification instance exists.")
+    test(function() {
+        assert_true("close" in n)
+    },"Attribute exists: close")
+    test(function() {
+        assert_true("onclick" in n)
+    },"Attribute exists: onclick")
+    test(function() {
+        assert_true("onshow" in n)
+    },"Attribute exists: onshow")
+    test(function() {
+        assert_true("onerror" in n)
+    },"Attribute exists: onerror")
+    test(function() {
+        assert_true("onclose" in n)
+    },"Attribute exists: onclose")
+    test(function() {
+        assert_equals("Radio check", n.title)
+    },"Attribute exists with expected value: title")
+    test(function() {
+        assert_equals("ltr", n.dir)
+    },"Attribute exists with expected value: dir")
+    test(function() {
+        assert_equals("aa", n.lang)
+    },"Attribute exists with expected value: lang")
+    test(function() {
+        assert_equals("This is a radio check.", n.body)
+    },"Attribute exists with expected value: body")
+    test(function() {
+        assert_equals("radio_check999", n.tag)
+    },"Attribute exists with expected value: tag")
+    test(function() {
+        assert_equals("http://example.com/icon.png", n.icon)
+    },"Attribute exists with expected value: icon")
+}
 </script>
diff --git a/tests/wpt/web-platform-tests/notifications/interfaces.html b/tests/wpt/web-platform-tests/notifications/interfaces.html
index 71232e71249..5930086f598 100644
--- a/tests/wpt/web-platform-tests/notifications/interfaces.html
+++ b/tests/wpt/web-platform-tests/notifications/interfaces.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <meta charset=utf-8>
-<title>Web Notifications IDL tests</title>
+<title>Notification interface IDL tests</title>
 <div id=log></div>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
@@ -74,7 +74,7 @@ var idlArray = new IdlArray();
   }
 });
 idlArray.add_objects({
-  Notification: ['new Notification("foo")'],
+  Notification: ['new Notification("Running idlharness.")'],
 });
 idlArray.test();
 </script>
diff --git a/tests/wpt/web-platform-tests/notifications/notification-lang.html b/tests/wpt/web-platform-tests/notifications/lang.html
similarity index 69%
rename from tests/wpt/web-platform-tests/notifications/notification-lang.html
rename to tests/wpt/web-platform-tests/notifications/lang.html
index d36fc14e387..be1795c8c9e 100644
--- a/tests/wpt/web-platform-tests/notifications/notification-lang.html
+++ b/tests/wpt/web-platform-tests/notifications/lang.html
@@ -1,15 +1,10 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Web Notifications Test: notification.lang</title>
+<title>Notification.lang</title>
 <link rel="author" title="Apple Inc." href="http://www.apple.com/">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-
+<script>
 setup({ explicit_done: true });
 
 /* Validity and well-formedness was determined by using the BCP 47
@@ -37,6 +32,10 @@ var invalid_langs = ["en-", "en-\-", "foo-\-bar", "id-\-\-Java", "fr-x",
 function test_lang(language, should_passthrough) {
     var expected = should_passthrough ? language : "";
     test(function() {
+        if (Notification.permission != "granted") {
+            this.force_timeout()
+            this.set_status(this.NOTRUN, "You must allow notifications for this origin before running this test.")
+        }
         var notification = new Notification("This is a notification.", {
             lang: language
         });
@@ -48,26 +47,17 @@ function test_lang(language, should_passthrough) {
     "Roundtripping lang \"" + language + "\". Expecting \"" + expected + "\".");
 }
 
-var permission_test = async_test("We have permission to use the notifications API.");
+for (var i=0; i<valid_langs.length; i++) {
+    test_lang(valid_langs[i], true);
+}
 
-Notification.requestPermission(permission_test.step_func(function(permission) {
-    assert_equals(permission, "granted", "notification permission");
-    permission_test.done();
+for (var i=0; i<well_formed_langs.length; i++) {
+    test_lang(well_formed_langs[i], false);
+}
 
-    for (var i=0; i<valid_langs.length; i++) {
-        test_lang(valid_langs[i], true);
-    }
-
-    for (var i=0; i<well_formed_langs.length; i++) {
-        test_lang(well_formed_langs[i], false);
-    }
-
-    for (var i=0; i<invalid_langs.length; i++) {
-        test_lang(invalid_langs[i], false);
-    }
-
-    done();
-}));
-  </script>
-</body>
+for (var i=0; i<invalid_langs.length; i++) {
+    test_lang(invalid_langs[i], false);
+}
 
+done();
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/notification-body-basic-manual.html b/tests/wpt/web-platform-tests/notifications/notification-body-basic-manual.html
deleted file mode 100644
index 378ad4e3f1f..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-body-basic-manual.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - body (basic)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The body attribute must return the notification's body and the empty string otherwise.">
-<body>
-  <p>Test passes if a notification popups and the notification's body content is "Room 101".</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-body-empty-manual.html b/tests/wpt/web-platform-tests/notifications/notification-body-empty-manual.html
deleted file mode 100644
index 76be5eba6c5..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-body-empty-manual.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - body (empty string)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The body attribute set empty string, then the notification's body content show nothing.">
-<body>
-  <p>Test passes if a notification popups and the notification have no body content.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: ""
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-close-manual.html b/tests/wpt/web-platform-tests/notifications/notification-close-manual.html
deleted file mode 100644
index 7b58e26090c..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-close-manual.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - close (basic)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.6 Closing a notification" href="http://www.w3.org/TR/notifications/#closing-a-notification">
-<meta name="flags" content="interact">
-<meta name="assert" content="The notification.close() method will close this notification.">
-<body>
-  <p>Test passes if a notification popups and it disappears after a while(about 3 seconds).</p>
-  <script>
-    var closetime = 3000;
-    var notification = new Notification("New Email Received", {
-      body: "Room 101"
-    });
-    setTimeout(function() {
-      notification.close();
-    }, closetime);
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-constructor-basic.html b/tests/wpt/web-platform-tests/notifications/notification-constructor-basic.html
deleted file mode 100644
index 7ed12b31d05..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-constructor-basic.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - constructor (basic)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-    test(function() {
-      var notification = new Notification("New Email Received", {
-        body: "Room 101"
-      });
-      assert_equals(typeof notification, "object");
-    }, "Test checks that notification constructor is correct");
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-constructor-invalid.html b/tests/wpt/web-platform-tests/notifications/notification-constructor-invalid.html
deleted file mode 100644
index d065e975e34..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-constructor-invalid.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - constructor (invalid)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-  <div id="log"></div>
-  <script>
-    test(function() {
-      assert_throws(new TypeError(), function() {
-        var notification = new Notification();
-      });
-    }, "Test checks that notification constructor arguments can't be empty");
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-dir-auto-manual.html b/tests/wpt/web-platform-tests/notifications/notification-dir-auto-manual.html
deleted file mode 100644
index 358aa619e7a..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-dir-auto-manual.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - dir (dir attribute set to "auto")</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.1 Direction" href="http://www.w3.org/TR/notifications/#direction-0">
-<meta name="flags" content="interact">
-<meta name="assert" content="The dir attribute set 'auto', then the notification's direction is the left edge.">
-<body>
-  <p>Test passes if a notification popups and the notification's direction is the left edge.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101",
-      dir: "auto"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-dir-ltr-manual.html b/tests/wpt/web-platform-tests/notifications/notification-dir-ltr-manual.html
deleted file mode 100644
index d8b74511f20..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-dir-ltr-manual.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - dir (dir attribute set to "ltr")</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.1 Direction" href="http://www.w3.org/TR/notifications/#direction-0">
-<meta name="flags" content="interact">
-<meta name="assert" content="The dir attribute set 'ltr', then the notification's direction is the left edge.">
-<body>
-  <p>Test passes if a notification popups and the notification's direction is the left edge.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101",
-      dir: "ltr"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-dir-rtl-manual.html b/tests/wpt/web-platform-tests/notifications/notification-dir-rtl-manual.html
deleted file mode 100644
index 544773c9991..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-dir-rtl-manual.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - dir (dir attribute set to "rtl")</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="4.1 Direction" href="http://www.w3.org/TR/notifications/#direction-0">
-<meta name="flags" content="interact">
-<meta name="assert" content="The dir attribute set 'rtl', then the notification's direction is the right edge.">
-<body>
-  <p>Test passes if a notification popups and the notification's direction is the right edge.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101",
-      dir: "rtl"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-icon-basic-manual.html b/tests/wpt/web-platform-tests/notifications/notification-icon-basic-manual.html
deleted file mode 100644
index 1d3a95147b1..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-icon-basic-manual.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - icon (basic)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The icon attribute set valid URL, then notificaiton icon content will show a pictrue.">
-<body>
-  <p><strong>Make sure connect to network.</strong></p>
-  <p>Test passes if a notificaiton popups with a cat pictrue.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101",
-      icon: "http://test.csswg.org/source/support/cat.png"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-icon-empty-manual.html b/tests/wpt/web-platform-tests/notifications/notification-icon-empty-manual.html
deleted file mode 100644
index b153ed7f35c..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-icon-empty-manual.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - icon (invalid)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The icon attribute set invalid URL, then notificaiton icon content will show nothing.">
-<body>
-  <p>Test passes if a notificaiton popups and notification's icon content show nothing.</p>
-  <script>
-    var notification = new Notification("New Email Received", {
-      body: "Room 101",
-      icon: ""
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-tag-different-manual.html b/tests/wpt/web-platform-tests/notifications/notification-tag-different-manual.html
deleted file mode 100644
index ee94e8b3ede..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-tag-different-manual.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - tag (with different tag)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The tag attribute set different, then the notification's body show different.">
-<body>
-  <p>Test passes if two notifications popups and the notification's body are different.</p>
-  <script>
-    var notification1 = new Notification("New Email Received", {
-      body: "Room 101",
-      tag: "Tom"
-    });
-
-    var notification2 = new Notification("New Email Received", {
-      body: "Room 202",
-      tag: "Rose"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/notification-tag-same-manual.html b/tests/wpt/web-platform-tests/notifications/notification-tag-same-manual.html
deleted file mode 100644
index 5099e68c2a0..00000000000
--- a/tests/wpt/web-platform-tests/notifications/notification-tag-same-manual.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Web Notifications Test: notification - tag (with same tag)</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
-<link rel="help" title="5 API" href="http://www.w3.org/TR/notifications/">
-<meta name="flags" content="interact">
-<meta name="assert" content="The tag attribute set same, then the notification's body only show the latest one.">
-<body>
-  <p>Test passes if only one notification popups and the notification's body is "Room 202".</p>
-  <script>
-    var notification1 = new Notification("New Email Received", {
-      body: "Room 101",
-      tag: "Tom"
-    });
-
-    var notification2 = new Notification("New Email Received", {
-      body: "Room 202",
-      tag: "Tom"
-    });
-  </script>
-</body>
-
diff --git a/tests/wpt/web-platform-tests/notifications/permission.html b/tests/wpt/web-platform-tests/notifications/permission.html
new file mode 100644
index 00000000000..d8b201e42ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/permission.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.permission (basic)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+    assert_in_array(Notification.permission,
+        ["default", "denied", "granted"],
+        "Notification.permission")
+}, "Checked the Notification.permission property.")
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/requestPermission-denied-manual.html b/tests/wpt/web-platform-tests/notifications/requestPermission-denied-manual.html
new file mode 100644
index 00000000000..a7ec052dba7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/requestPermission-denied-manual.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.requestPermission (permission=denied)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({ explicit_timeout: true })
+Notification.requestPermission()
+if (Notification.permission != "denied") {
+    alert("TEST NOT RUN. Change your browser settings so that notifications"
+        + " for this origin are blocked, and then reload this page.")
+} else {
+    async_test(function (t) {
+        t.step(function () {
+            Notification.requestPermission()
+            t.done()
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/requestPermission-granted-manual.html b/tests/wpt/web-platform-tests/notifications/requestPermission-granted-manual.html
new file mode 100644
index 00000000000..970f4e3cbc8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/requestPermission-granted-manual.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.requestPermission (permission=granted)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            t.done()
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/tag-different-manual.html b/tests/wpt/web-platform-tests/notifications/tag-different-manual.html
new file mode 100644
index 00000000000..e463e976701
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/tag-different-manual.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.tag (two tags with different values)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification1 = null,
+                notification2 = null,
+                notifications = [],
+                text1 = "This is the body: Room 101",
+                text2 = "This is the body: Room 202"
+            createPassFail("If two notifications appear: First one with the"
+                + " text \"" + text1 + "\", followed by one with the text \""
+                + text2 + "\"",
+                t, closeNotifications, notifications)
+            notification1 = new Notification("New Email Received", {
+                body: text1,
+                tag: "Tom"
+            })
+            notification2 = new Notification("New Email Received", {
+                body: text2,
+                tag: "Rose"
+            })
+            notifications.push(notification1)
+            notifications.push(notification2)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/tag-same-manual.html b/tests/wpt/web-platform-tests/notifications/tag-same-manual.html
new file mode 100644
index 00000000000..53ebfd35ce5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/notifications/tag-same-manual.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Notification.tag (two tags with same value)</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<link rel="author" title="Xin Liu" href="mailto:xinx.liu@intel.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<div id=passfail></div>
+<script>
+setup({ explicit_timeout: true })
+if (hasNotificationPermission()) {
+    async_test(function (t) {
+        t.step(function () {
+            var notification1 = null,
+                notification2 = null,
+                notifications = [],
+                text1 = "This is the body: Room 101",
+                text2 = "This is the body: Room 202"
+            createPassFail("If two notifications appear: First one with the"
+                + " text \"" + text1 + "\", followed by one with the text \""
+                + text2 + "\"",
+                t, closeNotifications, notifications)
+            notification1 = new Notification("New Email Received", {
+                body: text1,
+                tag: "Tom"
+            })
+            notification2 = new Notification("New Email Received", {
+                body: text2,
+                tag: "Tom"
+            })
+            notifications.push(notification1)
+            notifications.push(notification2)
+        })
+    })
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js b/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
index f9c3ad9d19b..571aef1f79e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
@@ -85,8 +85,6 @@ function wrapResult(url, server_data) {
     referrer: server_data.headers.referer,
     headers: server_data.headers
   }
-
-  return result;
 }
 
 function queryIframe(url, callback) {
diff --git a/tests/wpt/web-platform-tests/resources/docs/api.md b/tests/wpt/web-platform-tests/resources/docs/api.md
index 6f25ad2a1fc..f3540c80e24 100644
Binary files a/tests/wpt/web-platform-tests/resources/docs/api.md and b/tests/wpt/web-platform-tests/resources/docs/api.md differ
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 9ad4f9aa5c1..f4c66aae621 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -658,6 +658,14 @@ policies and contribution forms [3].
         object.addEventListener(event, callback, false);
     }
 
+    function step_timeout(f, t) {
+        var outer_this = this;
+        var args = Array.prototype.slice.call(arguments, 2);
+        return setTimeout(function() {
+            f.apply(outer_this, args);
+        }, t * tests.timeout_multiplier);
+    }
+
     expose(test, 'test');
     expose(async_test, 'async_test');
     expose(promise_test, 'promise_test');
@@ -666,6 +674,7 @@ policies and contribution forms [3].
     expose(setup, 'setup');
     expose(done, 'done');
     expose(on_event, 'on_event');
+    expose(step_timeout, 'step_timeout');
 
     /*
      * Return a string truncated to the given length, with ... added at the end
@@ -1422,6 +1431,14 @@ policies and contribution forms [3].
         });
     };
 
+    Test.prototype.step_timeout = function(f, timeout) {
+        var test_this = this;
+        var args = Array.prototype.slice.call(arguments, 2);
+        return setTimeout(this.step_func(function() {
+            return f.apply(test_this, args);
+        }, timeout * tests.timeout_multiplier));
+    }
+
     Test.prototype.add_cleanup = function(callback) {
         this.cleanup_callbacks.push(callback);
     };
diff --git a/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html b/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html
index f27e4e66f0c..95237a6fd97 100644
--- a/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html
+++ b/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html
@@ -12,16 +12,14 @@
 <div id="log">This test requires JavaScript.</div>
 
 <script>
-var docType  = "html"; // Only run tests suitable for HTML
+async_test(function() {
+  var frame = document.createElement("iframe");
+  frame.onload = this.step_func_done(init);
+  frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
+  document.body.appendChild(frame);
+});
 
-var frame = document.createElement("iframe"),
-    doc;
-
-frame.onload = init;
-frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
-document.body.appendChild(frame);
-
-function init() {
+function init(e) {
   /*
    * This test suite tests Selectors API methods in 4 different contexts:
    * 1. Document node
@@ -40,13 +38,15 @@ function init() {
    * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
    */
 
+  var docType  = "html"; // Only run tests suitable for HTML
+
   // Prepare the nodes for testing
-  doc = frame.contentDocument;                 // Document Node tests
+  var doc = e.target.contentDocument;                 // Document Node tests
 
   var element = doc.getElementById("root");   // In-document Element Node tests
 
   //Setup the namespace tests
-  setupSpecialElements(element);
+  setupSpecialElements(doc, element);
 
   var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
                                                // Element tests, but after running the Document tests. This
@@ -74,10 +74,10 @@ function init() {
   runSpecialSelectorTests("Fragment", fragment);
   runSpecialSelectorTests("In-document Element", element);
 
-  verifyStaticList("Document", doc);
-  verifyStaticList("Detached Element", detached);
-  verifyStaticList("Fragment", fragment);
-  verifyStaticList("In-document Element", element);
+  verifyStaticList("Document", doc, doc);
+  verifyStaticList("Detached Element", doc, detached);
+  verifyStaticList("Fragment", doc, fragment);
+  verifyStaticList("In-document Element", doc, element);
 
   runInvalidSelectorTestQuery("Document", doc, invalidSelectors);
   runInvalidSelectorTestQuery("Detached Element", detached, invalidSelectors);
diff --git a/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.js b/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.js
index 9a330f4b8bd..5fd5d6941ac 100644
--- a/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.js
+++ b/tests/wpt/web-platform-tests/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.js
@@ -17,7 +17,7 @@ function interfaceCheckQuery(type, obj) {
  * Verify that the NodeList returned by queryAll is static and and that a new list is created after
  * each call. A static list should not be affected by subsequent changes to the DOM.
  */
-function verifyStaticList(type, root) {
+function verifyStaticList(type, doc, root) {
   var pre, post, preLength;
 
   test(function() {
diff --git a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html
deleted file mode 100644
index f3c91213bb6..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_10_01_02_02</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#shadow-root-methods">
-<meta name="assert" content="ShadowRoot Object: NodeList getElementsByClassName(DOMString className) method">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    assert_equals(s.getElementsByClassName('clazz').length, 0, 'ShadowRoot getElementsByClassName() ' +
-    		'method should return empty list if there\'s no matching child elements');
-
-}, 'A_10_01_02_02_T01');
-
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    child.setAttribute('class', 'clazz');
-    s.appendChild(child);
-
-    assert_equals(s.getElementsByClassName('clazz').length, 1, 'ShadowRoot getElementsByClassName() ' +
-    		'method should return matching child element');
-
-}, 'A_10_01_02_02_T02');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    child.setAttribute('class', 'clazz');
-    s.appendChild(child);
-
-    var child2 = d.createElement('span');
-    child2.setAttribute('class', 'clazz');
-    s.appendChild(child2);
-
-    assert_equals(s.getElementsByClassName('clazz').length, 2, 'ShadowRoot getElementsByClassName() ' +
-    		'method should return matching child elements');
-
-}, 'A_10_01_02_02_T03');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html
deleted file mode 100644
index bd8ce05be77..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_10_01_02_03</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#shadow-root-methods">
-<meta name="assert" content="ShadowRoot Object: NodeList getElementsByTagNameNS(DOMString? namespace, DOMString localName) method">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    assert_equals(s.getElementsByTagNameNS('*', 'div').length, 0, 'ShadowRoot getElementsByTagNameNS() ' +
-    		'method should return empty list if there\'s no matching child elements');
-
-}, 'A_10_01_02_03_T01');
-
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    s.appendChild(child);
-
-    assert_equals(s.getElementsByTagNameNS('*','span').length, 1, 'ShadowRoot getElementsByTagNameNS() ' +
-    		'method should return matching child element');
-
-}, 'A_10_01_02_03_T02');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    s.appendChild(child);
-
-    var child2 = d.createElement('span');
-    s.appendChild(child2);
-
-    assert_equals(s.getElementsByTagNameNS('*', 'span').length, 2, 'ShadowRoot getElementsByTagNameNS() ' +
-    		'method should return matching child elements');
-
-}, 'A_10_01_02_03_T03');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    assert_equals(s.getElementsByTagNameNS('http://www.w3c.org/namespace', 'div').length, 0,
-    		'ShadowRoot getElementsByTagNameNS() method should return empty list if there\'s no ' +
-    		'matching child elements');
-
-}, 'A_10_01_02_03_T04');
-
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElementNS('http://www.w3c.org/namespace','span');
-    s.appendChild(child);
-
-    assert_equals(s.getElementsByTagNameNS('http://www.w3c.org/namespace','span').length, 1,
-    		'ShadowRoot getElementsByTagNameNS() method should return matching child element');
-
-}, 'A_10_01_02_03_T05');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElementNS('http://www.w3c.org/namespace','span');
-    s.appendChild(child);
-
-    var child2 = d.createElementNS('http://www.w3c.org/namespace','span');
-    s.appendChild(child2);
-
-    assert_equals(s.getElementsByTagNameNS('http://www.w3c.org/namespace', 'span').length, 2,
-    		'ShadowRoot getElementsByTagNameNS() method should return matching child elements');
-
-}, 'A_10_01_02_03_T06');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    s.appendChild(child);
-
-    assert_equals(s.getElementsByTagNameNS('http://www.w3c.org/namespace','span').length, 0,
-    		'ShadowRoot getElementsByTagNameNS() method should return element from wrong namespace');
-
-}, 'A_10_01_02_03_T07');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html
index 53f4a2ab328..bbc26bf733b 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html
@@ -37,7 +37,7 @@ test(unit(function (ctx) {
 	range.setStart(span.firstChild, 0);
 	range.setEnd(span.firstChild, 3);
 
-	var selection = window.getSelection();
+	var selection = s.getSelection();
     selection.removeAllRanges();
     selection.addRange(range);
 
diff --git a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html
deleted file mode 100644
index 8ce777f5e33..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_10_01_02_05</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#shadow-root-methods">
-<meta name="assert" content="ShadowRoot Object: NodeList getElementsBytagName(DOMString tagName) method">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    assert_equals(s.getElementsByTagName('span').length, 0, 'ShadowRoot getElementsByTagName() ' +
-    		'method should return empty list if there\'s no matching child elements');
-
-}, 'A_10_01_02_05_T01');
-
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    s.appendChild(child);
-
-    assert_equals(s.getElementsByTagName('span').length, 1, 'ShadowRoot getElementsByTagName() ' +
-    		'method should return matching child element');
-
-}, 'A_10_01_02_05_T02');
-
-
-test(function () {
-
-	var d = newHTMLDocument();
-
-    var el = d.createElement('div');
-    d.body.appendChild(el);
-
-    var s = el.createShadowRoot();
-
-    var child = d.createElement('span');
-    s.appendChild(child);
-
-    var child2 = d.createElement('span');
-    s.appendChild(child2);
-
-    assert_equals(s.getElementsByTagName('span').length, 2, 'ShadowRoot getElementsByTagName() ' +
-    		'method should return matching child elements');
-
-}, 'A_10_01_02_05_T03');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html
index 30b63067354..354c7a0e3c9 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html
@@ -24,7 +24,7 @@ policies and contribution forms [3].
 <script>
 test(function () {
 
-	var d = newHTMLDocument();
+    var d = newHTMLDocument();
 
     var el = d.createElement('div');
     d.body.appendChild(el);
@@ -37,6 +37,22 @@ test(function () {
     }
 
 }, 'A_10_01_02_06_01_T01');
+
+// Added test for checking if elementFromPoint() method is existing on Shadowroot.
+test(function () {
+
+    var d = newHTMLDocument();
+
+    var el = d.createElement('div');
+
+    var s = el.createShadowRoot();
+    d.body.appendChild(el);
+
+    if (typeof(s) == 'undefined' || typeof (s.elementFromPoint(1, 1)) != 'object') {
+        assert_true(false, 'Shadowroot doesn\'t have elementFromPoint() method.' );
+    }
+
+}, 'A_10_01_02_06_01_T02');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/html-elements-and-their-shadow-trees/test-004.html b/tests/wpt/web-platform-tests/shadow-dom/html-elements-and-their-shadow-trees/test-004.html
index 579f9616a06..200ade6b1b8 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/html-elements-and-their-shadow-trees/test-004.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/html-elements-and-their-shadow-trees/test-004.html
@@ -43,33 +43,6 @@ test(unit(function (ctx) {
     assert_equals(d.querySelector('#flbk').offsetTop, 0, 'Fallback content shouldn\'t be rendered');
 
 }), 'A_09_00_04_T01');
-
-
-
-//test summary:first-of-type
-test(unit(function (ctx) {
-
-	var d = newRenderedHTMLDocument(ctx);
-
-	// create element
-    var el = d.createElement('details');
-    el.setAttribute('open', 'open');
-    d.body.appendChild(el);
-
-    el.innerHTML = '' +
-    	'<summary>' +
-    	'<span id="shadow">This is a node that should be distributed</span>' +
-    	'</summary>' +
-    	'<span id="flbk">Unlucky content</span>';
-
-    var s = el.createShadowRoot();
-    s.innerHTML = '<content select="summary:first-of-type"></content>';
-
-    assert_true(d.querySelector('#shadow').offsetTop > 0, 'details should allow insertion point' +
-    		'with summary:first-of-type matching criteria');
-    assert_equals(d.querySelector('#flbk').offsetTop, 0, 'Fallback content shouldn\'t be rendered');
-
-}), 'A_09_00_04_T02');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-001.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-001.html
index ffafc7795e5..dfb96741aa7 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-001.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-001.html
@@ -36,7 +36,7 @@ A_04_04_01_T1.step(function () {
 
             //make shadow tree
             var ul = d.querySelector('ul.stories');
-            var s = createSR(ul);
+            var s = ul.createShadowRoot();
             var subdiv1 = d.createElement('div');
             subdiv1.innerHTML = '<ul><content select="li"></content></ul>';
             s.appendChild(subdiv1);
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-002.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-002.html
index d583cfed4d6..e81d92bf4f6 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-002.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/content-pseudo-element/test-002.html
@@ -35,7 +35,7 @@ A_04_04_01_T2.step(function () {
 
             //make shadow tree
             var ul = d.querySelector('ul.stories');
-            var s = createSR(ul);
+            var s = ul.createShadowRoot();
             var subdiv1 = d.createElement('div');
             subdiv1.innerHTML = '<ul><content select="li"></content></ul>';
             s.appendChild(subdiv1);
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html
deleted file mode 100644
index 6cc4b52ec6a..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM - The older tree is inserted into shadow, and the original branch is inserted into content.</title>
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-  </head>
-  <body>
-    <div>
-      <p>Younger tree's node</p>
-      <p>Older tree's node</p>
-      <p>Original tree's node</p>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html
deleted file mode 100644
index 4d589b50550..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM Test - Tests shadow inserts older tree.</title>
-    <link rel="match" href="hosting-multiple-shadow-trees-002-ref.html">
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/shadow-dom/#multiple-shadow-trees">
-    <script src="../testcommon.js"></script>
-    <meta name="assert" content="The older tree is inserted into <shadow>, and the original branch is inserted into <content>.">
-  </head>
-  <body>
-    <div id='host'>
-      <p>Original tree's node</p>
-    </div>
-  <script>
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>Older tree's node</p><content></content></div>";
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>Younger tree's node</p><shadow></shadow></div>";
-  </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html
deleted file mode 100644
index 629821c2c75..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM - The shadow should insert original tree's node if no older shadow tree exists.</title>
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-  </head>
-  <body>
-    <div>
-      <p>Younger tree's node</p>
-      <p>Older tree's node</p>
-      <p>Original tree's node</p>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html
deleted file mode 100644
index b9f237275f9..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM Test - Tests shadow should insert original tree's node if no older shadow tree exists.</title>
-    <link rel="match" href="hosting-multiple-shadow-trees-003-ref.html">
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/shadow-dom/#multiple-shadow-trees">
-    <script src="../testcommon.js"></script>
-    <meta name="assert" content="The <shadow> should insert original tree's node if no older shadow tree exists.">
-  </head>
-  <body>
-    <div id='host'>
-      <p>Original tree's node</p>
-    </div>
-  <script>
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>Older tree's node</p><shadow></shadow></div>";
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>Younger tree's node</p><shadow></shadow></div>";
-  </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html
deleted file mode 100644
index 29d5eff0e21..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM - The only first shadow element is used.</title>
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-  </head>
-  <body>
-    <div>
-      <p>1st shadow tree's node</p>
-      <p>2nd shadow tree's node</p>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html
deleted file mode 100644
index 5dfffd13a9a..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM Test - The only first shadow element is used.</title>
-    <link rel="match" href="hosting-multiple-shadow-trees-004-ref.html">
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/shadow-dom/#multiple-shadow-trees">
-    <script src="../testcommon.js"></script>
-    <meta name="assert" content="The only first <shadow> element is used when the shadow tree has multiple <shadow> elements. Original tree's node is not inserted into the second <shadow> element.">
-  </head>
-  <body>
-    <div id='host'>
-      <p>Original tree's node</p>
-    </div>
-  <script>
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>1st shadow tree's node</p></div>";
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><shadow></shadow><p>2nd shadow tree's node</p><shadow></shadow></div>";
-  </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html
deleted file mode 100644
index 6d7b13af706..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM - Older shadow tree is not used</title>
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-  </head>
-  <body>
-    <div>
-      <p>2nd shadow tree's node</p>
-      <p>Original tree's node</p>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html
deleted file mode 100644
index 82d54d0cb87..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM Test - The older shadow tree is not used.</title>
-    <link rel="match" href="hosting-multiple-shadow-trees-005-ref.html">
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/shadow-dom/#multiple-shadow-trees">
-    <script src="../testcommon.js"></script>
-    <meta name="assert" content="The older shadow tree is not used when the youngest shadow tree doesn't have <shadow>. The original tree's node is inserted into <content> instead.">
-  </head>
-  <body>
-    <div id='host'>
-      <p>Original tree's node</p>
-    </div>
-  <script>
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>1st shadow tree's node</p><shadow></shadow></div>";
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>2nd shadow tree's node</p><content></content></div>";
-  </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html
deleted file mode 100644
index ea90ce8ad35..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM - Content and shadow elements are both inserted</title>
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-  </head>
-  <body>
-    <div>
-      <p>2nd shadow tree's node</p>
-      <p>Original tree's node</p>
-      <p>1st shadow tree's node</p>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html
deleted file mode 100644
index a352be28790..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Shadow DOM Test - Content and shadow elements are both inserted.</title>
-    <link rel="match" href="hosting-multiple-shadow-trees-006-ref.html">
-    <link rel="author" title="Hiroyuki Hayashi" href="mailto:hyshhryk@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/shadow-dom/#multiple-shadow-trees">
-    <script src="../testcommon.js"></script>
-    <meta name="assert" content="The <content> element assigns the original tree and the <shadow> element assigns an older shadow tree. They are both in the youngest shadow tree.">
-  </head>
-  <body>
-    <div id='host'>
-      <p>Original tree's node</p>
-    </div>
-  <script>
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>1st shadow tree's node</p></div>";
-    var shadowRoot = host.createShadowRoot();
-    shadowRoot.innerHTML = "<div><p>2nd shadow tree's node</p><content></content><shadow></shadow></div>";
-  </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html
deleted file mode 100644
index a62bcf32ed6..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_05_01</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#multiple-shadow-subtrees">
-<meta name="assert" content="Hosting Multiple Shadow Subtrees:The shadow insertion point designates a place in the shadow DOM subtree, where an older tree is inserted when rendering">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_05_01_T1 = async_test('A_04_05_01_T01');
-
-
-// Check that only the younger tree is visible if there's no shadow insertion point
-A_04_05_01_T1.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_05_01_T1.step_func(function () {
-        try {
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-
-            //make old shadow subtree
-            var s1 = ul.createShadowRoot();
-            var subdiv1 = d.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=".shadow"></content></ul>';
-            s1.appendChild(subdiv1);
-
-            //make younger shadow subtree
-            var s2 = ul.createShadowRoot();
-            var subdiv2 = d.createElement('div');
-            subdiv2.innerHTML = '<ul><content select=".shadow2"></content></ul>';
-            s2.appendChild(subdiv2);
-
-            //The order of DOM elements should be the following:
-            //li4 visible. Other elements invisible
-            assert_true(d.querySelector('#li4').offsetTop > 0,
-                'Only the younger tree should take part in the distribution');
-
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'Point 1: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 2: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-                'Point 3: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-                'Point 4: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-            	'Point 5: Elements that don\'t mach insertion point criteria participate in distribution');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_05_01_T1.done();
-    });
-});
-
-
-
-//Check that both the younger tree and the older one are visible
-//if there's a shadow insertion point for the older tree
-var A_04_05_01_T2 = async_test('A_04_05_01_T02');
-
-A_04_05_01_T2.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_05_01_T2.step_func(function () {
-        try {
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-
-            //make old shadow subtree
-            var s1 = ul.createShadowRoot();
-            var subdiv1 = d.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=".shadow"></content></ul>';
-            s1.appendChild(subdiv1);
-
-            //make younger shadow subtree
-            var s2 = ul.createShadowRoot();
-            var subdiv2 = d.createElement('div');
-            subdiv2.innerHTML = '<ul><content select=".shadow2"></content></ul>';
-            s2.appendChild(subdiv2);
-
-            //add a shadow insertion point for the older tree
-            s2.appendChild(d.createElement('shadow'));
-
-            //The order of DOM elements should be the following:
-            //li4, li3, li6 visible. Other elements invisible
-            assert_true(d.querySelector('#li4').offsetTop > 0,
-                'Younger tree should take part in the distribution');
-            assert_true(d.querySelector('#li3').offsetTop > d.querySelector('#li4').offsetTop,
-            	'Point 1: Older tree should take part in the distribution');
-            assert_true(d.querySelector('#li6').offsetTop > d.querySelector('#li3').offsetTop,
-            	'Point 2: Older tree should take part in the distribution');
-
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'Point 3: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 4: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-                'Point 5: Elements that don\'t mach insertion point criteria participate in distribution');
-        } finally {
-        	iframe.parentNode.removeChild(iframe);
-        }
-        A_04_05_01_T2.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html
deleted file mode 100644
index a9e967878c2..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_05_02</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#multiple-shadow-subtrees">
-<meta name="assert" content="Hosting Multiple Shadow Subtrees:If multiple shadow insertion points exist in a shadow DOM subtree, only the first, in tree order, is recognized">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_05_02_T1 = async_test('A_04_05_02_T01');
-
-A_04_05_02_T1.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_05_02_T1.step_func(function () {
-        try {
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-
-            //make the oldest shadow subtree
-            var s1 = ul.createShadowRoot();
-            var subdiv1 = d.createElement('div');
-            subdiv1.innerHTML = '<ul><content select="#li1"></content></ul>';
-            s1.appendChild(subdiv1);
-
-            //make an old shadow subtree
-            var s2 = ul.createShadowRoot();
-            var subdiv2 = d.createElement('div');
-            subdiv2.innerHTML = '<ul><content select=".shadow"></content></ul>';
-            s2.appendChild(subdiv2);
-
-            //make the youngest shadow subtree
-            var s3 = ul.createShadowRoot();
-            var subdiv3 = d.createElement('div');
-            subdiv3.innerHTML = '<ul><content select=".shadow2"></content></ul>';
-            s3.appendChild(subdiv3);
-
-            //add a shadow insertion point for the old tree
-            s3.appendChild(d.createElement('shadow'));
-            //add another shadow insertion point for the older tree.
-            //Shouldn't match
-            s3.appendChild(d.createElement('shadow'));
-
-
-            //The order of DOM elements should be the following:
-            //li4, li3, li6 visible. Other elements invisible
-            assert_true(d.querySelector('#li4').offsetTop > 0,
-                'Only the younger tree should take part in the distribution');
-            assert_true(d.querySelector('#li3').offsetTop > d.querySelector('#li4').offsetTop,
-        		'Point 1: Older tree should take part in the distribution');
-            assert_true(d.querySelector('#li6').offsetTop > d.querySelector('#li3').offsetTop,
-        		'Point 2: Older tree should take part in the distribution');
-
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'The oldest tree shouldn\'t take part in the distribution');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 3: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-                'Point 4: Elements that don\'t mach insertion point criteria participate in distribution');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_05_02_T1.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html
deleted file mode 100644
index 13dbe3f4e96..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_05_03</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#multiple-shadow-subtrees">
-<meta name="assert" content="Hosting Multiple Shadow Subtrees:When an insertion point or a shadow insertion point has nothing assigned or distributed to them, the fallback content must be used instead when rendering">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_05_03_T1 = async_test('A_04_05_03_T01');
-
-A_04_05_03_T1.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_05_03_T1.step_func(function () {
-        try {
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-
-            //make the oldest shadow subtree
-            var s1 = ul.createShadowRoot();
-            var subdiv1 = d.createElement('div');
-            subdiv1.innerHTML = '<ul><content select="#li1"></content></ul>';
-            s1.appendChild(subdiv1);
-
-            //make an old shadow subtree
-            var s2 = ul.createShadowRoot();
-            var subdiv2 = d.createElement('div');
-            subdiv2.innerHTML = '<ul><content select=".shadow"></content></ul>';
-            s2.appendChild(subdiv2);
-
-            //make the youngest shadow subtree
-            var s3 = ul.createShadowRoot();
-            var subdiv3 = d.createElement('div');
-            subdiv3.innerHTML = '<ul><content select=".shadow2"></content></ul>' +
-            	'<shadow><span id="spn_first">The first span</span></shadow>' +
-            	'<shadow><span id="spn_second">The second span</span></shadow>';
-
-            s3.appendChild(subdiv3);
-
-            //The order of DOM elements should be the following:
-            //li4, li3, li6 visible. Other elements invisible
-            assert_true(d.querySelector('#li4').offsetTop > 0,
-                'Only the younger tree should take part in the distribution');
-            assert_true(d.querySelector('#li3').offsetTop > d.querySelector('#li4').offsetTop,
-        		'Point 1: Older tree should take part in the distribution');
-            assert_true(d.querySelector('#li6').offsetTop > d.querySelector('#li3').offsetTop,
-        		'Point 2: Older tree should take part in the distribution');
-
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'The oldest tree shouldn\'t take part in the distribution');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 3: Elements that don\'t mach insertion point criteria participate in distribution');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-                'Point 4: Elements that don\'t mach insertion point criteria participate in distribution');
-
-            //spn_first should be invisible, spn_second visible
-            assert_equals(s3.querySelector('#spn_first').offsetTop, 0,
-            	'Shadow insertion point should be active');
-            assert_true(s3.querySelector('#spn_second').offsetTop > 0,
-            	'Shadow insertion point should be inactive');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_05_03_T1.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html
deleted file mode 100644
index b6731d5d867..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_01</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :link pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_01_T01 = async_test('A_04_03_06_01_T01');
-
-
-A_04_03_06_01_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_01_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#links-wrapper');
-            var s = div.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":link"></content>';
-            s.appendChild(subdiv1);
-
-            //All links elements should be visible
-            assert_true(d.querySelector('#link10').offsetTop > 0,
-                'Point 1: <a> tag should match :link pseudo-class selector');
-            assert_true(d.querySelector('#link11').offsetTop > 0,
-                'Point 2: <a> tag should match :link pseudo-class selector');
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_01_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html
deleted file mode 100644
index f1cf07f1794..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_03</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :target pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_03_T01 = async_test('A_04_03_06_03_T01');
-
-
-A_04_03_06_03_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html#link10';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_03_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#links-wrapper');
-            var s = div.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":target"></content>';
-            s.appendChild(subdiv1);
-
-            //link10 should be visible, link11 not
-            assert_true(d.querySelector('#link10').offsetTop > 0,
-                'Element should match :target pseudo-class selector');
-            assert_equals(d.querySelector('#link11').offsetTop, 0,
-                'Element shouldn\'t match :target pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_03_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html
deleted file mode 100644
index f90e04b3c40..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_04</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :enabled pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_04_T01 = async_test('A_04_03_06_04_T01');
-
-
-A_04_03_06_04_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_04_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#inputs-wrapper');
-            var s = div.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":enabled"></content>';
-            s.appendChild(subdiv1);
-
-            //inp2 should be visible, inp1 not
-            assert_true(d.querySelector('#inp2').offsetTop > 0,
-                'Element should match :enabled pseudo-class selector');
-            assert_equals(d.querySelector('#inp1').offsetTop, 0,
-                'Element shouldn\'t match :enabled pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_04_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html
deleted file mode 100644
index 1dc5b81625d..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_05</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :disabled pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_05_T01 = async_test('A_04_03_06_05_T01');
-
-
-A_04_03_06_05_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_05_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#inputs-wrapper');
-            var s = div.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":disabled"></content>';
-            s.appendChild(subdiv1);
-
-            //inp1 should be visible, inp2 not
-            assert_true(d.querySelector('#inp1').offsetTop > 0,
-                'Element should match :disabled pseudo-class selector');
-            assert_equals(d.querySelector('#inp2').offsetTop, 0,
-                'Element shouldn\'t match :disabled pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_05_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html
deleted file mode 100644
index 9ad8a6c0909..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_06</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :checked pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_06_T01 = async_test('A_04_03_06_06_T01');
-
-
-A_04_03_06_06_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_06_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#inputs-wrapper');
-            var s = div.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":checked"></content>';
-            s.appendChild(subdiv1);
-
-            //chb1 should be visible, chb2 not
-            assert_true(d.querySelector('#chb1').offsetTop > 0,
-                'Element should match :checked pseudo-class selector');
-            assert_equals(d.querySelector('#chb2').offsetTop, 0,
-                'Element shouldn\'t match :checked pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_06_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html
deleted file mode 100644
index 4def9a0c648..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_07</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :indeterminate pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_07_T01 = async_test('A_04_03_06_07_T01');
-
-
-A_04_03_06_07_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_07_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var div = d.querySelector('#inputs-wrapper');
-            var s = div.createShadowRoot();
-
-            d.querySelector('#chb1').indeterminate = true;
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<content select=":indeterminate"></content>';
-            s.appendChild(subdiv1);
-
-            //chb1 should be visible, chb2 not
-            assert_true(d.querySelector('#chb1').offsetTop > 0,
-                'Element should match :indeterminate pseudo-class selector');
-            assert_equals(d.querySelector('#chb2').offsetTop, 0,
-                'Element shouldn\'t match :indeterminate pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_07_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html
deleted file mode 100644
index a7dd85cd9df..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_08</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :nth-child() pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_08_T01 = async_test('A_04_03_06_08_T01');
-
-
-A_04_03_06_08_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_08_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":nth-child(odd)"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li1, li3, li5 should be visible, li2, li4, li6 not
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-                '1-st element should match :nth-child(odd) pseudo-class selector');
-            assert_true(d.querySelector('#li3').offsetTop > 0,
-            	'3-rd element should match :nth-child(odd) pseudo-class selector');
-            assert_true(d.querySelector('#li5').offsetTop > 0,
-            	'5-th element should match :nth-child(odd) pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                '2-nd element shouldn\'t match :nth-child() pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'4-th element shouldn\'t match :nth-child() pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-            	'6-nd element shouldn\'t match :nth-child() pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_08_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html
deleted file mode 100644
index 31e4f310a69..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_09</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :nth-last-child() pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_09_T01 = async_test('A_04_03_06_09_T01');
-
-
-A_04_03_06_09_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_09_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":nth-last-child(2)"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li6 should be invisible, all other visible
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-            'Point 1: element should match :nth-last-child(2) pseudo-class selector');
-        assert_true(d.querySelector('#li2').offsetTop > 0,
-        	'Point 2: element should match :nth-last-child(2) pseudo-class selector');
-        assert_true(d.querySelector('#li3').offsetTop > 0,
-        	'Point 3: element should match :nth-last-child(2) pseudo-class selector');
-        assert_true(d.querySelector('#li4').offsetTop > 0,
-        	'Point 4: element should match :nth-last-child(2) pseudo-class selector');
-        assert_true(d.querySelector('#li5').offsetTop > 0,
-        	'Point 5: element should match :nth-last-child(2) pseudo-class selector');
-        assert_equals(d.querySelector('#li6').offsetTop, 0,
-    		'Element shouldn\'t match :nth-last-child(2) pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_09_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html
deleted file mode 100644
index 3f0eaad05bc..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_10</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :nth-of-type() pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_10_T01 = async_test('A_04_03_06_10_T01');
-
-
-A_04_03_06_10_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_10_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":nth-of-type(2n+1)"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li1, li3, li5 should be visible, li2, li4, li6 not
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-                '1-st element should match :nth-of-type(2n+1) pseudo-class selector');
-            assert_true(d.querySelector('#li3').offsetTop > 0,
-            	'3-rd element should match :nth-of-type(2n+1) pseudo-class selector');
-            assert_true(d.querySelector('#li5').offsetTop > 0,
-            	'5-th element should match :nth-of-type(2n+1) pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                '2-nd element shouldn\'t match :nth-of-type(2n+1) pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'4-th element shouldn\'t match :nth-of-type(2n+1) pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-            	'6-nd element shouldn\'t match :nth-of-type(2n+1) pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_10_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html
deleted file mode 100644
index a074086f88e..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_11</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :nth-last-of-type() pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_11_T01 = async_test('A_04_03_06_11_T01');
-
-
-A_04_03_06_11_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_11_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":nth-last-of-type(2)"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li6 should be invisible, all others visible
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-                'Point 1: element should match :nth-last-of-type(2) pseudo-class selector');
-            assert_true(d.querySelector('#li2').offsetTop > 0,
-            	'Point 2: element should match :nth-last-of-type(2) pseudo-class selector');
-            assert_true(d.querySelector('#li3').offsetTop > 0,
-            	'Point 3: element should match :nth-last-of-type(2) pseudo-class selector');
-            assert_true(d.querySelector('#li4').offsetTop > 0,
-            	'Point 4: element should match :nth-last-of-type(2) pseudo-class selector');
-            assert_true(d.querySelector('#li5').offsetTop > 0,
-            	'Point 5: element should match :nth-last-of-type(2) pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-        		'Element shouldn\'t match :nth-last-of-type(2) pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_11_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html
deleted file mode 100644
index 919c3262624..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_12</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :first-child pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_12_T01 = async_test('A_04_03_06_12_T01');
-
-
-A_04_03_06_12_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_12_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":first-child"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li1 should be visible, all other not
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-                'Element should match :first-child pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 1: element shouldn\'t match :first-child pseudo-class selector');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-            	'Point 2: element shouldn\'t match :first-child pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'Point 3: element shouldn\'t match :first-child pseudo-class selector');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-            	'Point 4: element shouldn\'t match :first-child pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-            	'Point 5: element shouldn\'t match :first-child pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_12_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html
deleted file mode 100644
index 711c8c65add..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_13</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :last-child pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_13_T01 = async_test('A_04_03_06_13_T01');
-
-
-A_04_03_06_13_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_13_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":last-child"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li6 should be visible, all other not
-            assert_true(d.querySelector('#li6').offsetTop > 0,
-                'Element should match :last-child pseudo-class selector');
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'Point 1: element shouldn\'t match :last-child pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-            	'Point 2: element shouldn\'t match :last-child pseudo-class selector');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-            	'Point 3: element shouldn\'t match :last-child pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'Point 4: element shouldn\'t match :last-child pseudo-class selector');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-            	'Point 5: element shouldn\'t match :last-child pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_13_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html
deleted file mode 100644
index 93f991fd45e..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_14</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :nth-last-of-type() pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_14_T01 = async_test('A_04_03_06_14_T01');
-
-
-A_04_03_06_14_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_14_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":first-of-type"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li1 should be visible, all others not
-            assert_true(d.querySelector('#li1').offsetTop > 0,
-                'Element should match :first-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-                'Point 1: element shouldn\'t match :first-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-            	'Point 2: element shouldn\'t match :first-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'Point 3: element shouldn\'t match :first-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-            	'Point 4: element shouldn\'t match :first-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-        		'Point 5: element shouldn\'t match :first-of-type pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_14_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html
deleted file mode 100644
index 8b7a07f5019..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_15</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :last-of-type pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_15_T01 = async_test('A_04_03_06_15_T01');
-
-
-A_04_03_06_15_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_15_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":last-of-type"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //li6 must be visible, all others not
-            assert_true(d.querySelector('#li6').offsetTop > 0,
-                'Element should match :last-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'Point 1: element shouldn\'t match :last-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-            	'Point 2: element shouldn\'t match :last-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-            	'Point 3: element shouldn\'t match :last-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'Point 4: element shouldn\'t match :last-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-        		'Point 5: element shouldn\'t match :last-of-type pseudo-class selector');
-
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_15_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html
deleted file mode 100644
index 15ad4e620e3..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_04_03_06_16</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#matching-insertion-points">
-<meta name="assert" content="Matching Insertion Points: A valid selector fragment may contain a :only-of-type pseudo-class selector">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-var A_04_03_06_16_T01 = async_test('A_04_03_06_16_T01');
-
-
-A_04_03_06_16_T01.step(function () {
-    var iframe = document.createElement('iframe');
-    iframe.src = '../../resources/bobs_page.html';
-    document.body.appendChild(iframe);
-
-    iframe.onload = A_04_03_06_16_T01.step_func(function () {
-        try {
-
-            var d = iframe.contentDocument;
-            var ul = d.querySelector('ul.stories');
-            var s = ul.createShadowRoot();
-
-            //make shadow subtree
-            var subdiv1 = document.createElement('div');
-            subdiv1.innerHTML = '<ul><content select=":only-of-type"></content></ul>';
-            s.appendChild(subdiv1);
-
-            //All li1-li6 elements should be invisible
-            assert_equals(d.querySelector('#li1').offsetTop, 0,
-                'Point 1: element shouldn\'t match :only-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li2').offsetTop, 0,
-            	'Point 2: element shouldn\'t match :only-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li3').offsetTop, 0,
-            	'Point 3: element shouldn\'t match :only-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li4').offsetTop, 0,
-            	'Point 4: element shouldn\'t match :only-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li5').offsetTop, 0,
-        		'Point 5: element shouldn\'t match :only-of-type pseudo-class selector');
-            assert_equals(d.querySelector('#li6').offsetTop, 0,
-    			'Point 6: element shouldn\'t match :only-of-type pseudo-class selector');
-
-            var s2 = d.querySelector('#divid').createShadowRoot();
-
-            //make shadow subtree
-            var subdiv2 = document.createElement('div');
-            subdiv2.innerHTML = '<content select=":only-of-type"></content>';
-            s2.appendChild(subdiv2);
-
-            //Span and ul both should be visible
-            assert_true(d.querySelector('#spandex').offsetTop > 0,
-                'Point 7: Element should match :only-of-type pseudo-class selector');
-            assert_true(d.querySelector('#ul2').offsetTop > 0,
-            	'Point 8: Element should match :only-of-type pseudo-class selector');
-        } finally {
-            iframe.parentNode.removeChild(iframe);
-        }
-        A_04_03_06_16_T01.done();
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html
index f22c3a3854e..47d5efda0e6 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html
@@ -13,7 +13,7 @@
         </span>
         <script>
             var parent = document.getElementById('parent');
-            var shadow = parent.webkitCreateShadowRoot();
+            var shadow = parent.createShadowRoot();
             var child = document.createElement('span');
             child.textContent = "if NOT underlined, it is success.";
             shadow.appendChild(child);
diff --git a/tests/wpt/web-platform-tests/shadow-dom/styles/test-001.html b/tests/wpt/web-platform-tests/shadow-dom/styles/test-001.html
index 0d4fd2f0737..dc2588f1738 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/styles/test-001.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/styles/test-001.html
@@ -68,7 +68,6 @@ test(unit(function (ctx) {
 
 	//Shadow root to play with
 	var s = host.createShadowRoot();
-	s.applyAuthorStyles = false;
 
 	var div1 = d.createElement('div');
 	div1.innerHTML ='<span id="shd" class="invis">This is the shadow tree</span>';
@@ -142,7 +141,6 @@ test(unit(function (ctx) {
 
 	//Shadow root to play with
 	var s1 = host.createShadowRoot();
-	s1.applyAuthorStyles = false;
 
 	var div1 = d.createElement('div');
 	div1.innerHTML = '<span id="shd1" class="invis">This is an old shadow tree</span>';
diff --git a/tests/wpt/web-platform-tests/shadow-dom/styles/test-002.html b/tests/wpt/web-platform-tests/shadow-dom/styles/test-002.html
deleted file mode 100644
index 40d4bd91cda..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/styles/test-002.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<!--
-Distributed under both the W3C Test Suite License [1] and the W3C
-3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
-policies and contribution forms [3].
-
-[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
-[3] http://www.w3.org/2004/10/27-testcases
--->
-<html>
-<head>
-<title>Shadow DOM Test: A_06_00_02</title>
-<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
-<link rel="help" href="http://www.w3.org/TR/2013/WD-shadow-dom-20130514/#styles">
-<meta name="assert" content="Styles: CSS rules declared in an enclosing tree must be applied in a shadow tree if apply-author-styles flag is set to true for this tree">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../testcommon.js"></script>
-<link rel="stylesheet" href="/resources/testharness.css">
-</head>
-<body>
-<div id="log"></div>
-<script>
-//test apply-author-styles flag of ShadowRoot object
-test(unit(function (ctx) {
-
-    var d = newRenderedHTMLDocument(ctx);
-
-    d.head.innerHTML = '<style>' +
-		'.invis {' +
-		'display:none;' +
-		'}' +
-		'</style>';
-
-    var host = d.createElement('div');
-    d.body.appendChild(host);
-
-	//Shadow root to play with
-	var s = host.createShadowRoot();
-	s.applyAuthorStyles = true;
-
-	var div1 = d.createElement('div');
-	div1.innerHTML ='<span id="shd" class="invis">This is the shadow tree</span>';
-	s.appendChild(div1);
-
-	//apply-author-styles flag is set to true. Invisible style should be applied
-	assert_equals(s.querySelector('#shd').offsetTop, 0,
-    	'CSS styles declared in enclosing tree must  be applied in a shadow tree ' +
-    	'if the apply-author-styles flag is set to true');
-
-
-}), 'A_06_00_02_T01');
-
-
-//test apply-author-styles flag in a nested tree (set it)
-test(unit(function (ctx) {
-
-    var d = newRenderedHTMLDocument(ctx);
-
-    d.head.innerHTML = '<style>' +
-		'.invis {' +
-		'display:none;' +
-		'}' +
-		'</style>';
-
-    var host = d.createElement('div');
-    d.body.appendChild(host);
-
-	//Shadow root to play with
-	var s1 = host.createShadowRoot();
-	s1.applyAuthorStyles = true;
-
-	var div1 = d.createElement('div');
-	div1.innerHTML = '<span id="shd1" class="invis">This is an old shadow tree</span>';
-	s1.appendChild(div1);
-
-	//younger tree
-	var s2 = host.createShadowRoot();
-	s2.applyAuthorStyles = true;
-	var div1 = d.createElement('div');
-	div1.innerHTML = '<span id="shd2" class="invis">This is a young shadow tree</span>' +
-		'<shadow><span id="shd3" class="invis">This is the shadow tree fallback content</span></shadow>';
-	s2.appendChild(div1);
-
-
-	//apply-author-styles flag is set to true. Invisible style should be applied
-	//shd1 and shd2 should be invisible. sh3 invisible too because the tree should be active
-	assert_equals(s1.querySelector('#shd1').offsetTop,  0,
-    	'Point 1: CSS styles declared in enclosing tree must  be applied in a shadow tree ' +
-    	'if the apply-author-styles flag is set to true');
-	assert_equals(s2.querySelector('#shd2').offsetTop, 0,
-	    'Point 2: CSS styles declared in enclosing tree must be applied in a shadow tree ' +
-	    'if the apply-author-styles flag is set to true');
-	assert_equals(s2.querySelector('#shd3').offsetTop, 0,
-	    'Fallback content shouldn\'t be rendered for active tree');
-
-
-}), 'A_06_00_02_T02');
-
-
-
-//test different apply-author-styles flag values in a nested young and old trees
-test(unit(function (ctx) {
-
-    var d = newRenderedHTMLDocument(ctx);
-
-    d.head.innerHTML = '<style>' +
-		'.invis {' +
-		'display:none;' +
-		'}' +
-		'</style>';
-
-    var host = d.createElement('div');
-    d.body.appendChild(host);
-
-	//Shadow root to play with
-	var s1 = host.createShadowRoot();
-	s1.applyAuthorStyles = true;
-
-	var div1 = d.createElement('div');
-	div1.innerHTML = '<span id="shd1" class="invis">This is an old shadow tree</span>';
-	s1.appendChild(div1);
-
-	//younger tree
-	var s2 = host.createShadowRoot();
-	//applyAuthorStyles false by default
-	var div1 = d.createElement('div');
-	div1.innerHTML = '<span id="shd2" class="invis">This is a young shadow tree</span>' +
-		'<shadow><span id="shd3" class="invis">This is the shadow tree fallback content</span></shadow>';
-	s2.appendChild(div1);
-
-
-	//apply-author-styles flag is set to true. Invisible style should be applied
-	//shd1 and shd2 should be invisible. sh3 invisible too because the tree should be active
-	assert_equals(s1.querySelector('#shd1').offsetTop,  0,
-    	'Point 1: CSS styles declared in enclosing tree must  be applied in a shadow tree ' +
-    	'if the apply-author-styles flag is set to true');
-	assert_true(s2.querySelector('#shd2').offsetTop > 0,
-	    'Point 2: CSS styles declared in enclosing tree must be applied in a shadow tree ' +
-	    'if the apply-author-styles flag is set to true');
-	assert_equals(s2.querySelector('#shd3').offsetTop, 0,
-	    'Fallback content shouldn\'t be rendered for active tree');
-
-
-}), 'A_06_00_02_T03');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/subresource-integrity/alternate.css b/tests/wpt/web-platform-tests/subresource-integrity/alternate.css
new file mode 100644
index 00000000000..0ea6d22ec77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/subresource-integrity/alternate.css
@@ -0,0 +1 @@
+.testdiv{ background-color: red }
diff --git a/tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html b/tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html
index e1dab10814a..6bb6b4cf852 100644
--- a/tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html
+++ b/tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html
@@ -3,6 +3,7 @@
 <title>Subresource Integrity</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+
 <div id="log"></div>
 
 <div id="container"></div>
@@ -68,12 +69,12 @@
     // of executing them one at a time, the style tests are implemented as a
     // queue that builds up a list of tests, and then executes them one at a
     // time.
-    var SRIStyleTest = function(queue, pass, name, href, integrityValue, crossoriginValue) {
+    var SRIStyleTest = function(queue, pass, name, attrs, customCallback, altPassValue) {
         this.pass = pass;
         this.name = "Style: " + name;
-        this.href = href;
-        this.integrityValue = integrityValue;
-        this.crossoriginValue = crossoriginValue;
+        this.customCallback = customCallback || function () {};
+        this.attrs = attrs || {};
+        this.passValue = altPassValue || "rgb(255, 255, 0)";
 
         this.test = async_test(this.name);
 
@@ -82,6 +83,7 @@
     }
 
     SRIStyleTest.prototype.execute = function() {
+        var that = this;
         var container = document.getElementById("container");
         while (container.hasChildNodes()) {
           container.removeChild(container.firstChild);
@@ -92,17 +94,18 @@
         var div = document.createElement("div");
         div.className = "testdiv";
         var e = document.createElement("link");
-        e.rel = "stylesheet";
-        e.href = this.href;
-        e.setAttribute("integrity", this.integrityValue);
-        if(this.crossoriginValue) {
-            e.setAttribute("crossorigin", this.crossoriginValue);
+        this.attrs.rel = this.attrs.rel || "stylesheet";
+        for (var key in this.attrs) {
+            if (this.attrs.hasOwnProperty(key)) {
+                e.setAttribute(key, this.attrs[key]);
+            }
         }
+
         if(this.pass) {
             e.addEventListener("load", function() {
                 test.step(function() {
                     var background = window.getComputedStyle(div, null).getPropertyValue("background-color");
-                    assert_equals(background, "rgb(255, 255, 0)");
+                    assert_equals(background, that.passValue);
                     test.done();
                 });
             });
@@ -123,6 +126,7 @@
         }
         container.appendChild(div);
         container.appendChild(e);
+        this.customCallback(e, container);
     };
 
     var style_tests = [];
@@ -281,157 +285,256 @@
         style_tests,
         true,
         "Same-origin with correct sha256 hash",
-        "style.css",
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4="
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4="
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with correct sha384 hash",
-        "style.css",
-        "sha384-wDAWxH4tOWBwAwHfBn9B7XuNmFxHTMeigAMwn0iVQ0zq3FtmYMLxihcGnU64CwcX"
+        {
+            href: "style.css",
+            integrity: "sha384-wDAWxH4tOWBwAwHfBn9B7XuNmFxHTMeigAMwn0iVQ0zq3FtmYMLxihcGnU64CwcX"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with correct sha512 hash",
-        "style.css",
-        "sha512-9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2HSZX4l6w=="
+        {
+            href: "style.css",
+            integrity: "sha512-9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2HSZX4l6w=="
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with empty integrity",
-        "style.css",
-        ""
+        {
+            href: "style.css",
+            integrity: ""
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         false,
         "Same-origin with incorrect hash.",
-        "style.css",
-        "sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        {
+            href: "style.css",
+            integrity: "sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with multiple sha256 hashes, including correct.",
-        "style.css",
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4= sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4= sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with multiple sha256 hashes, including unknown algorithm.",
-        "style.css",
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4= foo666-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4= foo666-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with sha256 mismatch, sha512 match",
-        "style.css",
-        "sha512-9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2HSZX4l6w== sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        {
+            href: "style.css",
+            integrity: "sha512-9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2HSZX4l6w== sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         false,
         "Same-origin with sha256 match, sha512 mismatch",
-        "style.css",
-        "sha512-deadbeef9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2== sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4="
+        {
+            href: "style.css",
+            integrity: "sha512-deadbeef9wXDjd6Wq3H6nPAhI9zOvG7mJkUr03MTxaO+8ztTKnfJif42laL93Be/IF6YYZHHF4esitVYxiwpY2== sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4="
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "<crossorigin='anonymous'> with correct hash, ACAO: *",
-        xorigin_anon_style,
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
-        "anonymous"
+        {
+            href: xorigin_anon_style,
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
+            crossorigin: "anonymous"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         false,
         "<crossorigin='anonymous'> with incorrect hash, ACAO: *",
-        xorigin_anon_style,
-        "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
-        "anonymous"
+        {
+            href: xorigin_anon_style,
+            integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
+            crossorigin: "anonymous"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "<crossorigin='use-credentials'> with correct hash, CORS-eligible",
-        xorigin_creds_style,
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
-        "use-credentials"
+        {
+            href: xorigin_creds_style,
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
+            crossorigin: "use-credentials"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         false,
         "<crossorigin='use-credentials'> with incorrect hash CORS-eligible",
-        xorigin_creds_style,
-        "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
-        "use-credentials"
+        {
+            href: xorigin_creds_style,
+            integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
+            crossorigin: "use-credentials"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         false,
         "<crossorigin='anonymous'> with CORS-ineligible resource",
-        xorigin_ineligible_style,
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
-        "anonymous"
+        {
+            href: xorigin_ineligible_style,
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
+            crossorigin: "anonymous"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Cross-origin, not CORS request, with correct hash",
-        xorigin_anon_style,
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4="
+        {
+            href: xorigin_anon_style,
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4="
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Cross-origin, not CORS request, with hash masmatch",
-        xorigin_anon_style,
-        "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk="
+        {
+            href: xorigin_anon_style,
+            integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk="
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Cross-origin, empty integrity",
-        xorigin_anon_style,
-        ""
+        {
+            href: xorigin_anon_style,
+            integrity: ""
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with correct hash, options.",
-        "style.css",
-        "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=?foo=bar?spam=eggs"
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=?foo=bar?spam=eggs"
+        }
     );
 
     new SRIStyleTest(
         style_tests,
         true,
         "Same-origin with unknown algorithm only.",
-        "style.css",
-        "foo666-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=?foo=bar?spam=eggs"
+        {
+            href: "style.css",
+            integrity: "foo666-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=?foo=bar?spam=eggs"
+        }
+    );
+
+    new SRIStyleTest(
+        style_tests,
+        true,
+        "Same-origin with correct sha256 hash, rel='stylesheet license'",
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4=",
+            rel: "stylesheet license"
+        }
+    );
+
+    new SRIStyleTest(
+        style_tests,
+        true,
+        "Same-origin with correct sha256 hash, rel='license stylesheet'",
+        {
+            href: "style.css",
+            integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F-SPLT7YZk7gyCWUV4=",
+            rel: "license stylesheet"
+        }
+    );
+
+    new SRIStyleTest(
+        style_tests,
+        true,
+        "Same-origin with correct sha256 and sha512 hash, rel='alternate stylesheet' enabled",
+        {
+            href: "alternate.css",
+            title: "alt",
+            type: "text/css",
+            class: "alternate",
+            disabled: "disabled",
+            rel: "alternate stylesheet",
+            integrity: "sha256-phbz83bWhnLig+d2VPKrRrTRyhqoDRo1ruGqZLZ0= sha512-8OYEB7ktnzcb6h+kB9CUIuc8qvKIyLpygRJdQSEEycRy74dUsB+Yu9rSjpOPjRUblle8WWX9Gn7v39LK2Oceig==",
+        },
+        function (link, container) {
+            var alternate = document.querySelector('link.alternate');
+            alternate.disabled = false;
+        },
+        "rgb(255, 0, 0)"
+    );
+
+    new SRIStyleTest(
+        style_tests,
+        false,
+        "Same-origin with incorrect sha256 and sha512 hash, rel='alternate stylesheet' enabled",
+        {
+            href: "alternate.css",
+            title: "alt",
+            type: "text/css",
+            class: "alternate",
+            disabled: "disabled",
+            rel: "alternate stylesheet",
+            integrity: "sha256-fail83bWhnLig+d2VPKrRrTRyhqoDRo1ruGqZLZ0= sha512-failB7ktnzcb6h+kB9CUIuc8qvKIyLpygRJdQSEEycRy74dUsB+Yu9rSjpOPjRUblle8WWX9Gn7v39LK2Oceig==",
+        },
+        function (link, container) {
+            var alternate = document.querySelector('link.alternate');
+            alternate.disabled = false;
+        }
     );
 
     style_tests.execute();
diff --git a/tests/wpt/web-platform-tests/tools/runner/index.html b/tests/wpt/web-platform-tests/tools/runner/index.html
index 380c735583d..e08dc6d42d4 100644
--- a/tests/wpt/web-platform-tests/tools/runner/index.html
+++ b/tests/wpt/web-platform-tests/tools/runner/index.html
@@ -46,6 +46,10 @@
           <label for="path" class="col-sm-3 control-label">Run tests under path</label>
           <div class="col-sm-9">
             <input value="/" id='path' class='path form-control' disabled>
+            <label>
+              <input type=checkbox id='use_regex'>
+              Use regular expression
+            </label>
           </div>
         </div>
 
@@ -85,6 +89,7 @@
       To run a set of
       <a href="https://github.com/w3c/web-platform-tests/blob/master/README.md">web-platform-tests</a>
       tests, specify a path value in the <b>Run tests under path</b> field above. Example paths:
+    </p>
     <ul>
       <li><code>/</code> - runs all of the tests from the root down</li>
       <li><code>/websockets</code> - runs all of the
@@ -94,12 +99,25 @@
       <li><code>/html/syntax/parsing</code> - runs all of the
           <a href="http://w3c-test.org/html/syntax/parsing/">html/syntax/parsing</a> tests</li>
     </ul>
+    <p>
+      Multiple test paths can be specified by separating them with comma or whitespace. For example,
+      <code>/js, /html</code> will run the <a href="http://w3c-test.org/js/">js</a> <em>and</em> <a href="http://w3c-test.org/html/">html</a>
+      tests.
+    </p>
+    <p>
+      <a href="http://www.w3schools.com/jsref/jsref_obj_regexp.asp" target="_blank">Javascript regular expressions</a> are also supported for filtering. When the option is checked,
+      only a test path matching the regex pattern will run. For example, you can specify <code>^/js/|^/html/</code>
+      to run the <a href="http://w3c-test.org/js/">js</a> <em>and</em> <a href="http://w3c-test.org/html/">html</a>
+      tests.
+    </p>
     <p>
       If the test runner is run online, the set of tests available to run can be found in the
       <a href="http://w3c-test.org/">w3c-test.org</a> test repository.
+    </p>
     <p>
       Tests will run in a new window. For reftests and manual tests it’s best
       to put that window side-by-side with this one.
+    </p>
   </div>
 
   <div id="output">
@@ -117,20 +135,34 @@
       <table class='table'>
         <thead>
           <tr>
-            <th>Passed
-            <th>Failed
-            <th>Timeouts
-            <th>Errors
+            <th></th>
+            <th>Passed</th>
+            <th>Failed</th>
+            <th>Timeouts</th>
+            <th>Errors</th>
             <th>Not Run</th>
           </tr>
         </thead>
         <tbody>
           <tr>
-            <td class='PASS'>0
-            <td class='FAIL'>0
-            <td class='TIMEOUT'>0
-            <td class='ERROR'>0
-            <td class='NOTRUN'>0
+            <td></td>
+            <td class='PASS'>0</td>
+            <td class='FAIL'>0</td>
+            <td class='TIMEOUT'>0</td>
+            <td class='ERROR'>0</td>
+            <td class='NOTRUN'>0</td>
+          </tr>
+           <tr>
+            <td>
+              <label>
+                Display:
+              </label>
+              </td>
+            <td><input type=checkbox class="result-display-filter" value="PASS" checked></td>
+            <td><input type=checkbox class="result-display-filter" value="FAIL" checked></td>
+            <td><input type=checkbox class="result-display-filter" value="TIMEOUT" checked></td>
+            <td><input type=checkbox class="result-display-filter" value="ERROR" checked></td>
+            <td><input type=checkbox class="result-display-filter" value="NOTRUN" checked></td>
           </tr>
         </tbody>
       </table>
diff --git a/tests/wpt/web-platform-tests/tools/runner/runner.js b/tests/wpt/web-platform-tests/tools/runner/runner.js
index 07fdbea7dc4..0379ffd6235 100644
--- a/tests/wpt/web-platform-tests/tools/runner/runner.js
+++ b/tests/wpt/web-platform-tests/tools/runner/runner.js
@@ -56,13 +56,21 @@ Manifest.prototype = {
     }
 };
 
-function ManifestIterator(manifest, path, test_types) {
+function ManifestIterator(manifest, path, test_types, use_regex) {
     this.manifest = manifest;
-    this.path = path;
+    this.paths = null;
+    this.regex_pattern = null;
     this.test_types = test_types;
     this.test_types_index = -1;
     this.test_list = null;
     this.test_index = null;
+
+    if (use_regex) {
+        this.regex_pattern = path;
+    } else {
+        // Split paths by either a comma or whitespace, and ignore empty sub-strings.
+        this.paths = path.split(/[,\s]+/).filter(function(s) { return s.length > 0 });
+    }
 }
 
 ManifestIterator.prototype = {
@@ -94,7 +102,13 @@ ManifestIterator.prototype = {
     },
 
     matches: function(manifest_item) {
-        return manifest_item.url.indexOf(this.path) === 0;
+        if (this.regex_pattern !== null) {
+            return manifest_item.url.match(this.regex_pattern);
+        } else {
+            return this.paths.some(function(p) {
+                return manifest_item.url.indexOf(p) === 0;
+            });
+        }
     },
 
     to_test: function(manifest_item) {
@@ -138,6 +152,18 @@ function VisualOutput(elem, runner) {
     this.runner.start_callbacks.push(this.on_start.bind(this));
     this.runner.result_callbacks.push(this.on_result.bind(this));
     this.runner.done_callbacks.push(this.on_done.bind(this));
+
+    this.display_filter_state = {};
+
+    var visual_output = this;
+    var display_filter_inputs = this.elem.querySelectorAll(".result-display-filter");
+    for (var i = 0; i < display_filter_inputs.length; ++i) {
+        var display_filter_input = display_filter_inputs[i];
+        this.display_filter_state[display_filter_input.value] = display_filter_input.checked;
+        display_filter_input.addEventListener("change", function(e) {
+            visual_output.apply_display_filter(e.target.value, e.target.checked);
+        })
+    }
 }
 
 VisualOutput.prototype = {
@@ -238,6 +264,7 @@ VisualOutput.prototype = {
             this.elem.querySelector("td." + status_arr[i]).textContent = this.result_count[status_arr[i]];
         }
 
+        this.apply_display_filter_to_result_row(row, this.display_filter_state[test_status]);
         this.results_table.tBodies[0].appendChild(row);
         this.update_meter(this.runner.progress(), this.runner.results.count(), this.runner.test_count());
     },
@@ -295,8 +322,19 @@ VisualOutput.prototype = {
         this.meter.setAttribute("aria-valuenow", count);
         this.meter.setAttribute("aria-valuemax", total);
         this.meter.textContent = this.meter.style.width = (progress * 100).toFixed(1) + "%";
-    }
+    },
 
+    apply_display_filter: function(test_status, display_state) {
+        this.display_filter_state[test_status] = display_state;
+        var result_cells = this.elem.querySelectorAll(".results > table tr td." + test_status);
+        for (var i = 0; i < result_cells.length; ++i) {
+            this.apply_display_filter_to_result_row(result_cells[i].parentNode, display_state)
+        }
+    },
+
+    apply_display_filter_to_result_row: function(result_row, display_state) {
+        result_row.style.display = display_state ? "" : "none";
+    }
 };
 
 function ManualUI(elem, runner) {
@@ -382,6 +420,7 @@ ManualUI.prototype = {
 function TestControl(elem, runner) {
     this.elem = elem;
     this.path_input = this.elem.querySelector(".path");
+    this.use_regex_input = this.elem.querySelector("#use_regex");
     this.pause_button = this.elem.querySelector("button.togglePause");
     this.start_button = this.elem.querySelector("button.toggleStart");
     this.type_checkboxes = Array.prototype.slice.call(
@@ -412,7 +451,8 @@ TestControl.prototype = {
             var path = this.get_path();
             var test_types = this.get_test_types();
             var settings = this.get_testharness_settings();
-            this.runner.start(path, test_types, settings);
+            var use_regex = this.get_use_regex();
+            this.runner.start(path, test_types, settings, use_regex);
             this.set_stop();
             this.set_pause();
         }.bind(this);
@@ -466,6 +506,10 @@ TestControl.prototype = {
                 output: this.render_checkbox.checked};
     },
 
+    get_use_regex: function() {
+        return this.use_regex_input.checked;
+    },
+
     on_done: function() {
         this.set_pause();
         this.set_start();
@@ -557,14 +601,15 @@ Runner.prototype = {
         }
     },
 
-    start: function(path, test_types, testharness_settings) {
+    start: function(path, test_types, testharness_settings, use_regex) {
         this.pause_flag = false;
         this.stop_flag = false;
         this.done_flag = false;
         this.path = path;
+        this.use_regex = use_regex;
         this.test_types = test_types;
         window.testharness_properties = testharness_settings;
-        this.manifest_iterator = new ManifestIterator(this.manifest, this.path, this.test_types);
+        this.manifest_iterator = new ManifestIterator(this.manifest, this.path, this.test_types, this.use_regex);
         this.num_tests = null;
 
         if (this.manifest.data === null) {
@@ -709,7 +754,8 @@ function setup() {
     if (options.autorun === "1") {
         runner.start(test_control.get_path(),
                      test_control.get_test_types(),
-                     test_control.get_testharness_settings());
+                     test_control.get_testharness_settings(),
+                     test_control.get_use_regex());
         return;
     }
 }
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py
new file mode 100644
index 00000000000..bc6f4fd6ee7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+import urlparse, json
+from mod_pywebsocket import common, msgutil, util
+from mod_pywebsocket.handshake import hybi
+from wptserve import stash
+
+address, authkey = stash.load_env_config()
+stash = stash.Stash("/stash_responder", address=address, authkey=authkey)
+
+def web_socket_do_extra_handshake(request):
+    return
+
+def web_socket_transfer_data(request):
+    while True:
+        line = request.ws_stream.receive_message()
+        if line == "echo":
+            query = request.unparsed_uri.split('?')[1]
+            GET = dict(urlparse.parse_qsl(query))
+
+            # TODO(kristijanburnik): This code should be reused from
+            # /mixed-content/generic/expect.py or implemented more generally
+            # for other tests.
+            path = GET.get("path", request.unparsed_uri.split('?')[0])
+            key = GET["key"]
+            action = GET["action"]
+
+            if action == "put":
+              value = GET["value"]
+              stash.take(key=key, path=path)
+              stash.put(key=key, value=value, path=path)
+              response_data = json.dumps({"status": "success", "result": key})
+            elif action == "purge":
+             value = stash.take(key=key, path=path)
+             response_data = json.dumps({"status": "success", "result": value})
+            elif action == "take":
+              value = stash.take(key=key, path=path)
+              if value is None:
+                  status = "allowed"
+              else:
+                  status = "blocked"
+              response_data = json.dumps({"status": status, "result": value})
+
+            msgutil.send_message(request, response_data)
+
+            return